Incremental diff of boring test fixes.

{{{
=== modified file 'lib/lp/registry/browser/tests/person-views.txt'
--- lib/lp/registry/browser/tests/person-views.txt	2009-08-13 19:03:36 +0000
+++ lib/lp/registry/browser/tests/person-views.txt	2009-08-29 03:14:48 +0000
@@ -587,7 +587,7 @@
     >>> login('<email address hidden>')
     >>> view = create_initialized_view(landscape_developers, '+index')
     >>> print view.contact_link_title
-    Send an email to your team through Launchpad
+    Send an email to your team's members through Launchpad
 
 The EmailToPersonView can be used by members to contact their team.
 

=== modified file 'lib/lp/registry/stories/foaf/xx-person-projects.txt'
--- lib/lp/registry/stories/foaf/xx-person-projects.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/registry/stories/foaf/xx-person-projects.txt	2009-08-29 03:14:48 +0000
@@ -11,7 +11,6 @@
     Ubuntu Linux
     Ubuntu Test
     Tomcat
-    &raquo; Show related projects
 
 The +related-software page displays a table with links to open bugs,
 unimplemented specs and open questions.

=== modified file 'lib/lp/registry/stories/foaf/xx-team-add-my-teams.txt'
--- lib/lp/registry/stories/foaf/xx-team-add-my-teams.txt	2009-06-16 20:17:00 +0000
+++ lib/lp/registry/stories/foaf/xx-team-add-my-teams.txt	2009-08-29 03:14:48 +0000
@@ -33,7 +33,7 @@
     [u'Launchpad Administrators has been proposed to this team.']
     >>> print extract_text(
     ...     find_tag_by_id(browser.contents, 'recently-applied'))
-    Recently applied
+    Pending approval
     Launchpad Administrators
     ...
 

=== modified file 'lib/lp/registry/stories/foaf/xx-team-contactemail.txt'
--- lib/lp/registry/stories/foaf/xx-team-contactemail.txt	2009-05-12 01:39:29 +0000
+++ lib/lp/registry/stories/foaf/xx-team-contactemail.txt	2009-08-29 03:14:48 +0000
@@ -17,7 +17,7 @@
 
     >>> browser = setupBrowser(auth='Basic <email address hidden>:test')
     >>> browser.open('http://launchpad.dev/~landscape-developers')
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> browser.title
     'Landscape Developers contact address'
 
@@ -73,7 +73,7 @@
     ...     print msg
     Email address successfully confirmed.
 
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> browser.title
     'Landscape Developers contact address'
     >>> control = browser.getControl(name='field.contact_method')

=== modified file 'lib/lp/registry/stories/foaf/xx-team-edit.txt'
--- lib/lp/registry/stories/foaf/xx-team-edit.txt	2009-08-13 19:03:36 +0000
+++ lib/lp/registry/stories/foaf/xx-team-edit.txt	2009-08-29 03:14:48 +0000
@@ -88,7 +88,7 @@
 such team pages read-only.
 
     >>> browser.open('http://launchpad.dev/~landscape-developers')
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> browser.getControl('Apply for Mailing List').click()
 
     # Approval of mailing lists is not yet exposed through the web.

=== modified file 'lib/lp/registry/stories/foaf/xx-team-home.txt'
--- lib/lp/registry/stories/foaf/xx-team-home.txt	2009-08-21 13:48:43 +0000
+++ lib/lp/registry/stories/foaf/xx-team-home.txt	2009-08-29 03:14:48 +0000
@@ -21,7 +21,7 @@
 
     >>> print extract_text(
     ...     find_tag_by_id(browser.contents, 'recently-applied'))
-    Recently applied
+    Pending approval
     Sample Person
     Andrew Bennetts
 
@@ -97,9 +97,8 @@
     >>> print extract_text(
     ...     find_tag_by_id(browser.contents, 'contact-email'))
     Email:
-    Contact this team's administrators
+    Contact this team's email address
     <email address hidden>
-    Change contact address
 
 Member can contact their team even if the team does not have a contact
 address:
@@ -110,10 +109,8 @@
     ...     find_tag_by_id(sample_browser.contents, 'contact-email'))
     Email:
     No contact email
-    Change contact address
-    Contact this team's administrators
-    (Launchpad notifications are sent to all
-    team members)
+    Contact this team's members
+    Set contact address
 
 As teams do not have OpenID Logins, there is not link in the Contact
 details section for help.
@@ -129,6 +126,7 @@
     >>> sample_browser.open('http://launchpad.dev/~name18')
     >>> print extract_text(
     ...     find_tag_by_id(sample_browser.contents, 'your-involvement'))
+    Join...
     You are an indirect member of this team:
     Sample Person &rarr; Warty Security Team &rarr; Ubuntu Gnome Team...
 
@@ -148,7 +146,7 @@
     >>> owner_browser.open('http://launchpad.dev/~ubuntu-team')
     >>> print extract_text(
     ...     find_tag_by_id(owner_browser.contents, 'recently-applied'))
-    Recently applied
+    Pending approval
     Sample Person
     Andrew Bennetts
     Approve/Decline applicants
@@ -164,6 +162,7 @@
     >>> user_browser.open('http://launchpad.dev/~ubuntu-team')
     >>> print extract_text(
     ...     find_tag_by_id(user_browser.contents, 'your-involvement'))
+    Join...
     You are not a member of this team...
 
 He can see the contact address, and the link explains the email
@@ -172,7 +171,7 @@
     >>> content = find_tag_by_id(user_browser.contents, 'contact-email')
     >>> print extract_text(content)
     Email:
-    Contact this team's administrators
+    Contact this team's owner
     <email address hidden>
 
     >>> content.a

=== modified file 'lib/lp/registry/stories/mailinglists/hosted-email-address.txt'
--- lib/lp/registry/stories/mailinglists/hosted-email-address.txt	2009-05-12 01:39:29 +0000
+++ lib/lp/registry/stories/mailinglists/hosted-email-address.txt	2009-08-29 03:14:48 +0000
@@ -20,11 +20,11 @@
 
     >>> from canonical.launchpad.testing.pages import strip_label
 
-    >>> user_browser.open('http://launchpad.dev/~aardvarks')
-    >>> user_browser.getLink('Change contact address').click()
+    >>> user_browser.open('http://launchpad.dev/~aardvarks/+edit')
+    >>> user_browser.getLink(url='+contactaddress').click()
     >>> user_browser.getControl('The Launchpad mailing list').selected = True
     >>> user_browser.getControl('Change').click()
-    >>> user_browser.getLink('Change contact address').click()
+    >>> user_browser.getLink(url="+contactaddress").click()
     >>> control = user_browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['The Launchpad mailing list for this team...]
@@ -69,7 +69,7 @@
     ...     print msg
     Email address successfully confirmed.
 
-    >>> user_browser.getLink('Change contact address').click()
+    >>> user_browser.getLink(url="+contactaddress").click()
     >>> control = user_browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['Another e-mail address']

=== modified file 'lib/lp/registry/stories/mailinglists/lifecycle.txt'
--- lib/lp/registry/stories/mailinglists/lifecycle.txt	2009-07-23 13:44:13 +0000
+++ lib/lp/registry/stories/mailinglists/lifecycle.txt	2009-08-29 03:14:48 +0000
@@ -12,7 +12,7 @@
 
     >>> browser = setupBrowser(auth='Basic <email address hidden>:test')
     >>> browser.open('http://launchpad.dev/~landscape-developers')
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> browser.title
     'Configure mailing list'
 
@@ -25,7 +25,7 @@
 
 Before the mailing list is created, the application must be approved.
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> print find_tag_by_id(browser.contents,
     ...                      'mailing_list_pending_approval').p.string
     The application for this team's mailing list is pending approval.
@@ -93,7 +93,8 @@
 Any time before the mailing list is approved, the application can be
 cancelled (and then re-requested afterwards).
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.open(
+    ...     'http://launchpad.dev/~landscape-developers/+mailinglist')
     >>> browser.getControl('Cancel Application').click()
     >>> browser.title
     'Landscape Developers in Launchpad'
@@ -104,7 +105,7 @@
     None
     >>> transaction.commit()
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> browser.getControl('Apply for Mailing List').click()
     >>> browser.title
     'Landscape Developers in Launchpad'
@@ -127,13 +128,13 @@
 address until Mailman has acknowledged successful creation.
 
     >>> browser.reload()
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> browser.getControl('The Launchpad mailing list')
     Traceback (most recent call last):
     ...
     LookupError: ...
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> browser.getControl('Apply for Mailing List')
     Traceback (most recent call last):
     ...
@@ -163,8 +164,8 @@
 The archive link is clickable, though we won't click it because Mailman isn't
 running.
 
-    >>> browser.getLink('Mailing list archive')
-    <Link text='Mailing list archive'
+    >>> browser.getLink('View archive')
+    <Link text='View archive'
           url='http://lists.launchpad.dev/landscape-developers'>
 
 The team's overview page also displays the posting address.
@@ -178,7 +179,7 @@
 
     >>> from canonical.launchpad.testing.pages import strip_label
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> browser.getControl('Apply for Mailing List')
     Traceback (most recent call last):
     ...
@@ -189,25 +190,25 @@
     The mailing list is not set as the team contact address. You can
     set it.
 
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> browser.getControl('The Launchpad mailing list').selected = True
     >>> browser.getControl('Change').click()
 
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['The Launchpad mailing list for this team...]
 
 The mailing list's configuration screen is also now available.
 
-    >>> browser.getLink('Configure mailing list').url
+    >>> browser.getLink(url='+mailinglist').url
     'http://launchpad.dev/~landscape-developers/+mailinglist'
 
 Although of course, it's not available to someone with no permission to
 manipulate the list.
 
     >>> user_browser.open('http://launchpad.dev/~landscape-developers')
-    >>> user_browser.getLink('Configure mailing list')
+    >>> user_browser.getLink(url='+mailinglist')
     Traceback (most recent call last):
     ...
     LinkNotFoundError
@@ -218,7 +219,7 @@
     >>> browser.getControl('Each member individually').selected = True
     >>> browser.getControl('Change').click()
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> print extract_text(find_tag_by_id(browser.contents,
     ...                                   'mailing_list_not_contact_address'))
     The mailing list is not set as the team contact address. You can
@@ -235,14 +236,14 @@
 When the mailing list is the team's contact address, the message does
 not show up.
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> find_tag_by_id(browser.contents,
     ...                'mailing_list_not_contact_address') is None
     True
 
 The contact address is now set to the mailing list address.
 
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['The Launchpad mailing list for this team -
@@ -258,7 +259,7 @@
 
     >>> browser.open('http://launchpad.dev/~landscape-developers/+mailinglist')
     >>> browser.getControl('Deactivate this Mailing List').click()
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['Each member individually']
@@ -278,7 +279,7 @@
 
 An inactive mailing list can be reactivated.
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> browser.getControl('Reactivate this Mailing List').click()
     >>> mailing_list_status_message(browser.contents)
     ''
@@ -288,13 +289,13 @@
     >>> act()
     >>> transaction.commit()
 
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> mailing_list_status_message(browser.contents)
     ''
 
 This does not restore the mailing list as the team's contact method:
 
-    >>> browser.getLink('Change contact address').click()
+    >>> browser.getLink(url='+contactaddress').click()
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
     ['Each member individually']
@@ -401,7 +402,7 @@
     ...         return None
     ...     return tag.p.contents[0].strip()
 
-    >>> user_browser.getLink('Configure mailing list').click()
+    >>> user_browser.getLink(url='+mailinglist').click()
     >>> print purge_text(user_browser)
     None
 
@@ -581,8 +582,8 @@
     >>> admin_browser.getControl('Submit').click()
     >>> act()
     >>> browser.reload()
-    >>> browser.getLink('Mailing list archive')
-    <Link text='Mailing list archive'
+    >>> browser.getLink('View archive')
+    <Link text='View archive'
           url='http://lists.launchpad.dev/aardvarks'>
 
 A team with an active mailing list cannot be renamed.
@@ -619,8 +620,8 @@
     >>> admin_browser.getControl('Submit').click()
     >>> act()
     >>> user_browser.reload()
-    >>> user_browser.getLink('Mailing list archive')
-    <Link text='Mailing list archive'
+    >>> user_browser.getLink('View archive')
+    <Link text='View archive'
           url='http://lists.launchpad.dev/antelopes'>
 
 A team with an active mailing list cannot be merged with another team.

=== modified file 'lib/lp/registry/stories/mailinglists/moderation.txt'
--- lib/lp/registry/stories/mailinglists/moderation.txt	2009-05-12 21:39:35 +0000
+++ lib/lp/registry/stories/mailinglists/moderation.txt	2009-08-29 03:14:48 +0000
@@ -5,7 +5,7 @@
 member in good standing (as is the default).
 
     >>> admin_browser.open('http://launchpad.dev/~guadamen')
-    >>> admin_browser.getLink('Configure mailing list').click()
+    >>> admin_browser.getLink(url='+mailinglist').click()
     >>> admin_browser.getControl('Apply for Mailing List').click()
     >>> admin_browser.open('http://launchpad.dev/+mailinglists')
     >>> admin_browser.getControl(name='field.guadamen').value = ['approve']

=== modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
--- lib/lp/registry/stories/mailinglists/subscriptions.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/registry/stories/mailinglists/subscriptions.txt	2009-08-29 03:14:48 +0000
@@ -22,11 +22,11 @@
 contact address.
 
     >>> admin_browser.open('http://launchpad.dev/~admins')
-    >>> admin_browser.getLink('Configure mailing list').click()
+    >>> admin_browser.getLink(url='+mailinglist').click()
     >>> admin_browser.getControl('Apply for Mailing List').click()
 
-    >>> admin_browser.open('http://launchpad.dev/~rosetta-admins')
-    >>> admin_browser.getLink('Configure mailing list').click()
+    >>> admin_browser.open('http://launchpad.dev/~rosetta-admins/')
+    >>> admin_browser.getLink(url='+mailinglist').click()
     >>> admin_browser.getControl('Apply for Mailing List').click()
 
     >>> admin_browser.open('http://launchpad.dev/+mailinglists')
@@ -42,8 +42,8 @@
     >>> transaction.commit()
     >>> logout()
 
-    >>> admin_browser.open('http://launchpad.dev/~admins')
-    >>> admin_browser.getLink('Change contact address').click()
+    >>> admin_browser.open('http://launchpad.dev/~admins/+edit')
+    >>> admin_browser.getLink(url='+contactaddress').click()
     >>> admin_browser.getControl('The Launchpad mailing list').selected = True
     >>> admin_browser.getControl('Change').click()
 
@@ -52,7 +52,7 @@
 
     >>> browser = setupBrowser(auth='Basic <email address hidden>:test')
     >>> browser.open('http://launchpad.dev/~testing-spanish-team')
-    >>> browser.getLink('Configure mailing list').click()
+    >>> browser.getLink(url='+mailinglist').click()
     >>> browser.getControl('Apply for Mailing List').click()
 
 
@@ -335,11 +335,7 @@
 
     >>> browser = setupBrowser(auth='Basic <email address hidden>:test')
     >>> browser.open('http://launchpad.dev/~admins')
-    >>> print extract_text(
-    ...     find_tag_by_id(browser.contents, 'mailing-list-involvement'))
-    You are not subscribed to the team mailing list.
-    (Subscribe)
-    >>> browser.getLink('Subscribe').click()
+    >>> browser.getLink('Subscribe to mailing list').click()
     >>> print browser.url
     http://launchpad.dev/~carlos/+editemails
 
@@ -356,11 +352,11 @@
     >>> browser.getControl('Update Subscriptions').click()
     >>> print rosetta_admins.value
     ['Preferred address']
+    >>> for tag in find_tags_by_class(browser.contents, 'informational'):
+    ...     print tag.renderContents()
+    Subscriptions updated.
 
     >>> browser.open('http://launchpad.dev/~rosetta-admins')
-    >>> print extract_text(
-    ...     find_tag_by_id(browser.contents, 'mailing-list-involvement'))
-    You are subscribed to the team mailing list.
     >>> browser.getControl('Unsubscribe')
     <SubmitControl name='unsubscribe' type='submit'>
 
@@ -372,9 +368,9 @@
 
     >>> browser.open('http://launchpad.dev/~rosetta-admins')
     >>> print extract_text(
-    ...     find_tag_by_id(browser.contents, 'mailing-list-involvement'))
-    You are not subscribed to the team mailing list.
-    (Subscribe)
+    ...     find_tag_by_id(browser.contents, 'mailing-lists'))
+    Mailing list...
+    Subscribe to mailing list...
 
 The Ubuntu translators team, which does not have any lists configured,
 does not show either link.
@@ -384,7 +380,7 @@
     ...     find_portlet(browser.contents, 'Mailing list'))
     Mailing list
     This team does not have a mailing list.
-    Configure mailing list
+    Create a mailing list
 
     >>> browser.getLink('Subscribe')
     Traceback (most recent call last):
@@ -408,14 +404,14 @@
     >>> print extract_text(
     ...     find_portlet(browser.contents, 'Mailing list'))
     Mailing list...
-    Mailing list archive
-    Mailing list subscribers...
+    View archive
+    View subscribers...
 
 The mailing list for Rosetta Admins has no subscribers.
 (Jeff Waugh has asked to subscribe but he's not considered a subscriber
 because his membership on Rosetta Admins hasn't been approved)
 
-    >>> browser.getLink('Mailing list subscribers').click()
+    >>> browser.getLink('View subscribers').click()
     >>> print browser.title
     Mailing list subscribers for the Rosetta Administrators team
     >>> print extract_text(find_tag_by_id(browser.contents, 'subscribers'))

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt	2009-08-20 05:06:34 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt	2009-08-29 03:14:48 +0000
@@ -40,9 +40,7 @@
     >>> anon_browser.title
     'PPA for Celso Providelo'
 
-The navigation menu item is presented also for person/team with no
-PPA, and performs the same action, focus the inline PPA section which
-allows users with permission to create a PPA.
+There is a link that allows users with permission to create a PPA.
 
     >>> cprov_browser = setupBrowser(
     ...     auth="Basic <email address hidden>:cprov")
@@ -52,9 +50,6 @@
     >>> print cprov_browser.title
     Launchpad Buildd Admins in Launchpad
 
-    >>> print cprov_browser.getLink('Personal Package Archives').url
-    http://launchpad.dev/~launchpad-buildd-admins#ppas
-
     >>> print_tag_with_id(cprov_browser.contents, 'ppas')
     Personal package archives
     Create a new PPA

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-private-teams.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-private-teams.txt	2009-08-21 13:48:43 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-private-teams.txt	2009-08-29 03:14:48 +0000
@@ -29,7 +29,6 @@
    >>> print_tag_with_id(browser.contents, 'ppas')
    Personal package archives
    Create a new PPA
-   Maintained Packages
 
 The form looks almost identical to that for a public team.
 


}}}