Merge lp:~deryck/launchpad/fix-affects-me-widget-529049 into lp:launchpad

Proposed by Deryck Hodge on 2010-03-01
Status: Merged
Approved by: Deryck Hodge on 2010-03-02
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~deryck/launchpad/fix-affects-me-widget-529049
Merge into: lp:launchpad
Diff against target: 130 lines (+18/-50)
5 files modified
lib/canonical/launchpad/javascript/bugs/tests/subscriber.html (+8/-8)
lib/canonical/launchpad/javascript/bugs/tests/test_me_too.html (+7/-7)
lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js (+1/-33)
lib/canonical/launchpad/javascript/bugs/tests/test_subscriber.js (+1/-1)
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~deryck/launchpad/fix-affects-me-widget-529049
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) release-critical Approve on 2010-03-01
Abel Deuring (community) 2010-03-01 Approve on 2010-03-01
Tim Penhey release-critical 2010-03-01 Pending
Review via email: mp+20380@code.launchpad.net

Commit message

Update versions.cfg to lazr-js r170 and fix some js unit tests.

To post a comment you must log in.
Deryck Hodge (deryck) wrote :

This branch is the second attempt to update to the latest revision in
lazr-js. The first was reverted because the lazr-js change broken the
"affects me too" widget. This has been fixed in lazr-js and now this
branch enables the new version.

I also fixed some tests paths in the js unit tests for bugs. I removed
tests that no longer applied because we removed the flame icon from the
feature.

I've run the Bugs Windmill tests which all pass, but I'll put this
through ec2 before landing, even though it's just UI-related changes.

I would like to have this RC'ed for 10.02 because it allows us to use
our fix for the "changing bug statuses is too easy" bug, which has been
hanging around for awhile causing some pain.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/javascript/bugs/tests/subscriber.html
  versions.cfg
  lib/canonical/launchpad/javascript/bugs/tests/test_subscriber.js
  lib/canonical/launchpad/javascript/bugs/tests/test_me_too.html
  lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js

== JSLint notices ==
jslint: No problem found in
'/home/deryck/launchpad/lp-branches/fix-affects-me-widget-529049/lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js'.

jslint: No problem found in
'/home/deryck/launchpad/lp-branches/fix-affects-me-widget-529049/lib/canonical/launchpad/javascript/bugs/tests/test_subscriber.js'.

jslint: 2 files to lint.

Abel Deuring (adeuring) :
review: Approve
review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/javascript/bugs/tests/subscriber.html'
2--- lib/canonical/launchpad/javascript/bugs/tests/subscriber.html 2009-12-08 11:08:43 +0000
3+++ lib/canonical/launchpad/javascript/bugs/tests/subscriber.html 2010-03-01 16:50:37 +0000
4@@ -4,15 +4,15 @@
5
6 <!-- YUI 3.0 Setup -->
7 <script type="text/javascript"
8- src="../../../icing/yui/current/build/yui/yui.js"></script>
9+ src="../../../../../../lazr-js/build/yui/yui/yui.js"></script>
10 <script type="text/javascript"
11- src="../../../icing/lazr/build/lazr.js"></script>
12- <link rel="stylesheet"
13- href="../../../icing/yui/current/build/cssreset/reset.css"/>
14- <link rel="stylesheet"
15- href="../../../icing/yui/current/build/cssfonts/fonts.css"/>
16- <link rel="stylesheet"
17- href="../../../icing/yui/current/build/cssbase/base.css"/>
18+ src="../../../../../../lazr-js/build/lazr.js"></script>
19+ <link rel="stylesheet"
20+ href="../../../../../../lazr-js/build/yui/cssreset/reset.css"/>
21+ <link rel="stylesheet"
22+ href="../../../../../../lazr-js/build/yui/cssfonts/fonts.css"/>
23+ <link rel="stylesheet"
24+ href="../../../../../../lazr-js/build/yui/cssbase/base.css"/>
25 <link rel="stylesheet"
26 href="../../test.css" />
27
28
29=== modified file 'lib/canonical/launchpad/javascript/bugs/tests/test_me_too.html'
30--- lib/canonical/launchpad/javascript/bugs/tests/test_me_too.html 2009-11-25 19:21:59 +0000
31+++ lib/canonical/launchpad/javascript/bugs/tests/test_me_too.html 2010-03-01 16:50:37 +0000
32@@ -4,15 +4,15 @@
33 <title>Status Editor</title>
34
35 <!-- YUI 3.0 Setup -->
36- <script type="text/javascript" src="../../../icing/yui/current/build/yui/yui.js"></script>
37- <link rel="stylesheet" href="../../../icing/yui/current/build/cssreset/reset.css"/>
38- <link rel="stylesheet" href="../../../icing/yui/current/build/cssfonts/fonts.css"/>
39- <link rel="stylesheet" href="../../../icing/yui/current/build/cssbase/base.css"/>
40+ <script type="text/javascript" src="../../../../../../lazr-js/build/yui/yui/yui.js"></script>
41+ <link rel="stylesheet" href="../../../../../../lazr-js/build/yui/cssreset/reset.css"/>
42+ <link rel="stylesheet" href="../../../../../../lazr-js/build/yui/cssfonts/fonts.css"/>
43+ <link rel="stylesheet" href="../../../../../../lazr-js/build/yui/cssbase/base.css"/>
44
45 <!-- Dependency -->
46- <script type="text/javascript" src="../../../icing/lazr/build/lazr.js"></script>
47- <script type="text/javascript" src="../../../icing/lazr/build/overlay/overlay.js"></script>
48- <script type="text/javascript" src="../../../icing/lazr/build/choiceedit/choiceedit.js"></script>
49+ <script type="text/javascript" src="../../../../../../lazr-js/build/lazr.js"></script>
50+ <script type="text/javascript" src="../../../../../../lazr-js/build/overlay/overlay.js"></script>
51+ <script type="text/javascript" src="../../../../../../lazr-js/build/choiceedit/choiceedit.js"></script>
52 <script type="text/javascript" src="../../../javascript/client/client.js"></script>
53
54 <!-- The module under test -->
55
56=== modified file 'lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js'
57--- lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js 2009-12-10 17:33:27 +0000
58+++ lib/canonical/launchpad/javascript/bugs/tests/test_me_too.js 2010-03-01 16:50:37 +0000
59@@ -1,7 +1,7 @@
60 /* Copyright (c) 2008, Canonical Ltd. All rights reserved. */
61
62 YUI({
63- base: '../../../icing/yui/current/build/',
64+ base: '../../../../../../lazr-js/build/yui/',
65 filter: 'raw',
66 combine: false
67 }).use('event', 'bugs.bugtask_index', 'node', 'test', 'widget-stack', 'console',
68@@ -116,38 +116,6 @@
69 },
70
71 /**
72- * The flame icon should be hidden initially.
73- */
74- test_flame_hidden_initially: function() {
75- var flame_icon = this.choice_edit.get('flame_icon');
76- Assert.isTrue(flame_icon.hasClass('unseen'), "Flame is not hidden.");
77- },
78-
79- /**
80- * The flame icon should be hidden when the user has made a
81- * negative choice (i.e. "Does not affect me").
82- */
83- test_flame_hidden_with_negative_choice: function() {
84- simulate(this.choice_edit.get('boundingBox'), '.value', 'click');
85- simulate(this.choice_edit._choice_list.get('boundingBox'),
86- 'li a[href$=false]', 'click');
87- var flame_icon = this.choice_edit.get('flame_icon');
88- Assert.isTrue(flame_icon.hasClass('unseen'), "Flame is not hidden.");
89- },
90-
91- /**
92- * The flame icon should be shown when the user has made a
93- * positive choice (i.e. "Affects me too").
94- */
95- test_flame_hidden_with_positive_choice: function() {
96- simulate(this.choice_edit.get('boundingBox'), '.value', 'click');
97- simulate(this.choice_edit._choice_list.get('boundingBox'),
98- 'li a[href$=true]', 'click');
99- var flame_icon = this.choice_edit.get('flame_icon');
100- Assert.isFalse(flame_icon.hasClass('unseen'), "Flame is hidden.");
101- },
102-
103- /**
104 * The UI should be in a waiting state while the save process is
105 * executing and return to a non-waiting state once it has
106 * finished.
107
108=== modified file 'lib/canonical/launchpad/javascript/bugs/tests/test_subscriber.js'
109--- lib/canonical/launchpad/javascript/bugs/tests/test_subscriber.js 2009-12-08 11:42:52 +0000
110+++ lib/canonical/launchpad/javascript/bugs/tests/test_subscriber.js 2010-03-01 16:50:37 +0000
111@@ -1,5 +1,5 @@
112 YUI({
113- base: '../../../icing/yui/current/build/',
114+ base: '../../../../../../lazr-js/build/yui/',
115 filter: 'raw', combine: false
116 }).use('test', 'console', 'lp.subscriber', function(Y) {
117
118
119=== modified file 'versions.cfg'
120--- versions.cfg 2010-02-27 15:17:31 +0000
121+++ versions.cfg 2010-03-01 16:50:37 +0000
122@@ -33,7 +33,7 @@
123 lazr.smtptest = 1.1
124 lazr.testing = 0.1.1
125 lazr.uri = 1.0.2
126-lazr-js = 0.9.2
127+lazr-js = 0.9.2DEVr170
128 martian = 0.11
129 mechanize = 0.1.11
130 mercurial = 1.3.1