Launchpad itself

Merge lp:~rockstar/launchpad/cleanup-javascript into lp:launchpad

  1. cleanup-javascript
  2. Merge into devel
Proposed by Paul Hummer
Status: Merged
Merged at revision: not available
Proposed branch: lp:~rockstar/launchpad/cleanup-javascript
Merge into: lp:launchpad
Diff against target: 271 lines
3 files modified
lib/lp/code/windmill/test_branch_sparks.py (+0/-29)
lib/lp/code/windmill/tests/test_branch_subscriptions.py (+79/-61)
lib/lp/code/windmill/tests/test_code_review.py (+40/-26)
To merge this branch: bzr merge lp:~rockstar/launchpad/cleanup-javascript
Reviewer Review Type Date Requested Status
Barry Warsaw Pending
Review via email: mp+13143@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul Hummer (rockstar) wrote :

Hi Barry-

  This branch just moves all the code windmill tests to CodeWindmillLayer. It also deletes the branch sparklines test, because, while the idea was cool, the implementation sucked, and so we disabled them for now. When they come back, it's best to just write new tests.

  The tests themselves are still failing in this branch, but I've got another pipe to get them all working again.

Cheers,
Paul

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'lib/lp/code/windmill/test_branch_sparks.py'
--- lib/lp/code/windmill/test_branch_sparks.py 2009-08-13 15:12:16 +0000
+++ lib/lp/code/windmill/test_branch_sparks.py 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
1# Copyright 2009 Canonical Ltd. All rights reserved.
2
3"""Test for branch spark lines."""
4
5__metaclass__ = type
6__all__ = []
7
8import windmill
9from windmill.authoring import WindmillTestClient
10
11from canonical.launchpad.windmill.testing import lpuser
12
13
14def test_branch_sparks_var():
15 """Test branch bug links."""
16 client = WindmillTestClient("Branch bug links")
17
18 client.open(
19 url=windmill.settings['TEST_URL'] + '/~mark/')
20 client.waits.forPageLoad(timeout=u'10000')
21 client.asserts.assertJS(js=u'''(function() {
22 return branch_sparks.length == 5;
23 }());''')
24 client.asserts.assertJS(js=u'''(function() {
25 var first_branch_spark = branch_sparks[0];
26 return (first_branch_spark[0] == 'b-1' &&
27 first_branch_spark[1] == '%s/~mark/+junk/testdoc/+spark')
28 }());''' % (windmill.settings['TEST_URL']))
29
300
=== renamed file 'lib/lp/code/windmill/test_branch_subscriptions.py' => 'lib/lp/code/windmill/tests/test_branch_subscriptions.py'
--- lib/lp/code/windmill/test_branch_subscriptions.py 2009-08-13 15:12:16 +0000
+++ lib/lp/code/windmill/tests/test_branch_subscriptions.py 2009-10-09 22:53:17 +0000
@@ -6,74 +6,92 @@
6__metaclass__ = type6__metaclass__ = type
7__all__ = []7__all__ = []
88
9import unittest
10
9import windmill11import windmill
10from windmill.authoring import WindmillTestClient12from windmill.authoring import WindmillTestClient
1113
12from canonical.launchpad.windmill.testing import lpuser14from canonical.launchpad.windmill.testing import lpuser
15from lp.code.windmill.testing import CodeWindmillLayer
16from lp.testing import TestCaseWithFactory
17
1318
1419
15# XXX: rockstar - Also needs testing : Admins can edit/delete, members of the20# XXX: rockstar - Also needs testing : Admins can edit/delete, members of the
16# team can edit/delete. At least the latter will require the Launchpad object21# team can edit/delete. At least the latter will require the Launchpad object
17# factory.22# factory.
1823
19def test_branch_subscription_ajax_load():24class TestBranchSubscriptions(TestCaseWithFactory):
20 """Test branch subscriptions loaded via ajax."""25 """Test subscriptions to branches."""
21 client = WindmillTestClient("Branch Subscription Ajax Load Test")26
2227 layer = CodeWindmillLayer
23 lpuser.FOO_BAR.ensure_login(client)28
2429 def test_branch_subscription_ajax_load(self):
25 client.open(30 """Test branch subscriptions loaded via ajax.
26 url=windmill.settings['TEST_URL'] + '/~mark/firefox/release--0.9.1')31 """
27 client.waits.forElement(id=u'none-subscribers', timeout=u'10000')32
28 client.asserts.assertText(id=u'selfsubscription',33 client = WindmillTestClient("Branch Subscription Ajax Load Test")
29 validator='Subscribe yourself')34
30 client.asserts.assertText(id=u'none-subscribers',35 lpuser.FOO_BAR.ensure_login(client)
31 validator=u'No subscribers.')36
3237 client.open(url=(
33 client.click(id=u'selfsubscription')38 windmill.settings['TEST_URL'] + '/~mark/firefox/release--0.9.1'))
34 client.waits.forElement(id=u'yui-pretty-overlay-modal')39 client.waits.forElement(id=u'none-subscribers', timeout=u'10000')
35 client.click(xpath=u'//button[@name="field.actions.change"]')40 client.asserts.assertText(id=u'selfsubscription',
3641 validator='Subscribe yourself')
37 client.waits.forElement(id=u'editsubscription-icon-name16',42 client.asserts.assertText(id=u'none-subscribers',
38 timeout=u'10000')43 validator=u'No subscribers.')
39 client.asserts.assertText(id=u'subscriber-name16',44
40 validator=u'Foo Bar')45 client.click(id=u'selfsubscription')
41 client.asserts.assertText(id=u'selfsubscription',46 client.waits.forElement(id=u'yui-pretty-overlay-modal')
42 validator=u'Edit your subscription')47 client.click(xpath=u'//button[@name="field.actions.change"]')
4348
4449 client.waits.forElement(id=u'editsubscription-icon-name16',
45 # And now to unsubscribe50 timeout=u'10000')
46 client.click(id=u'editsubscription-icon-name16')51 client.asserts.assertText(id=u'subscriber-name16',
4752 validator=u'Foo Bar')
48 client.waits.forPageLoad(timeout=u'100000')53 client.asserts.assertText(id=u'selfsubscription',
49 client.click(id=u'field.actions.unsubscribe')54 validator=u'Edit your subscription')
5055
51 client.waits.forElement(id=u'none-subscribers', timeout=u'10000')56 # And now to unsubscribe
52 client.asserts.assertText(id=u'selfsubscription',57 client.click(id=u'editsubscription-icon-name16')
53 validator='Subscribe yourself')58
54 client.asserts.assertText(id=u'none-subscribers',59 client.waits.forPageLoad(timeout=u'100000')
55 validator=u'No subscribers.')60 client.click(id=u'field.actions.unsubscribe')
5661
5762 client.waits.forElement(id=u'none-subscribers', timeout=u'10000')
58def test_team_edit_subscription_ajax_load():63 client.asserts.assertText(id=u'selfsubscription',
59 """Test that team subscriptions are editable through the ajax portlet."""64 validator='Subscribe yourself')
60 client = WindmillTestClient("Branch Subscription Ajax Load Test")65 client.asserts.assertText(id=u'none-subscribers',
6166 validator=u'No subscribers.')
62 lpuser.SAMPLE_PERSON.ensure_login(client)67
6368 def test_team_edit_subscription_ajax_load(self):
64 client.open(69 """Test that team subscriptions are editable through the ajax portlet.
65 url=windmill.settings['TEST_URL'] + '/~name12/landscape/feature-x/')70 """
66 client.waits.forPageLoad(timeout=u'10000')71
6772 client = WindmillTestClient("Branch Subscription Ajax Load Test")
68 client.waits.forElement(id=u'editsubscription-icon-landscape-developers',73
69 timeout=u'10000')74 lpuser.SAMPLE_PERSON.ensure_login(client)
70 client.asserts.assertText(id=u'subscriber-landscape-developers',75
71 validator=u'Landscape Developers')76 client.open(url=''.join([
72 client.click(id=u'editsubscription-icon-landscape-developers')77 windmill.settings['TEST_URL'],
7378 '/~name12/landscape/feature-x/']))
74 client.waits.forPageLoad(timeout=u'100000')79 client.waits.forPageLoad(timeout=u'10000')
75 client.click(id=u'field.actions.unsubscribe')80
7681 client.waits.forElement(
77 client.waits.forElement(id=u'none-subscribers', timeout=u'10000')82 id=u'editsubscription-icon-landscape-developers',
78 client.asserts.assertText(id=u'none-subscribers',83 timeout=u'10000')
79 validator=u'No subscribers.')84 client.asserts.assertText(id=u'subscriber-landscape-developers',
85 validator=u'Landscape Developers')
86 client.click(id=u'editsubscription-icon-landscape-developers')
87
88 client.waits.forPageLoad(timeout=u'100000')
89 client.click(id=u'field.actions.unsubscribe')
90
91 client.waits.forElement(id=u'none-subscribers', timeout=u'10000')
92 client.asserts.assertText(id=u'none-subscribers',
93 validator=u'No subscribers.')
94
95
96def test_suite():
97 return unittest.TestLoader().loadTestsFromName(__name__)
8098
=== renamed file 'lib/lp/code/windmill/test_code_review.py' => 'lib/lp/code/windmill/tests/test_code_review.py'
--- lib/lp/code/windmill/test_code_review.py 2009-08-31 09:50:17 +0000
+++ lib/lp/code/windmill/tests/test_code_review.py 2009-10-09 22:53:17 +0000
@@ -5,35 +5,49 @@
5__metaclass__ = type5__metaclass__ = type
6__all__ = []6__all__ = []
77
8import unittest
9
8import windmill10import windmill
9from windmill.authoring import WindmillTestClient11from windmill.authoring import WindmillTestClient
1012
11from canonical.launchpad.windmill.testing import lpuser13from canonical.launchpad.windmill.testing import lpuser
12from canonical.launchpad.windmill.testing.widgets import (14from canonical.launchpad.windmill.testing.widgets import (
13 search_picker_widget)15 search_picker_widget)
1416from lp.code.windmill.testing import CodeWindmillLayer
1517from lp.testing import TestCaseWithFactory
16MERGE_LINK = '%s/~name12/gnome-terminal/klingon/+register-merge' % (18
17 windmill.settings['TEST_URL'])19
1820class TestCodeReview(TestCaseWithFactory):
19def test_inline_request_a_reviewer():21 """Test the javascript functions of code review."""
20 """Test inline request a reviewer."""22
21 client = WindmillTestClient("Code review")23 layer = CodeWindmillLayer
2224
23 lpuser.FOO_BAR.ensure_login(client)25 def test_inline_request_a_reviewer(self):
2426 """Test inline request a reviewer."""
25 client.open(27 MERGE_LINK = '%s/~name12/gnome-terminal/klingon/+register-merge' % (
26 url=windmill.settings['TEST_URL'] + '/~name12/gnome-terminal/klingon/')28 windmill.settings['TEST_URL'])
27 client.waits.forPageLoad(timeout=u'10000')29
2830 client = WindmillTestClient("Code review")
29 client.click(xpath=u'//a[@href="%s"]' % MERGE_LINK)31
30 client.type(text=u'~name12/gnome-terminal/main',32 lpuser.FOO_BAR.ensure_login(client)
31 id=u'field.target_branch.target_branch')33
32 client.click(id=u'field.actions.register')34 client.open(url=''.join([
3335 windmill.settings['TEST_URL'],
34 client.waits.forPageLoad(timeout=u'10000')36 '/~name12/gnome-terminal/klingon/']))
35 client.click(id=u'request-review')37 client.waits.forPageLoad(timeout=u'10000')
3638
37 search_picker_widget(client, u'mark', 1)39 client.click(xpath=u'//a[@href="%s"]' % MERGE_LINK)
3840 client.type(text=u'~name12/gnome-terminal/main',
39 client.waits.forElement(id=u'review-mark', timeout=u'10000')41 id=u'field.target_branch.target_branch')
42 client.click(id=u'field.actions.register')
43
44 client.waits.forPageLoad(timeout=u'10000')
45 client.click(id=u'request-review')
46
47 search_picker_widget(client, u'mark', 1)
48
49 client.waits.forElement(id=u'review-mark', timeout=u'10000')
50
51
52def test_suite():
53 return unittest.TestLoader().loadTestsFromName(__name__)