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

[Björn Tillenius]

[Björn Tillenius (bjornt)]

Fix the test_filebug_extra_options windmill test to make it pass again.
The layout of the page had changed a bit, and they way the collapsible
work have changed.

The original test tried to make sure that the extra option fields
weren't shown by checking .clientWidth. This doesn't work anymore, it's
always greater than 0. I changed it to check that the div they are in
is hidden instead, which should be good enough.

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

[Gavin Panella (allenap)]

This looks good.

It's not your fault, but I got a DeprecationWarning when running the
test:

> lib/canonical/database/harness.py:1: DeprecationWarning: Non-ASCII
> character '\xc3' in file
> lib/canonical/launchpad/windmill/testing/lpuser.py on line 71, but
> no encoding declared; see http://www.python.org/peps/pep-0263.html
> for details

I think it's because the encoding declaration has been pushed down to
the fourth line by the new copyright notice. Could you move the
encoding declaration to the top or change line 71 to use an escape
sequence instead?

Gavin.

review: Approve

[Björn Tillenius (bjornt)]

On Wed, Aug 19, 2009 at 10:22:30AM -0000, Gavin Panella wrote:
> Review: Approve
> This looks good.
>
> It's not your fault, but I got a DeprecationWarning when running the
> test:
>
> > lib/canonical/database/harness.py:1: DeprecationWarning: Non-ASCII
> > character '\xc3' in file
> > lib/canonical/launchpad/windmill/testing/lpuser.py on line 71, but
> > no encoding declared; see http://www.python.org/peps/pep-0263.html
> > for details
>
> I think it's because the encoding declaration has been pushed down to
> the fourth line by the new copyright notice. Could you move the
> encoding declaration to the top or change line 71 to use an escape
> sequence instead?

I removed the encoding declaration and changed line 71 to use escape
sequences instead. Having files encoded in a non-ascii encoding is
usually a bad idea.

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

=== modified file 'lib/lp/bugs/windmill/tests/test_bugs/test_filebug_extra_options.py'
--- lib/lp/bugs/windmill/tests/test_bugs/test_filebug_extra_options.py	2009-07-27 12:39:34 +0000
+++ lib/lp/bugs/windmill/tests/test_bugs/test_filebug_extra_options.py	2009-08-19 09:55:02 +0000
@@ -26,7 +26,7 @@
 
     # No duplicates were found.
     client.asserts.assertText(
-        xpath=u"//form[@name='launchpadform']//p",
+        xpath=u"//div[@id='container']//p",
         validator=u'No similar bug reports were found.')
 
     # Check out the expander.
@@ -38,30 +38,27 @@
     collapsible_area_xpath = (
         u"//form[@name='launchpadform']"
         u"//fieldset[contains(.//legend,'Extra options')]")
+    closed_area_xpath = (
+        collapsible_area_xpath +
+        u"/div[@class='collapseWrapper lazr-closed']")
+    opened_area_xpath = (
+        collapsible_area_xpath +
+        u"/div[@class='collapseWrapper lazr-opened']")
     client.asserts.assertProperty(
         xpath=collapsible_area_xpath,
         validator="className|collapsible")
-    client.asserts.assertNode(
-        xpath=collapsible_area_xpath + u"/div[@class='collapsed']")
+    client.asserts.assertNode(xpath=closed_area_xpath)
 
     # The extra options are not visible.
-    extra_options_ids = (
-        u"field.tags",
-        u"field.filecontent",
-        u"field.patch",
-        u"field.attachment_description",
-        )
-    for extra_option_id in extra_options_ids:
-        client.asserts.assertElemJS(
-            id=extra_option_id, js=u"element.clientWidth == 0")
-
+    client.asserts.assertProperty(
+        xpath=closed_area_xpath,
+        validator='style.height|0px')
     # Click on the legend and it expands.
     client.click(
         xpath=collapsible_area_xpath + u"/legend/a")
-    client.waits.forElement(
-        xpath=collapsible_area_xpath + u"/div[@class='expanded']")
+    client.waits.forElement(xpath=opened_area_xpath)
 
     # The extra options are visible now.
-    for extra_option_id in extra_options_ids:
-        client.asserts.assertElemJS(
-            id=extra_option_id, js=u"element.clientWidth > 0")
+    client.asserts.assertElemJS(
+        xpath=opened_area_xpath,
+        js='element.style.height != "0px"')