Merge lp:~sinzui/launchpad/team-without-admin into lp:launchpad

[Curtis Hovey]

Explain when a team has no admins to contact.

The "Contact this team's admins" form oopses when the team does not
have any admins. This can happen when the team owner leaves the team,
but fails to delegate the admin responsibility to others.

--------------------------------------------------------------------

RULES

    Pre-implementation: no one
    * Update send_direct_contact_email() to only record the message
      was sent if there was a message.
    * Update page to explain that the team team does not have any
      admins and advise the team owner to delegate one or more
      people to be admins.

    ADDENDUM
    * The view and the recipient set do check if there are people to send
      the email to, but the rule is broken. The recipient set used to
      send to the owner, now it sends to admins. The owner rules were
      removed, but the admin case needed to be handled.

QA

    * Visit https://qastaging.launchpad.net/~motu/+contactuser
    * Verify the page explains that the team has no admins so the
      owner should be contacted instead.

LoC

    I have more than 16,000 lines of credit.

LINT

    lib/lp/registry/browser/person.py
    lib/lp/registry/browser/tests/test_person_contact.py
    lib/lp/registry/mail/notification.py
    lib/lp/registry/templates/contact-user.pt
    lib/lp/registry/tests/test_notification.py

TEST

    ./bin/test -vvc lp.registry.tests.test_notification
    ./bin/test -vvc lp.registry.browser.tests.test_person_contact
    ./bin/test -vvc -t user-to-user -t person-views lp.registry.browser.tests

    ^ These last tests have lot over overlap. I think we want to move
    all the overlap into user-to-user.txt, then rewrite the tests as
    unit tests to horrendous reduce the duplication the doctests.

IMPLEMENTATION

I updated the send_direct_contact_email() to not assume that a message was
sent. I created a new test module for this code. It duplicates quota testing
in doctests. I will try to remove the duplication, or move the doctests into
the unit test before I land this branch.
    lib/lp/registry/mail/notification.py
    lib/lp/registry/tests/test_notification.py

I fixed the len() check on the recipient set. I choose to use a common
cached property that is already confirmed to select the correct recipients
instead of adding duplicate code to determine the length of the set for
TO_ADMIN and TO_MEMBER cases. The text shown when the there is no-one to
contact must have been wrong, it was just the same message shown in the form.
I added a property to the view to explain why the user or team could not
be contacted. I made the recipient set's primary_reason attribute public
so that the view did not need to duplicate code.
    lib/lp/registry/browser/person.py
    lib/lp/registry/browser/tests/test_person_contact.py
    lib/lp/registry/templates/contact-user.pt

[Benji York (benji)]

This branch looks good. I had a couple of small questions/suggestions:

On line 83 of the diff, I don't understand why the outer parenthesis
exist on the right hand side of the equals:

    self._count_recipients = (len(self._all_recipients))

It would be nice if the tests in
lib/lp/registry/browser/tests/test_person_contact.py were arranged in
smaller test cases instead of one big test case per class.

review: Approve (code)

[Curtis Hovey (sinzui)]

On 11/26/2012 04:47 PM, Benji York wrote:
> Review: Approve code
>
> This branch looks good. I had a couple of small questions/suggestions:
>
> On line 83 of the diff, I don't understand why the outer parenthesis
> exist on the right hand side of the equals:
>
> self._count_recipients = (len(self._all_recipients))

The outer parens are cruft from the old code. I will remove them.

> It would be nice if the tests in
> lib/lp/registry/browser/tests/test_person_contact.py were arranged in
> smaller test cases instead of one big test case per class.

I will break these down.

--
Curtis Hovey
http://launchpad.net/~sinzui

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2012-11-19 21:59:03 +0000
+++ lib/lp/registry/browser/person.py	2012-11-27 20:11:21 +0000
@@ -1504,7 +1504,54 @@
         return self.context.latestKarma().count() > 0
 
 
-class PersonView(LaunchpadView, FeedsMixin):
+class ContactViaWebLinksMixin:
+
+    @cachedproperty
+    def group_to_contact(self):
+        """Contacting a team may contact different email addresses.
+
+        :return: the recipients of the message.
+        :rtype: `ContactViaWebNotificationRecipientSet` constant:
+                TO_USER
+                TO_ADMINS
+                TO_MEMBERS
+        """
+        return ContactViaWebNotificationRecipientSet(
+            self.user, self.context).primary_reason
+
+    @property
+    def contact_link_title(self):
+        """Return the appropriate +contactuser link title for the tooltip."""
+        ContactViaWeb = ContactViaWebNotificationRecipientSet
+        if self.group_to_contact == ContactViaWeb.TO_USER:
+            if self.viewing_own_page:
+                return 'Send an email to yourself through Launchpad'
+            else:
+                return 'Send an email to this user through Launchpad'
+        elif self.group_to_contact == ContactViaWeb.TO_MEMBERS:
+            return "Send an email to your team's members through Launchpad"
+        elif self.group_to_contact == ContactViaWeb.TO_ADMINS:
+            return "Send an email to this team's admins through Launchpad"
+        else:
+            raise AssertionError('Unknown group to contact.')
+
+    @property
+    def specific_contact_text(self):
+        """Return the appropriate link text."""
+        ContactViaWeb = ContactViaWebNotificationRecipientSet
+        if self.group_to_contact == ContactViaWeb.TO_USER:
+            # Note that we explicitly do not change the text to "Contact
+            # yourself" when viewing your own page.
+            return 'Contact this user'
+        elif self.group_to_contact == ContactViaWeb.TO_MEMBERS:
+            return "Contact this team's members"
+        elif self.group_to_contact == ContactViaWeb.TO_ADMINS:
+            return "Contact this team's admins"
+        else:
+            raise AssertionError('Unknown group to contact.')
+
+
+class PersonView(LaunchpadView, FeedsMixin, ContactViaWebLinksMixin):
     """A View class used in almost all Person's pages."""
 
     @property
@@ -1739,50 +1786,6 @@
         return (
             self.user is not None and self.context.is_valid_person_or_team)
 
-    @cachedproperty
-    def group_to_contact(self):
-        """Contacting a team may contact different email addresses.
-
-        :return: the recipients of the message.
-        :rtype: `ContactViaWebNotificationRecipientSet` constant:
-                TO_USER
-                TO_ADMINS
-                TO_MEMBERS
-        """
-        return ContactViaWebNotificationRecipientSet(
-            self.user, self.context)._primary_reason
-
-    @property
-    def contact_link_title(self):
-        """Return the appropriate +contactuser link title for the tooltip."""
-        ContactViaWeb = ContactViaWebNotificationRecipientSet
-        if self.group_to_contact == ContactViaWeb.TO_USER:
-            if self.viewing_own_page:
-                return 'Send an email to yourself through Launchpad'
-            else:
-                return 'Send an email to this user through Launchpad'
-        elif self.group_to_contact == ContactViaWeb.TO_MEMBERS:
-            return "Send an email to your team's members through Launchpad"
-        elif self.group_to_contact == ContactViaWeb.TO_ADMINS:
-            return "Send an email to this team's admins through Launchpad"
-        else:
-            raise AssertionError('Unknown group to contact.')
-
-    @property
-    def specific_contact_text(self):
-        """Return the appropriate link text."""
-        ContactViaWeb = ContactViaWebNotificationRecipientSet
-        if self.group_to_contact == ContactViaWeb.TO_USER:
-            # Note that we explicitly do not change the text to "Contact
-            # yourself" when viewing your own page.
-            return 'Contact this user'
-        elif self.group_to_contact == ContactViaWeb.TO_MEMBERS:
-            return "Contact this team's members"
-        elif self.group_to_contact == ContactViaWeb.TO_ADMINS:
-            return "Contact this team's admins"
-        else:
-            raise AssertionError('Unknown group to contact.')
-
     @property
     def should_show_polls_portlet(self):
         # Circular imports.
@@ -3919,7 +3922,7 @@
         """
         self.user = user
         self.description = None
-        self._primary_reason = None
+        self.primary_reason = None
         self._primary_recipient = None
         self._reason = None
         self._header = None
@@ -3955,12 +3958,12 @@
         :param person_or_team: The party that is the context of the email.
         :type person_or_team: `IPerson`.
         """
-        if self._primary_reason is self.TO_USER:
+        if self.primary_reason is self.TO_USER:
             reason = (
                 'using the "Contact this user" link on your profile page\n'
                 '(%s)' % canonical_url(person_or_team))
             header = 'ContactViaWeb user'
-        elif self._primary_reason is self.TO_ADMINS:
+        elif self.primary_reason is self.TO_ADMINS:
             reason = (
                 'using the "Contact this team\'s admins" link on the '
                 '%s team page\n(%s)' % (
@@ -3968,7 +3971,7 @@
                     canonical_url(person_or_team)))
             header = 'ContactViaWeb owner (%s team)' % person_or_team.name
         else:
-            # self._primary_reason is self.TO_MEMBERS.
+            # self.primary_reason is self.TO_MEMBERS.
             reason = (
                 'to each member of the %s team using the '
                 '"Contact this team" link on the %s team page\n(%s)' % (
@@ -3984,11 +3987,11 @@
         :param person_or_team: The party that is the context of the email.
         :type person_or_team: `IPerson`.
         """
-        if self._primary_reason is self.TO_USER:
+        if self.primary_reason is self.TO_USER:
             return (
                 'You are contacting %s (%s).' %
                 (person_or_team.displayname, person_or_team.name))
-        elif self._primary_reason is self.TO_ADMINS:
+        elif self.primary_reason is self.TO_ADMINS:
             return (
                 'You are contacting the %s (%s) team admins.' %
                 (person_or_team.displayname, person_or_team.name))
@@ -4008,12 +4011,12 @@
     def _all_recipients(self):
         """Set the cache of all recipients."""
         all_recipients = {}
-        if self._primary_reason is self.TO_MEMBERS:
+        if self.primary_reason is self.TO_MEMBERS:
             team = self._primary_recipient
             for recipient in team.getMembersWithPreferredEmails():
                 email = removeSecurityProxy(recipient).preferredemail.email
                 all_recipients[email] = recipient
-        elif self._primary_reason is self.TO_ADMINS:
+        elif self.primary_reason is self.TO_ADMINS:
             team = self._primary_recipient
             for admin in team.adminmembers:
                 # This method is similar to getTeamAdminsEmailAddresses, but
@@ -4063,13 +4066,12 @@
         """The number of recipients in the set."""
         if self._count_recipients is None:
             recipient = self._primary_recipient
-            if self._primary_reason is self.TO_MEMBERS:
-                self._count_recipients = (
-                    recipient.getMembersWithPreferredEmailsCount())
+            if self.primary_reason in (self.TO_MEMBERS, self.TO_ADMINS):
+                self._count_recipients = len(self._all_recipients)
             elif recipient.is_valid_person_or_team:
                 self._count_recipients = 1
             else:
-                # The user or team owner is deactivated.
+                # The user is deactivated.
                 self._count_recipients = 0
         return self._count_recipients
 
@@ -4094,7 +4096,7 @@
         recipients.
         """
         self._reset_state()
-        self._primary_reason = self._getPrimaryReason(person)
+        self.primary_reason = self._getPrimaryReason(person)
         self._primary_recipient = person
         if reason is None:
             reason, header = self._getReasonAndHeader(person)
@@ -4216,6 +4218,18 @@
         return throttle_date + interval
 
     @property
+    def contact_not_possible_reason(self):
+        """The reason the person cannot be contacted."""
+        if self.has_valid_email_address:
+            return None
+        elif self.recipients.primary_reason is self.recipients.TO_USER:
+            return "The user is not active."
+        elif self.recipients.primary_reason is self.recipients.TO_ADMINS:
+            return "The team has no admins. Contact the team owner instead."
+        else:
+            return "The team has no members."
+
+    @property
     def page_title(self):
         """Return the appropriate pagetitle."""
         if self.context.is_team:

=== modified file 'lib/lp/registry/browser/tests/person-views.txt'
--- lib/lp/registry/browser/tests/person-views.txt	2012-08-15 17:10:57 +0000
+++ lib/lp/registry/browser/tests/person-views.txt	2012-11-27 20:11:21 +0000
@@ -374,223 +374,6 @@
     1
 
 
-Person contacting another person
---------------------------------
-
-The PersonView provides information to make the link to contact a user.
-No Privileges Person can send a message to Sample Person, even though
-Sample Person has hidden his email addresses.
-
-    >>> login('[e-mail]')
-    >>> sample_person.hide_email_addresses
-    True
-
-    >>> view = create_initialized_view(sample_person, '+index')
-    >>> print view.contact_link_title
-    Send an email to this user through Launchpad
-
-The EmailToPersonView provides many properties to the page template to
-explain exactly who is being contacted.
-
-    >>> view = create_initialized_view(sample_person, '+contactuser')
-    >>> print view.label
-    Contact user
-
-    >>> print view.page_title
-    Contact this user
-
-    >>> print view.recipients.description
-    You are contacting Sample Person (name12).
-
-    >>> [recipient.name for recipient in view.recipients]
-    [u'name12']
-
-
-Person contacting himself
--------------------------
-
-For consistency and testing purposes, the "+contactuser" page is
-available even when someone is looking at his own profile page.  The
-wording on the tooltip is different though. No Privileges Person can
-send a message to himself.
-
-    >>> no_priv = person_set.getByEmail('[e-mail]')
-    >>> view = create_initialized_view(no_priv, '+index')
-    >>> print view.contact_link_title
-    Send an email to yourself through Launchpad
-
-The EmailToPersonView provides the explanation about who is being
-contacted.
-
-    >>> view = create_initialized_view(no_priv, '+contactuser')
-    >>> print view.label
-    Contact user
-
-    >>> print view.page_title
-    Contact yourself
-
-    >>> print view.recipients.description
-    You are contacting No Privileges Person (no-priv).
-
-    >>> [recipient.name for recipient in view.recipients]
-    [u'no-priv']
-
-
-Non-team-admin contacting a Team
---------------------------------
-
-The EmailToPersonView can be used by non-team-admins to contact the team
-admins.
-
-    >>> view = create_initialized_view(landscape_developers, '+contactuser')
-    >>> print view.label
-    Contact user
-
-    >>> print view.page_title
-    Contact this team
-
-    >>> print view.recipients.description
-    You are contacting the Landscape Developers (landscape-developers) team
-    admins.
-
-    >>> [recipient.name for recipient in view.recipients]
-    [u'name12']
-
-
-Team admin contacting a Team
-----------------------------
-
-Team admins can contact their team to broadcast a message to all members.
-Sample Person can contact his team, Landscape developers, even though they do
-not have a contact address.
-
-    >>> team_admin = login_person(landscape_developers.adminmembers[0])
-    >>> view = create_initialized_view(landscape_developers, '+index')
-    >>> print view.contact_link_title
-    Send an email to your team's members through Launchpad
-
-The EmailToPersonView can be used by admins to contact their team.
-
-    >>> view = create_initialized_view(landscape_developers, '+contactuser')
-    >>> print view.label
-    Contact user
-
-    >>> print view.page_title
-    Contact your team
-
-    >>> print view.recipients.description
-    You are contacting 2 members of the Landscape Developers
-    (landscape-developers) team directly.
-
-    >>> [recipient.name for recipient in view.recipients]
-    [u'salgado', u'name12']
-
-There are 2 recipients, so the object is treats as True.
-
-    >>> recipients = view.recipients
-    >>> len(recipients)
-    2
-
-    >>> bool(recipients)
-    True
-
-If there is only one member of the team, who must therefore be the user
-sending the email, and also be the team owner, The view provides a
-special message just for him.
-
-    >>> vanity_team = factory.makeTeam(
-    ...     sample_person, displayname='Vanity', name='vanity')
-    >>> view = create_initialized_view(vanity_team, '+contactuser')
-    >>> print view.label
-    Contact user
-
-    >>> print view.page_title
-    Contact your team
-
-    >>> print view.recipients.description
-    You are contacting 1 member of the Vanity (vanity) team directly.
-
-    >>> [recipient.name for recipient in view.recipients]
-    [u'name12']
-
-
-Contact this user/team valid addresses and quotas
--------------------------------------------------
-
-The EmailToPersonView has_valid_email_address property is normally True.
-The is_possible property is True when contact_is_allowed and
-has_valid_email_address are both True.
-
-    >>> view = create_initialized_view(landscape_developers, '+contactuser')
-    >>> view.has_valid_email_address
-    True
-
-    >>> view.contact_is_possible
-    True
-
-The EmailToPersonView provides two properties that check that the user
-is_allowed to send emails because he has not exceeded the daily quota.
-The next_try property is the date when the user will be allowed to send
-emails again. The is_possible property is True when both
-contact_is_allowed and as_valid_email_address are True.
-
-The daily quota is set to 3 emails per day. See the "Message quota" in
-`doc/user-to-user.txt` to see how these two attributes are used.
-
-
-Invalid users and anonymous contacters
---------------------------------------
-
-Inactive users and users without a preferred email address are invalid
-and cannot be contacted.
-
-    >>> former_user = person_set.getByEmail('[e-mail]',
-    ...     filter_status=False)
-    >>> view = create_initialized_view(former_user, '+contactuser')
-    >>> view.request.response.getStatus()
-    302
-
-    >>> print view.request.response.getHeader('Location')
-    http://launchpad.dev/~former-user-deactivatedaccount
-
-    >>> recipients = view.recipients
-    >>> len(recipients)
-    0
-
-    >>> bool(recipients)
-    False
-
-Anonymous users cannot contact anyone, they are redirected to the person
-or team's profile page. This can happen when off-site links point to a
-person or team's contact page.
-
-    >>> login(ANONYMOUS)
-    >>> view = create_initialized_view(landscape_developers, '+contactuser')
-    >>> view.request.response.getStatus()
-    302
-
-    >>> print view.request.response.getHeader('Location')
-    http://launchpad.dev/~landscape-developers
-
-
-Messages and subjects cannot be empty
--------------------------------------
-
-Messages or subjects that contain only whitespace are treated as an
-error that the user must fix.
-
-    >>> login('[e-mail]')
-    >>> view = create_initialized_view(
-    ...     landscape_developers, '+contactuser', form={
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': ' ',
-    ...         'field.message': ' ',
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> view.errors
-    [u'You must provide a subject and a message.']
-
-
 Person +index "Personal package archives" section
 -------------------------------------------------
 
@@ -685,5 +468,3 @@
     >>> view = create_initialized_view(sample_person, "+index")
     >>> view.should_show_ppa_section
     False
-
-

=== added file 'lib/lp/registry/browser/tests/test_person_contact.py'
--- lib/lp/registry/browser/tests/test_person_contact.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/test_person_contact.py	2012-11-27 20:11:21 +0000
@@ -0,0 +1,438 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+"""Test views and helpers related to the contact person feature."""
+
+__metaclass__ = type
+
+from lp.app.browser.tales import DateTimeFormatterAPI
+from lp.registry.browser.person import (
+    ContactViaWebLinksMixin,
+    ContactViaWebNotificationRecipientSet,
+    )
+from lp.services.identity.interfaces.emailaddress import EmailAddressStatus
+from lp.services.messages.interfaces.message import IDirectEmailAuthorization
+from lp.testing import (
+    person_logged_in,
+    TestCaseWithFactory,
+    )
+from lp.testing.layers import DatabaseFunctionalLayer
+from lp.testing.views import create_initialized_view
+
+
+class ContactViaWebNotificationRecipientSetTestCase(TestCaseWithFactory):
+    """Tests the behaviour of ContactViaWebNotificationRecipientSet."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_len_to_user(self):
+        # The recipient set length is based on the user activity.
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson(email='[e-mail]')
+        self.assertEqual(
+            1, len(ContactViaWebNotificationRecipientSet(sender, user)))
+        inactive_user = self.factory.makePerson(
+            email_address_status=EmailAddressStatus.NEW)
+        self.assertEqual(
+            0, len(
+                ContactViaWebNotificationRecipientSet(sender, inactive_user)))
+
+    def test_len_to_admins(self):
+        # The recipient set length is based on the number of admins.
+        sender = self.factory.makePerson()
+        team = self.factory.makeTeam()
+        self.assertEqual(
+            1, len(ContactViaWebNotificationRecipientSet(sender, team)))
+        with person_logged_in(team.teamowner):
+            team.teamowner.leave(team)
+        self.assertEqual(
+            0, len(ContactViaWebNotificationRecipientSet(sender, team)))
+
+    def test_len_to_members(self):
+        # The recipient set length is based on the number members.
+        member = self.factory.makePerson()
+        sender_team = self.factory.makeTeam(members=[member])
+        owner = sender_team.teamowner
+        self.assertEqual(
+            2, len(ContactViaWebNotificationRecipientSet(owner, sender_team)))
+        with person_logged_in(owner):
+            owner.leave(sender_team)
+        self.assertEqual(
+            1, len(ContactViaWebNotificationRecipientSet(owner, sender_team)))
+
+    def test_nonzero(self):
+        # The recipient set can be used in boolean conditions.
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson(email='[e-mail]')
+        self.assertTrue(
+            bool(ContactViaWebNotificationRecipientSet(sender, user)))
+        inactive_user = self.factory.makePerson(
+            email_address_status=EmailAddressStatus.NEW)
+        self.assertFalse(
+            bool(ContactViaWebNotificationRecipientSet(sender, inactive_user)))
+
+    def test_getRecipientPersons_to_user(self):
+        # The recipient set only contains the user.
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson(email='[e-mail]')
+        recipient_set = ContactViaWebNotificationRecipientSet(sender, user)
+        self.assertContentEqual(
+            [('[e-mail]', user)],
+            list(recipient_set.getRecipientPersons()))
+
+    def test_getRecipientPersons_to_admins(self):
+        # The recipient set only contains the team admins when the user
+        # is not an admin of the team the user is contacting
+        admin = self.factory.makePerson(email='[e-mail]')
+        member = self.factory.makePerson(email='[e-mail]')
+        team = self.factory.makeTeam(owner=admin, members=[member])
+        recipient_set = ContactViaWebNotificationRecipientSet(member, team)
+        self.assertContentEqual(
+            [('[e-mail]', admin)],
+            list(recipient_set.getRecipientPersons()))
+
+    def test_getRecipientPersons_to_members(self):
+        # The recipient set contains all the team members when the admin
+        # is contacting the team.
+        admin = self.factory.makePerson(email='[e-mail]')
+        member = self.factory.makePerson(email='[e-mail]')
+        team = self.factory.makeTeam(owner=admin, members=[member])
+        recipient_set = ContactViaWebNotificationRecipientSet(admin, team)
+        self.assertContentEqual(
+            [('[e-mail]', admin), ('[e-mail]', member)],
+            list(recipient_set.getRecipientPersons()))
+
+    def test_description_to_user(self):
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson(name='pting')
+        recipient_set = ContactViaWebNotificationRecipientSet(sender, user)
+        self.assertEqual(
+            'You are contacting Pting (pting).',
+            recipient_set.description)
+
+    def test_description_to_admin(self):
+        member = self.factory.makePerson()
+        team = self.factory.makeTeam(name='pting', members=[member])
+        recipient_set = ContactViaWebNotificationRecipientSet(member, team)
+        self.assertEqual(
+            'You are contacting the Pting (pting) team admins.',
+            recipient_set.description)
+
+    def test_description_to_members(self):
+        member = self.factory.makePerson()
+        team = self.factory.makeTeam(name='pting', members=[member])
+        admin = team.teamowner
+        recipient_set = ContactViaWebNotificationRecipientSet(admin, team)
+        self.assertEqual(
+            'You are contacting 2 members of the Pting (pting) team directly.',
+            recipient_set.description)
+
+    def test_rationale_and_reason_user(self):
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson(name='pting')
+        recipient_set = ContactViaWebNotificationRecipientSet(sender, user)
+        for email, recipient in recipient_set.getRecipientPersons():
+            reason, rationale = recipient_set.getReason(email)
+        self.assertEqual(
+            'using the "Contact this user" link on your profile page\n'
+            '(http://launchpad.dev/~pting)',
+            reason)
+        self.assertEqual('ContactViaWeb user', rationale)
+
+    def test_rationale_and_reason_admin(self):
+        sender = self.factory.makePerson()
+        team = self.factory.makeTeam(name='pting')
+        recipient_set = ContactViaWebNotificationRecipientSet(sender, team)
+        for email, recipient in recipient_set.getRecipientPersons():
+            reason, rationale = recipient_set.getReason(email)
+        self.assertEqual(
+            'using the "Contact this team\'s admins" link '
+            'on the Pting team page\n'
+            '(http://launchpad.dev/~pting)',
+            reason)
+        self.assertEqual('ContactViaWeb owner (pting team)', rationale)
+
+    def test_rationale_and_reason_members(self):
+        team = self.factory.makeTeam(name='pting')
+        sender = team.teamowner
+        recipient_set = ContactViaWebNotificationRecipientSet(sender, team)
+        for email, recipient in recipient_set.getRecipientPersons():
+            reason, rationale = recipient_set.getReason(email)
+        self.assertEqual(
+            'to each member of the Pting team using the '
+            '"Contact this team" link on the Pting team page\n'
+            '(http://launchpad.dev/~pting)',
+            reason)
+        self.assertEqual('ContactViaWeb member (pting team)', rationale)
+
+
+class ContactViaWebLinksMixinTestCase(TestCaseWithFactory):
+    """Tests the behaviour of ContactViaWebLinksMixin."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_PersonView_composition(self):
+        # PersonView uses the mixin.
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson(name='pting')
+        with person_logged_in(sender):
+            view = create_initialized_view(user, '+index')
+        self.assertTrue(issubclass(view.__class__, ContactViaWebLinksMixin))
+
+    def test_contact_self(self):
+        sender = self.factory.makePerson()
+        with person_logged_in(sender):
+            view = create_initialized_view(sender, '+index')
+            self.assertEqual(
+                'Send an email to yourself through Launchpad',
+                view.contact_link_title)
+        self.assertIs(
+            ContactViaWebNotificationRecipientSet.TO_USER,
+            view.group_to_contact)
+        self.assertEqual('Contact this user', view.specific_contact_text)
+
+    def test_contact_user(self):
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson()
+        with person_logged_in(sender):
+            view = create_initialized_view(user, '+index')
+        self.assertIs(
+            ContactViaWebNotificationRecipientSet.TO_USER,
+            view.group_to_contact)
+        self.assertEqual('Contact this user', view.specific_contact_text)
+        self.assertEqual(
+            'Send an email to this user through Launchpad',
+            view.contact_link_title)
+
+    def test_contact_admins(self):
+        sender = self.factory.makePerson()
+        team = self.factory.makeTeam()
+        with person_logged_in(sender):
+            view = create_initialized_view(team, '+index')
+            self.assertIs(
+                ContactViaWebNotificationRecipientSet.TO_ADMINS,
+                view.group_to_contact)
+            self.assertEqual(
+                "Contact this team's admins", view.specific_contact_text)
+            self.assertEqual(
+                "Send an email to this team's admins through Launchpad",
+                view.contact_link_title)
+
+    def test_contact_members(self):
+        team = self.factory.makeTeam()
+        admin = team.teamowner
+        with person_logged_in(admin):
+            view = create_initialized_view(team, '+index')
+            self.assertIs(
+                ContactViaWebNotificationRecipientSet.TO_MEMBERS,
+                view.group_to_contact)
+            self.assertEqual(
+                "Contact this team's members", view.specific_contact_text)
+            self.assertEqual(
+                "Send an email to your team's members through Launchpad",
+                view.contact_link_title)
+
+
+class EmailToPersonViewTestCase(TestCaseWithFactory):
+    """Tests the behaviour of EmailToPersonView."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeForm(self, email, subject='subject', message='body'):
+        return {
+                'field.field.from_': email,
+                'field.subject': subject,
+                'field.message': message,
+                'field.actions.send': 'Send',
+                }
+
+    def makeThrottledSender(self):
+        sender = self.factory.makePerson(email='[e-mail]')
+        old_message = self.factory.makeSignedMessage(email_address='[e-mail]')
+        authorization = IDirectEmailAuthorization(sender)
+        for action in xrange(authorization.message_quota):
+            authorization.record(old_message)
+        return sender
+
+    def test_anonymous_redirected(self):
+        # Anonymous users cannot use the form.
+        user = self.factory.makePerson(name='him')
+        view = create_initialized_view(user, '+contactuser')
+        response = view.request.response
+        self.assertEqual(302, response.getStatus())
+        self.assertEqual(
+            'http://launchpad.dev/~him', response.getHeader('Location'))
+
+    def test_inactive_user_redirects(self):
+        # The view explains that the user is inactive.
+        sender = self.factory.makePerson()
+        inactive_user = self.factory.makePerson(
+            name='him', email_address_status=EmailAddressStatus.NEW)
+        with person_logged_in(sender):
+            view = create_initialized_view(inactive_user, '+contactuser')
+        response = view.request.response
+        self.assertEqual(302, response.getStatus())
+        self.assertEqual(
+            'http://launchpad.dev/~him', response.getHeader('Location'))
+
+    def test_contact_not_possible_reason_to_user(self):
+        # The view explains that the user is inactive.
+        inactive_user = self.factory.makePerson(
+            email_address_status=EmailAddressStatus.NEW)
+        user = self.factory.makePerson()
+        with person_logged_in(user):
+            view = create_initialized_view(inactive_user, '+contactuser')
+        self.assertEqual(
+            "The user is not active.", view.contact_not_possible_reason)
+
+    def test_contact_not_possible_reason_to_admins(self):
+        # The view explains that the team has no admins.
+        team = self.factory.makeTeam()
+        with person_logged_in(team.teamowner):
+            team.teamowner.leave(team)
+        user = self.factory.makePerson()
+        with person_logged_in(user):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertEqual(
+            "The team has no admins. Contact the team owner instead.",
+            view.contact_not_possible_reason)
+
+    def test_contact_not_possible_reason_to_members(self):
+        # The view explains the team has no members.
+        team = self.factory.makeTeam()
+        with person_logged_in(team.teamowner):
+            team.teamowner.leave(team)
+        with person_logged_in(team.teamowner):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertEqual(
+            "The team has no members.", view.contact_not_possible_reason)
+
+    def test_has_valid_email_address(self):
+        # The has_valid_email_address property checks the len of the
+        # recipient set.
+        team = self.factory.makeTeam()
+        sender = self.factory.makePerson()
+        with person_logged_in(sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertTrue(view.has_valid_email_address)
+        with person_logged_in(team.teamowner):
+            team.teamowner.leave(team)
+        with person_logged_in(sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertFalse(view.has_valid_email_address)
+
+    def test_contact_is_allowed(self):
+        # The contact_is_allowed property checks if the user has not exceeded
+        # the quota..
+        team = self.factory.makeTeam()
+        sender = self.factory.makePerson()
+        with person_logged_in(sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertTrue(view.contact_is_allowed)
+
+        other_sender = self.makeThrottledSender()
+        with person_logged_in(other_sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertFalse(view.contact_is_allowed)
+
+    def test_contact_is_possible(self):
+        # The contact_is_possible property checks has_valid_email_address
+        # and contact_is_allowed.
+        team = self.factory.makeTeam()
+        sender = self.factory.makePerson()
+        with person_logged_in(sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertTrue(view.has_valid_email_address)
+        self.assertTrue(view.contact_is_allowed)
+        self.assertTrue(view.contact_is_possible)
+
+        other_sender = self.makeThrottledSender()
+        with person_logged_in(other_sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertTrue(view.has_valid_email_address)
+        self.assertFalse(view.contact_is_allowed)
+        self.assertFalse(view.contact_is_possible)
+
+        with person_logged_in(team.teamowner):
+            team.teamowner.leave(team)
+        with person_logged_in(sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertTrue(view.contact_is_allowed)
+        self.assertFalse(view.has_valid_email_address)
+        self.assertFalse(view.contact_is_possible)
+
+    def test_user_contacting_user(self):
+        sender = self.factory.makePerson()
+        user = self.factory.makePerson(name='pting')
+        with person_logged_in(sender):
+            view = create_initialized_view(user, '+contactuser')
+        self.assertEqual('Contact user', view.label)
+        self.assertEqual('Contact this user', view.page_title)
+
+    def test_user_contacting_self(self):
+        sender = self.factory.makePerson()
+        with person_logged_in(sender):
+            view = create_initialized_view(sender, '+contactuser')
+        self.assertEqual('Contact user', view.label)
+        self.assertEqual('Contact yourself', view.page_title)
+
+    def test_user_contacting_team(self):
+        sender = self.factory.makePerson()
+        team = self.factory.makeTeam(name='pting')
+        with person_logged_in(sender):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertEqual('Contact user', view.label)
+        self.assertEqual('Contact this team', view.page_title)
+
+    def test_member_contacting_team(self):
+        member = self.factory.makePerson()
+        team = self.factory.makeTeam(name='pting', members=[member])
+        with person_logged_in(member):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertEqual('Contact user', view.label)
+        self.assertEqual('Contact your team', view.page_title)
+
+    def test_admin_contacting_team(self):
+        member = self.factory.makePerson()
+        team = self.factory.makeTeam(name='pting', members=[member])
+        admin = team.teamowner
+        with person_logged_in(admin):
+            view = create_initialized_view(team, '+contactuser')
+        self.assertEqual('Contact user', view.label)
+        self.assertEqual('Contact your team', view.page_title)
+
+    def test_submit(self):
+        # The subject and message fields are required.
+        sender = self.factory.makePerson(email='[e-mail]')
+        user = self.factory.makePerson(name='pting')
+        form = self.makeForm('[e-mail]', 'subject', 'body')
+        with person_logged_in(sender):
+            view = create_initialized_view(user, '+contactuser', form=form)
+        self.assertEqual([], view.errors)
+        notes = [n.message for n in view.request.response.notifications]
+        self.assertEqual(['Message sent to Pting'], notes)
+
+    def test_missing_subject_and_message(self):
+        # The subject and message fields are required.
+        sender = self.factory.makePerson(email='[e-mail]')
+        user = self.factory.makePerson()
+        form = self.makeForm('[e-mail]', ' ', ' ')
+        with person_logged_in(sender):
+            view = create_initialized_view(user, '+contactuser', form=form)
+        self.assertEqual(
+            [u'You must provide a subject and a message.'], view.errors)
+
+    def test_submitted_after_quota(self):
+        # The view explains when a message was not sent because the quota
+        # was exceeded.
+        user = self.factory.makePerson()
+        sender = self.makeThrottledSender()
+        form = self.makeForm('[e-mail]')
+        with person_logged_in(sender):
+            view = create_initialized_view(user, '+contactuser', form=form)
+        notification = [
+            'Your message was not sent because you have exceeded your daily '
+            'quota of 3 messages to contact users. Try again %s.' %
+            DateTimeFormatterAPI(view.next_try).approximatedate()
+            ]
+        notes = [n.message for n in view.request.response.notifications]
+        self.assertContentEqual(notification, notes)

=== removed file 'lib/lp/registry/browser/tests/user-to-user-views.txt'
--- lib/lp/registry/browser/tests/user-to-user-views.txt	2012-04-10 14:01:17 +0000
+++ lib/lp/registry/browser/tests/user-to-user-views.txt	1970-01-01 00:00:00 +0000
@@ -1,491 +0,0 @@
-User-to-user direct email contact
-=================================
-
-A Launchpad user can contact another Launchpad user directly, even if
-the recipient is hiding their email addresses.
-
-    >>> def create_view(sender, recipient, form=None):
-    ...     return create_initialized_view(
-    ...         recipient, '+contactuser',
-    ...         form=form, principal=sender)
-
-    >>> def print_notifications(view):
-    ...     for notification in view.request.notifications:
-    ...         print notification.message
-
-For example, let's say No Privileges Person wants to contact Salgado...
-
-    >>> from zope.component import getUtility
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> person_set = getUtility(IPersonSet)
-    >>> no_priv = person_set.getByName('no-priv')
-    >>> salgado = person_set.getByName('salgado')
-
-...No Priv would start by going to Salgado's +contactuser page.
-
-    >>> from lp.testing import login
-    >>> ignored = login_person(no_priv)
-    >>> view = create_view(no_priv, salgado)
-
-This contact is allowed.
-
-    >>> print view.label
-    Contact user
-
-    >>> view.contact_is_allowed
-    True
-
-No Priv changes her mind though.
-
-    >>> print view.cancel_url
-    http://launchpad.dev/~salgado
-
-No Priv decides, what the heck, let's contact Salgado after all.
-
-    >>> view = create_view(
-    ...     no_priv, salgado, {
-    ...     'field.field.from_': '[e-mail]',
-    ...     'field.subject': 'Hello Salgado',
-    ...     'field.message': 'Can you tell me about your project?',
-    ...     'field.actions.send': 'Send',
-    ...     })
-    >>> print_notifications(view)
-    Message sent to Guilherme Salgado
-
-    # Capture the date of the last contact for later.
-
-    >>> from lp.services.config import config
-    >>> from lp.services.messages.model.message import UserToUserEmail
-    >>> from lazr.config import as_timedelta
-    >>> from storm.locals import Store
-    >>> first_contact = Store.of(no_priv).find(
-    ...     UserToUserEmail,
-    ...     UserToUserEmail.sender == no_priv).one()
-    >>> expires = first_contact.date_sent + as_timedelta(
-    ...     config.launchpad.user_to_user_throttle_interval)
-
-No Priv sends two more messages to Salgado.  Each of these are allowed
-too.
-
-    >>> view = create_view(
-    ...     no_priv, salgado, {
-    ...     'field.field.from_': '[e-mail]',
-    ...     'field.subject': 'Hello Salgado',
-    ...     'field.message': 'Can you tell me about your project?',
-    ...     'field.actions.send': 'Send',
-    ...     })
-    >>> print_notifications(view)
-    Message sent to Guilherme Salgado
-
-    >>> view = create_view(
-    ...     no_priv, salgado, {
-    ...     'field.field.from_': '[e-mail]',
-    ...     'field.subject': 'Hello Salgado',
-    ...     'field.message': 'Can you tell me about your project?',
-    ...     'field.actions.send': 'Send',
-    ...     })
-    >>> print_notifications(view)
-    Message sent to Guilherme Salgado
-
-Now however, No Priv had reached her quota for direct user-to-user
-contact and is not allowed to send a fourth message today.
-
-    >>> view = create_view(no_priv, salgado)
-    >>> view.contact_is_allowed
-    False
-
-No Priv can try again later.
-
-    >>> view.next_try == expires
-    True
-
-As a corner case, let's say the number of notifications allowed was
-greater yesterday than it was today.
-
-    >>> config.push('seven_allowed', """\
-    ...    [launchpad]
-    ...    user_to_user_max_messages: 7
-    ...    """)
-
-No Priv can actually try again right now.
-
-    >>> from datetime import datetime
-    >>> import pytz
-    >>> view.next_try <= datetime.now(pytz.timezone('UTC'))
-    True
-
-So, No Priv sends four more emails.
-
-    >>> for i in range(4):
-    ...     assert create_view(no_priv, salgado).contact_is_allowed, (
-    ...         'Contact was not allowed? %s' % i)
-    ...     view = create_view(
-    ...         no_priv, salgado, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'Hello Salgado',
-    ...         'field.message': 'Can you tell me about your project?',
-    ...         'field.actions.send': 'Send',
-    ...         })
-    ...     print_notifications(view)
-    Message sent to Guilherme Salgado
-    Message sent to Guilherme Salgado
-    Message sent to Guilherme Salgado
-    Message sent to Guilherme Salgado
-
-No Priv has once again reached her limit of emails.
-
-    >>> view = create_view(no_priv, salgado)
-    >>> view.contact_is_allowed
-    False
-
-    >>> view.next_try == expires
-    True
-
-The configuration changes back to allow only three emails.
-
-    >>> config.pop('seven_allowed')
-    (...)
-
-    >>> contacts = Store.of(no_priv).find(
-    ...     UserToUserEmail,
-    ...     UserToUserEmail.sender == no_priv)
-    >>> contact = list(contacts)[4]
-    >>> expires = contact.date_sent + as_timedelta(
-    ...     config.launchpad.user_to_user_throttle_interval)
-
-
-Non-ASCII names
----------------
-
-Carlos has non-ASCII characters in his name.  When he sends a message to
-a user, his real name will be properly RFC 2047 encoded.
-
-    >>> transaction.abort()
-    >>> from lp.services.mail import stub
-    >>> del stub.test_emails[:]
-    >>> len(stub.test_emails)
-    0
-
-    >>> carlos = person_set.getByName('carlos')
-    >>> login('[e-mail]')
-    >>> view = create_view(
-    ...     carlos, no_priv, {
-    ...     'field.field.from_': '[e-mail]',
-    ...     'field.subject': 'Hello No Priv',
-    ...     'field.message': 'I see funny characters',
-    ...     'field.actions.send': 'Send',
-    ...     })
-    >>> transaction.commit()
-
-    >>> len(stub.test_emails)
-    1
-
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> print raw_msg
-    Content-Type: text/plain; charset="us-ascii"
-    ...
-    From: =?utf-8?q?Carlos_Perell=C3=B3_Mar=C3=ADn?= <[e-mail]>
-    To: No Privileges Person <[e-mail]>
-    ...
-
-Similarly, if Carlos is the recipient of a message, his real name will
-be properly RFC 2047 encoded as well.
-
-    >>> del stub.test_emails[:]
-
-    >>> login('[e-mail]')
-    >>> view = create_view(
-    ...     no_priv, carlos, {
-    ...     'field.field.from_': '[e-mail]',
-    ...     'field.subject': 'Hello Carlos',
-    ...     'field.message': 'I see funny characters',
-    ...     'field.actions.send': 'Send',
-    ...     })
-    >>> transaction.commit()
-
-    >>> len(stub.test_emails)
-    1
-
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> print raw_msg
-    Content-Type: text/plain; charset="us-ascii"
-    ...
-    From: No Privileges Person <[e-mail]>
-    To: =?utf-8?q?Carlos_Perell=C3=B3_Mar=C3=ADn?= <[e-mail]>
-    ...
-
-
-Hidden addresses
-----------------
-
-Salgado decides to hide his email addresses.
-
-    >>> ignored = login_person(salgado)
-    >>> salgado.hide_email_addresses = True
-
-Anne contacts Salgado even though his email addresses are hidden.
-
-    >>> anne = factory.makePerson(email='[e-mail]', name='anne')
-    >>> ignored = login_person(anne)
-
-    >>> view = create_view(
-    ...     anne, salgado, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'Hello Salgado',
-    ...         'field.message': 'It is nice to meet you',
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> print_notifications(view)
-    Message sent to Guilherme Salgado
-
-
-Contacting teams
-----------------
-
-Teams can also be contacted directly, regardless of whether they have no
-official contact address, use a Launchpad mailing list, or have the
-contact address set to an explicit address.
-
-    # Clear out left over crud.
-
-    >>> transaction.commit()
-    >>> del stub.test_emails[:]
-
-    >>> from email import message_from_string
-    >>> def print_messages():
-    ...     message_count = 0
-    ...     message_subjects = set()
-    ...     message_senders = set()
-    ...     message_recipients = set()
-    ...     message_bodies = set()
-    ...     while stub.test_emails:
-    ...         from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    ...         message = message_from_string(raw_msg)
-    ...         message_count += 1
-    ...         message_subjects.add(message['subject'])
-    ...         message_senders.add(message['from'])
-    ...         message_recipients.add(message['to'])
-    ...         message_bodies.add(message.get_payload())
-    ...     print 'Senders:', message_senders
-    ...     print 'Subjects:', message_subjects
-    ...     print 'Bodies:'
-    ...     for body in sorted(message_bodies):
-    ...         print body
-    ...     print '# of Messages:', message_count
-    ...     print 'Recipients:'
-    ...     for recipient in sorted(message_recipients):
-    ...         print '   ', recipient
-
-
-Non-member to team
-..................
-
-Non-members may only contact the team owner.
-
-    >>> guadamen = person_set.getByName('guadamen')
-    >>> bart = factory.makePerson(email='[e-mail]', name='bart')
-    >>> ignored = login_person(bart)
-
-    >>> view = create_view(
-    ...     bart, guadamen, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'Hello Guadamen',
-    ...         'field.message': 'Can one of you help me?',
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> print_notifications(view)
-    Message sent to GuadaMen
-
-    >>> transaction.commit()
-    >>> print_messages()
-    Senders: set(['Bart <[e-mail]>'])
-    Subjects: set(['Hello Guadamen'])
-    Bodies:
-    Can one of you help me?
-    --
-    This message was sent from Launchpad by
-    Bart (http://launchpad.dev/~bart)
-    using the "Contact this team's admins" link on the GuadaMen team page
-    (http://launchpad.dev/~guadamen).
-    For more information see
-    https://help.launchpad.net/YourAccount/ContactingPeople
-    # of Messages: 2
-    Recipients:
-        Foo Bar <[e-mail]>
-        Ubuntu Team <[e-mail]>
-
-
-Member to team
-..............
-
-Foo Bar is a member of Guadamen team, he is not restricted to contacting
-the team owner. The Guadamen team has no contact address, so contacting
-them contacts all its members directly.
-
-    >>> login('[e-mail]')
-    >>> foo_bar = person_set.getByName('name16')
-    >>> view = create_view(
-    ...     foo_bar, guadamen, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'Hello Guadamen',
-    ...         'field.message': 'Can one of you help me?',
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> print_notifications(view)
-    Message sent to GuadaMen
-
-There are 10 members of the team, so exactly 10 unique copies of the
-message are sent, one to each team member. Everyone gets a message with
-the same subject and body from the same sender.
-
-    >>> transaction.commit()
-    >>> print_messages()
-    Senders: set(['Foo Bar <[e-mail]>'])
-    Subjects: set(['Hello Guadamen'])
-    Bodies:
-    Can one of you help me?
-    --
-    This message was sent from Launchpad by
-    Foo Bar (http://launchpad.dev/~name16)
-    to each member of the GuadaMen team using the "Contact this team" link on
-    the GuadaMen team page (http://launchpad.dev/~guadamen).
-    For more information see
-    https://help.launchpad.net/YourAccount/ContactingPeople
-    # of Messages: 10
-    Recipients:
-        Alexander Limi <[e-mail]>
-        Celso Providelo <[e-mail]>
-        Colin Watson <[e-mail]>
-        Daniel Silverstone <[e-mail]>
-        Edgar Bursic <[e-mail]>
-        Foo Bar <[e-mail]>
-        Jeff Waugh <[e-mail]>
-        Mark Shuttleworth <[e-mail]>
-        Steve Alexander <[e-mail]>
-        Ubuntu Team <[e-mail]>
-
-    >>> transaction.commit()
-
-Message quota
--------------
-
-The EmailToPersonView provides two properties that check that the user
-is_allowed to send emails because he has not exceeded the daily quota.
-The next_try property is the date when the user will be allowed to send
-emails again. The is_possible property will be False if is_allowed is
-False.
-
-    >>> view = create_view(
-    ...     foo_bar, guadamen, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'Hello Guadamen',
-    ...         'field.message': 'Can one of you help me?',
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> view.contact_is_allowed
-    True
-
-    >>> view.contact_is_possible
-    True
-
-    >>> view.initialize()
-    >>> transaction.commit()
-
-Foo Bar has now reached his quota and can send no more contact messages
-today.
-
-    >>> view = create_view(
-    ...     foo_bar, guadamen, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'My last question for Guadamen',
-    ...         'field.message': 'Really, can one of you help me!',
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> view.contact_is_allowed
-    False
-
-    >>> view.next_try
-    datetime.datetime...
-
-    >>> view.contact_is_possible
-    False
-
-    >>> print_notifications(view)
-    Your message was not sent because you have exceeded your daily quota of
-    3 messages to contact users. Try again in ...
-
-
-Identifying information
------------------------
-
-Every contact message has a special Launchpad header so that people can
-tell that the message came to them through Launchpad. It has a footer
-that contains an explanation as well.
-
-    >>> cris = factory.makePerson(email='[e-mail]', name='cris')
-    >>> dave = factory.makePerson(email='[e-mail]', name='dave')
-    >>> ignored = login_person(cris)
-
-    >>> view = create_view(
-    ...     cris, dave, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'Hi Dave',
-    ...         'field.message': 'Can you help me?' ,
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> transaction.commit()
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> print raw_msg
-    Content-Type: text/plain; charset="us-ascii"
-    ...
-    From: Cris <[e-mail]>
-    To: Dave <[e-mail]>
-    Subject: Hi Dave
-    ...
-    X-Launchpad-Message-Rationale: ContactViaWeb user
-    ...
-    <BLANKLINE>
-    Can you help me?
-    --
-    This message was sent from Launchpad by
-    Cris (http://launchpad.dev/~cris)
-    using the "Contact this user" link on your profile page
-    (http://launchpad.dev/~dave).
-    For more information see
-    https://help.launchpad.net/YourAccount/ContactingPeople
-
-
-Message wrapping
-----------------
-
-The message body is wrapped at 72 characters. The footer is not wrapped,
-but a new line is started after the names of the sender and the recient
-to minimise long lines.
-
-    >>> login('[e-mail]')
-    >>> sample_person = person_set.getByEmail('[e-mail]')
-    >>> landscape_developers = person_set.getByName('landscape-developers')
-    >>> view = create_view(
-    ...     sample_person, landscape_developers, {
-    ...         'field.field.from_': '[e-mail]',
-    ...         'field.subject': 'Wrapping test ',
-    ...         'field.message': 'Can you help me? ' * 8,
-    ...         'field.actions.send': 'Send',
-    ...         })
-    >>> transaction.commit()
-    >>> from_addr, to_addrs, raw_msg = stub.test_emails.pop()
-    >>> header, body =  raw_msg.split('\n\n')
-    >>> for line in body.split('\n'):
-    ...     print "^%s$" % line
-    ^Can you help me? Can you help me? Can you help me? Can you help me? Can$
-    ^you help me? Can you help me? Can you help me? Can you help me?$
-    ^-- $
-    ^This message was sent from Launchpad by$
-    ^Sample Person (http://launchpad.dev/~name12)$
-    ^to each member of the Landscape Developers team using the "Contact this$
-    ^team" link on the Landscape Developers team page$
-    ^(http://launchpad.dev/~landscape-developers).$
-    ^For more information see$
-    ^https://help.launchpad.net/YourAccount/ContactingPeople$
-
-

=== modified file 'lib/lp/registry/mail/notification.py'
--- lib/lp/registry/mail/notification.py	2012-08-14 23:27:07 +0000
+++ lib/lp/registry/mail/notification.py	2012-11-27 20:11:21 +0000
@@ -396,15 +396,7 @@
         message['X-Launchpad-Message-Rationale'] = rational_header
         # Send the message.
         sendmail(message, bulk=False)
-    # BarryWarsaw 19-Nov-2008: If any messages were sent, record the fact that
-    # the sender contacted the team.  This is not perfect though because we're
-    # really recording the fact that the person contacted the last member of
-    # the team.  There's little we can do better though because the team has
-    # no contact address, and so there isn't actually an address to record as
-    # the team's recipient.  It currently doesn't matter though because we
-    # don't actually do anything with the recipient information yet.  All we
-    # care about is the sender, for quota purposes.  We definitely want to
-    # record the contact outside the above loop though, because if there are
-    # 10 members of the team with no contact address, one message should not
-    # consume the sender's entire quota.
-    authorization.record(message)
+    # Use the information from the last message sent to record the action
+    # taken. The record will be used to throttle user-to-user emails.
+    if message is not None:
+        authorization.record(message)

=== modified file 'lib/lp/registry/templates/contact-user.pt'
--- lib/lp/registry/templates/contact-user.pt	2012-02-10 19:52:27 +0000
+++ lib/lp/registry/templates/contact-user.pt	2012-11-27 20:11:21 +0000
@@ -31,7 +31,7 @@
         </p>
       </tal:disallowed>
       <tal:disallowed tal:condition="not:view/has_valid_email_address">
-        <p tal:content="view/recipients/description"/>
+        <p tal:content="view/contact_not_possible_reason"/>
       </tal:disallowed>
     </div>
   </body>

=== added file 'lib/lp/registry/tests/test_notification.py'
--- lib/lp/registry/tests/test_notification.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/tests/test_notification.py	2012-11-27 20:11:21 +0000
@@ -0,0 +1,114 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test notification classes and functions."""
+
+__metaclass__ = type
+
+from lp.registry.mail.notification import send_direct_contact_email
+from lp.services.mail.notificationrecipientset import NotificationRecipientSet
+from lp.services.messages.interfaces.message import  (
+    IDirectEmailAuthorization,
+    QuotaReachedError,
+    )
+from lp.testing import TestCaseWithFactory
+from lp.testing.layers import DatabaseFunctionalLayer
+from lp.testing.mail_helpers import pop_notifications
+
+
+class SendDirectContactEmailTestCase(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_send_message(self):
+        self.factory.makePerson(email='[e-mail]', name='me')
+        user = self.factory.makePerson(email='[e-mail]', name='him')
+        subject = 'test subject'
+        body = 'test body'
+        recipients_set = NotificationRecipientSet()
+        recipients_set.add(user, 'test reason', 'test rationale')
+        pop_notifications()
+        send_direct_contact_email('[e-mail]', recipients_set, subject, body)
+        notifications = pop_notifications()
+        notification = notifications[0]
+        self.assertEqual(1, len(notifications))
+        self.assertEqual('Me <[e-mail]>', notification['From'])
+        self.assertEqual('Him <[e-mail]>', notification['To'])
+        self.assertEqual(subject, notification['Subject'])
+        self.assertEqual(
+            'test rationale', notification['X-Launchpad-Message-Rationale'])
+        self.assertIs(None, notification['Precedence'])
+        self.assertTrue('launchpad' in notification['Message-ID'])
+        self.assertEqual(
+            '\n'.join([
+                '%s' % body,
+                '-- ',
+                'This message was sent from Launchpad by',
+                'Me (http://launchpad.dev/~me)',
+                'test reason.',
+                'For more information see',
+                'https://help.launchpad.net/YourAccount/ContactingPeople']),
+            notification.get_payload())
+
+    def test_quota_reached_error(self):
+        # An error is raised if the user has reached the daily quota.
+        self.factory.makePerson(email='[e-mail]', name='me')
+        user = self.factory.makePerson(email='[e-mail]', name='him')
+        recipients_set = NotificationRecipientSet()
+        old_message = self.factory.makeSignedMessage(email_address='[e-mail]')
+        authorization = IDirectEmailAuthorization(user)
+        for action in xrange(authorization.message_quota):
+            authorization.record(old_message)
+        self.assertRaises(
+            QuotaReachedError, send_direct_contact_email,
+            '[e-mail]', recipients_set, 'subject', 'body')
+
+    def test_empty_recipient_set(self):
+        # The recipient set can be empty. No messages are sent and the
+        # action does not count toward the daily quota.
+        self.factory.makePerson(email='[e-mail]', name='me')
+        user = self.factory.makePerson(email='[e-mail]', name='him')
+        recipients_set = NotificationRecipientSet()
+        old_message = self.factory.makeSignedMessage(email_address='[e-mail]')
+        authorization = IDirectEmailAuthorization(user)
+        for action in xrange(authorization.message_quota - 1):
+            authorization.record(old_message)
+        pop_notifications()
+        send_direct_contact_email(
+            '[e-mail]', recipients_set, 'subject', 'body')
+        notifications = pop_notifications()
+        self.assertEqual(0, len(notifications))
+        self.assertTrue(authorization.is_allowed)
+
+    def test_wrapping(self):
+        self.factory.makePerson(email='[e-mail]')
+        user = self.factory.makePerson()
+        recipients_set = NotificationRecipientSet()
+        recipients_set.add(user, 'test reason', 'test rationale')
+        pop_notifications()
+        body = 'Can you help me? ' * 8
+        send_direct_contact_email('[e-mail]', recipients_set, 'subject', body)
+        notifications = pop_notifications()
+        body, footer = notifications[0].get_payload().split('-- ')
+        self.assertEqual(
+            'Can you help me? Can you help me? Can you help me? '
+            'Can you help me? Can\n'
+            'you help me? Can you help me? Can you help me? '
+            'Can you help me?\n',
+            body)
+
+    def test_name_utf8_encoding(self):
+        # Names are encoded in the From and To headers.
+        self.factory.makePerson(email='[e-mail]', displayname=u'sn\xefrf')
+        user = self.factory.makePerson(
+            email='[e-mail]', displayname=u'pti\xedng')
+        recipients_set = NotificationRecipientSet()
+        recipients_set.add(user, 'test reason', 'test rationale')
+        pop_notifications()
+        send_direct_contact_email('[e-mail]', recipients_set, 'test', 'test')
+        notifications = pop_notifications()
+        notification = notifications[0]
+        self.assertEqual(
+            '=?utf-8?b?c27Dr3Jm?= <[e-mail]>', notification['From'])
+        self.assertEqual(
+            '=?utf-8?q?pti=C3=ADng?= <[e-mail]>', notification['To'])