Merge lp:~bjornt/launchpad/bug-415333 into lp:launchpad

[Björn Tillenius]

[Björn Tillenius (bjornt)]

Make the test_bug_commenting.py windmill test pass.

The test looked for a link, which used to be how you added a comment.
When it was changed to a button again, the test wasn't updated.

--
Björn Tillenius | https://launchpad.net/~bjornt

[Deryck Hodge (deryck)]

Looks good, Björn.

Cheers,
deryck

review: Approve

=== modified file 'lib/lp/bugs/windmill/tests/test_bugs/test_bug_commenting.py'
--- lib/lp/bugs/windmill/tests/test_bugs/test_bug_commenting.py	2009-07-30 09:14:25 +0000
+++ lib/lp/bugs/windmill/tests/test_bugs/test_bug_commenting.py	2009-08-18 14:33:08 +0000
@@ -14,8 +14,8 @@
 WAIT_PAGELOAD = u'30000'
 WAIT_ELEMENT_COMPLETE = u'30000'
 WAIT_CHECK_CHANGE = u'1000'
-ADD_COMMENT_LINK = (
-    u'//a[@href="+addcomment" and @class="sprite add js-action"]')
+ADD_COMMENT_BUTTON = (
+    u'//input[@id="field.actions.save" and @class="button js-action"]')
 
 
 def test_bug_commenting():
@@ -25,13 +25,13 @@
 
     client.open(url='http://bugs.launchpad.dev:8085/bugs/1')
     client.waits.forPageLoad(timeout=WAIT_PAGELOAD)
-    client.waits.forElement(xpath=ADD_COMMENT_LINK)
+    client.waits.forElement(xpath=ADD_COMMENT_BUTTON)
 
     # Generate a unique piece of text, so we can run the test multiple
     # times, without resetting the db.
     new_comment_text = generate_uuid()
     client.type(text=new_comment_text, id="field.comment")
-    client.click(xpath=ADD_COMMENT_LINK)
+    client.click(xpath=ADD_COMMENT_BUTTON)
     client.waits.forElement(
         xpath=u'//div[@class="bug-comment"]/p[contains(., "%s")]' % (
             new_comment_text))