Merge lp:~brian-murray/launchpad/person-subscription-story into lp:launchpad

[Brian Murray]

Modify xx-person-subscriptions.txt not to use sample data.

I rewrote this test not to use or rely on sample data.

[Robert Collins (lifeless)]

Its good that you've done that but, the '16' and '17' literals are
still dependent on sample data.

If you make this into a pyunit test rather than a doctest, it will
actually be free of sample data dependencies.
(or use ..., but thats potentially risky).

-Rob

[Leonard Richardson (leonardr)]

You mention Webster in the text before creating that person. To avoid confusion, the first mention of Webster should be something like "We're going to create a person called Webster... Any user can see..."

You mention bug #16 in the test text but you never mention it as a code literal, so you can remove it from the text.

You still mention bug 17 as a code literal, as well as the subscriber id 243656. Can you do better?

In a big code branch I'd consider these changes on the level of "approve with changes". But since the point of this branch is to improve the test, I'm marking this 'needs fixing'

review: Needs Fixing

[Brian Murray (brian-murray)]

I've modified the branch based off your feedback - thanks!

[Leonard Richardson (leonardr)]

"Any user can see that Webster is subscribed to some bugs. " => "Any user can see Webster's bug subscriptions." (Otherwise it reads like "As even a dummy can see, Webster is subscribed to some bugs.")

Sometimes Webster is "they" and sometimes "he". Pick a pronoun and stick with it.

Looks good otherwise.

review: Approve

=== modified file 'lib/lp/registry/stories/person/xx-person-subscriptions.txt'
--- lib/lp/registry/stories/person/xx-person-subscriptions.txt	2010-10-07 22:25:24 +0000
+++ lib/lp/registry/stories/person/xx-person-subscriptions.txt	2010-10-13 18:48:55 +0000
@@ -18,114 +18,129 @@
     >>> "does not have any direct bug subscriptions" in page_text
     True
 
-Any user can see that Sample Person is subscribed to several bugs.  The bug
-subscriptions table includes the bug number, title and location.
-
-    >>> anon_browser.open('http://launchpad.dev/~name12/+subscriptions')
+To test bug subscriptions we are going to create two products, Affluenza and
+Scofflaw, and a user Webster who will be subscribed to bugs about both of
+those.
+
+    >>> login('[e-mail]')
+    >>> scofflaw = factory.makeProduct(name='scofflaw')
+    >>> bugA = factory.makeBug(product=scofflaw,
+    ...     title='Word needs more popularity')
+    >>> affluenza = factory.makeProduct(name='affluenza')
+    >>> bugB = factory.makeBug(product=affluenza,
+    ...     title='A terrible affliction')
+    >>> subscriber = factory.makePerson(name='webster',
+    ...     password='g00dpassword')
+    >>> subscriptionA = bugA.subscribe(subscriber, subscriber)
+    >>> subscriptionB = bugB.subscribe(subscriber, subscriber)
+    >>> logout()
+
+Any user can see Webster's bug subscriptions.  The bug subscriptions table
+includes the bug number, title and location.
+
+    >>> anon_browser.open('http://launchpad.dev/~webster/+subscriptions')
     >>> print extract_text(find_tag_by_id(
     ...     anon_browser.contents, 'bug_subscriptions'))
     Summary
     In
-    13
-    Launchpad CSS and JS is not testible
-    Launchpad
-    4
-    Reflow problems with complex page layouts
-    Mozilla Firefox
-    9
-    Thunderbird crashes
-    thunderbird (Ubuntu)
-    1
-    Firefox does not support SVG
-    Mozilla Firefox
+    ...
+    Word needs more popularity
+    Scofflaw
+    ...
+    A terrible affliction
+    Affluenza
 
-The bug subscriptions table also includes an unsubscribe link, if they have
+The bug subscriptions table also includes an unsubscribe link, if the user has
 permission to remove the subscription, for bugs to which the person or team is
 subscribed.
 
-Sample Person can see and manage his direct bug subscriptions using the page
-too.  He chooses to view bug 13 - "Launchpad CSS and JS in not testible".
+Webster can see and manage his direct bug subscriptions using the page too.
+He chooses to view the bug about Scofflaw.
 
-    >>> sample_browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> sample_browser.open('http://bugs.launchpad.dev/~name12/+subscriptions')
-    >>> unsub_link = sample_browser.getLink(
-    ...     id='unsubscribe-subscriber-12')
+    >>> login('[e-mail]')
+    >>> subscriber_browser = setupBrowser(
+    ...     auth='Basic %s:g00dpassword' %
+    ...         subscriber.preferredemail.email)
+    >>> logout()
+    >>> subscriber_browser.open('http://bugs.launchpad.dev/~webster/+subscriptions')
+    >>> unsub_link = subscriber_browser.getLink(
+    ...     id='unsubscribe-subscriber-%s' % subscriber.id)
     >>> unsub_link.click()
-    >>> print extract_text(find_tag_by_id(
-    ...     sample_browser.contents, 'nonportlets'))
-    Unsubscribe from bug #13
-    ...
+    >>> page_text = extract_text(find_tag_by_id(
+    ...     subscriber_browser.contents, 'nonportlets'))
+    >>> "Unsubscribe me from this bug" in page_text
+    True
 
-After viewing the +subscribe page Sample Person decides that they still want
-to be subscribed to bug 13.  They click cancel which takes them back to their
+After viewing the +subscribe page Webster decides that he still wants to be
+subscribed to the bug.  He clicks cancel which takes him back to his
 +subscription page.
 
-    >>> cancel_link = sample_browser.getLink('Cancel')
+    >>> cancel_link = subscriber_browser.getLink('Cancel')
     >>> cancel_link.click()
-    >>> print sample_browser.title
-    Subscriptions : Sample Person
-
-He chooses to unsubscribe from bug 9 - "Thunderbird crashes".
-
-    >>> sample_browser.getLink(url='/ubuntu/+source/thunderbird/+bug/9/+subscribe').click()
-    >>> sample_browser.getControl("Unsubscribe me from this bug").selected = True
-    >>> sample_browser.getControl("Continue").click()
-    >>> print sample_browser.title
-    Subscriptions : Sample Person
-
-Sample Person can see that bug 9 is no longer listed in his direct bug
-subscriptions.
-
-    >>> sample_browser.open('http://bugs.launchpad.dev/~name12/+subscriptions')
+    >>> print subscriber_browser.title
+    Subscriptions : Webster
+
+He chooses to unsubscribe from the bug about Affluenza.
+
+    >>> subscriber_browser.getLink(url='/affluenza/+bug/%s/+subscribe'
+    ...     % bugB.id).click()
+    >>> subscriber_browser.getControl("Unsubscribe me from this bug").selected = True
+    >>> subscriber_browser.getControl("Continue").click()
+    >>> print subscriber_browser.title
+    Subscriptions : Webster
+
+Webster can see that the bug about Affluenza is no longer listed in his direct
+bug subscriptions.
+
+    >>> subscriber_browser.open('http://bugs.launchpad.dev/~webster/+subscriptions')
     >>> print extract_text(find_tag_by_id(
-    ...     sample_browser.contents, 'bug_subscriptions'))
+    ...     subscriber_browser.contents, 'bug_subscriptions'))
     Summary
     In
-    13
-    Launchpad CSS and JS is not testible
-    Launchpad
-    4
-    Reflow problems with complex page layouts
-    Mozilla Firefox
-    1
-    Firefox does not support SVG
-    Mozilla Firefox
+    ...
+    Word needs more popularity
+    Scofflaw
 
-Sample Person adds a bug subscription for a team, HWDB team, of which he is a
+Webster adds a bug subscription for a team, team America, of which he is a
 member.
 
-    >>> sample_browser.open('http://bugs.launchpad.dev/firefox/+bug/1/+addsubscriber')
-    >>> sample_browser.getControl('Person').value = 'hwdb-team'
-    >>> sample_browser.getControl('Subscribe user').click()
-
-Sample Person chooses to review the subscriptions for his HWDB team.
-
-    >>> sample_browser.open('https://bugs.launchpad.dev/~hwdb-team/+subscriptions')
-    >>> print sample_browser.title
-    Subscriptions : “HWDB Team” team
+    >>> login('[e-mail]')
+    >>> team = factory.makeTeam(name='america')
+    >>> bugC = factory.makeBug(product=scofflaw,
+    ...     title="Word came from a contest")
+    >>> membership = team.addMember(subscriber, subscriber)
+    >>> subscriptionC = bugC.subscribe(team, subscriber)
+    >>> logout()
+
+Webster chooses to review the subscriptions for his team America.
+
+    >>> subscriber_browser.open('https://bugs.launchpad.dev/~america/+subscriptions')
+    >>> print subscriber_browser.title
+    Subscriptions : “America” team
 
     >>> print extract_text(find_tag_by_id(
-    ...     sample_browser.contents, 'bug_subscriptions'))
+    ...     subscriber_browser.contents, 'bug_subscriptions'))
     Summary
     In
-    1
-    Firefox does not support SVG
-    Mozilla Firefox
-
-Sample Person now chooses to unsubscribe HWDB team from bug 1.
-
-    >>> sample_browser.getLink(id='unsubscribe-subscriber-243630').click()
-    >>> print extract_text(find_tag_by_id(
-    ...     sample_browser.contents, 'nonportlets'))
-    Unsubscribe from bug #1
     ...
-
-    >>> sample_browser.getControl(
-    ...     'Unsubscribe HWDB Team from this bug').selected = True
-    >>> sample_browser.getControl('Continue').click()
-
-    >>> sample_browser.open('https://launchpad.dev/~hwdb-team/+subscriptions')
+    Word came from a contest
+    Scofflaw
+
+Webster now chooses to unsubscribe team America from the bug about Scofflaw.
+
+    >>> subscriber_browser.getLink(id='unsubscribe-subscriber-%s' %
+    ...     team.id).click()
+    >>> print extract_text(find_tags_by_class(
+    ...     subscriber_browser.contents, 'value')[0])
+    Subscribe me to this bug
+    Unsubscribe America from this bug
+
+    >>> subscriber_browser.getControl(
+    ...     'Unsubscribe America from this bug').selected = True
+    >>> subscriber_browser.getControl('Continue').click()
+
+    >>> subscriber_browser.open('https://launchpad.dev/~america/+subscriptions')
     >>> page_text = extract_text(
-    ...     find_main_content(sample_browser.contents))
+    ...     find_main_content(subscriber_browser.contents))
     >>> "does not have any direct bug subscriptions" in page_text
     True