Merge lp:~wgrant/launchpad/tiny-inline-subscription-fixes into lp:launchpad

[William Grant]

[William Grant (wgrant)]

= Summary =

I picked up a couple of bugs in the inline subscription stuff while testing fixes for the other bugs earlier this week. I thought I might as well fix them now.

See the two linked bugs for details.

== Proposed fix ==

The team icon was showing up as the icon for self-subscription because the self-subscription handler doesn't set is_team -- only check_can_be_unsubscribed does. I've forced is_team to false when setting the current person on the subscription.

The unsubscription handler was unconditionally setting the 'add' class on the Unsubscribe link. I initially moved the manual class changes into the block that sets the text to "Subscribe", but later discovered subscription.disable_spinner(). I now instead use that.

== Tests ==

I've added Windmill tests for the two bugs.

 $ ./bin/lp-windmill -e test=lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py firefox http://bugs.launchpad.dev:8085

== Demo and Q/A ==

To Q/A:

Bug #415220:
 1. Subscribe yourself to a bug.
 2. Subscribe a team of which you are a member to the bug.
 4. Click the link to unsubscribe the team.
 5. Verify that the "(-) Unsubscribe" link retains the correct icon.

Bug #415219:
 1. Subscribe a team to a bug.
 2. Subscribe yourself to a bug (using "Subscribe", not "Subscribe someone else").
 3. Verify that the icon next to your name is the person, not team, icon.

[Eleanor Berger (intellectronica)]

Good fix. Thanks for picking this up.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-08-20 04:52:29 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-08-20 11:38:10 +0000
@@ -294,6 +294,7 @@
             e.halt();
             subscription.set('can_be_unsubscribed', true);
             subscription.set('person', subscription.get('subscriber'));
+            subscription.set('is_team', false);
             var parent = e.target.get('parentNode');
             // Look for the false conditions of subscription, which
             // is_direct_subscription, etc. don't report correctly,
@@ -1030,7 +1031,7 @@
                     if (Y.Lang.isNull(person_link) &&
                         subscription.is_current_user_subscribing()) {
                             // Current user has been completely unsubscribed.
-                            subscription_link.set('innerHTML', 'Subscribe');
+                            subscription.disable_spinner('Subscribe');
                             set_subscription_link_parent_class(
                                 subscription_link, false, false);
                             subscription.set('is_direct', false);
@@ -1050,8 +1051,6 @@
                             subscription.set('has_dupes', true);
                         }
                     }
-                    subscription_link.removeClass('modify remove');
-                    subscription_link.addClass('add');
                 });
                 anim.run();
             },
 
=== modified file 'lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py'
--- lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py	2009-07-30 12:37:18 +0000
+++ lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py	2009-08-20 10:28:37 +0000
@@ -118,6 +118,14 @@
     client.click(
         xpath=u'//div[@class="yui-lazr-formoverlay-actions"]/button[2]')
 
+    # If we subscribe the user again, the icon should still be the person icon.
+    client.click(xpath=SUBSCRIPTION_LINK)
+    client.waits.sleep(milliseconds=SLEEP)
+    client.asserts.assertProperty(
+        xpath=(PERSON_LINK % u'Sample Person') + '/span',
+        validator=u'className|person')
+
+
     # Sample Person is logged in currently. She is not a
     # member of Ubuntu Team, and so, does not have permission
     # to unsubscribe the team.
@@ -135,6 +143,11 @@
     client.click(id=u'unsubscribe-icon-subscriber-17')
     client.waits.sleep(milliseconds=SLEEP)
     client.asserts.assertNotNode(xpath=PERSON_LINK % u'Ubuntu Team')
+    client.asserts.assertText(
+        xpath=SUBSCRIPTION_LINK, validator=u'Unsubscribe')
+    client.asserts.assertProperty(
+        xpath=SUBSCRIPTION_LINK,
+        validator=u'className|remove')
 
     # Test unsubscribing via the remove icon for duplicates.
     # First, go to bug 6 and subscribe.