Merge lp:~james-w/canonical-identity-provider/doubled-email-acceptance into lp:canonical-identity-provider/release

[James Westby]

When a second user tries to add an email that is already in use they get an error.

The behaviour changed in r1031 such that you can't claim an email that has been
added by someone else, even if they haven't yet verified it. This updates
the acceptance test to check this, rather than checking the rules around token
invalidation with duplicated emails.

Hi,

This updates the failing acceptence test to match the new behaviour
of duplicated emails.

Thanks,

James

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'acceptance/pages.py'
--- acceptance/pages.py	2013-07-12 15:57:28 +0000
+++ acceptance/pages.py	2013-08-27 21:48:48 +0000
@@ -203,6 +203,14 @@
         sst.actions.click_link(remove_link)
         return DeleteEmail()
 
+    def get_form_errors(self):
+        try:
+            email_error = sst.actions.get_element(
+                css_class='error').text
+        except AssertionError:
+            email_error = None
+        return email_error
+
 
 class EnterConfirmationCode(LoggedUserPage):
 
 
=== modified file 'acceptance/tests/emails/doubled_email.py'
--- acceptance/tests/emails/doubled_email.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/emails/doubled_email.py	2013-08-27 21:48:48 +0000
@@ -1,12 +1,10 @@
 from sst.actions import (
-    assert_title,
-    fails,
-    wait_for,
+    assert_equal,
 )
 from u1testutils import mail
 from u1testutils.sst import config
 
-from acceptance import helpers
+from acceptance import helpers, pages
 
 config.set_base_url_from_env()
 PASSWORD = 'Admin007'
@@ -23,29 +21,9 @@
 helpers.logout()
 
 helpers.register_account(email_b_id, password=PASSWORD)
-vcode_y = helpers.add_email(email_c_id)
-
-
-# try x from a, should fail
-helpers.logout()
-helpers.login(email_a_id, PASSWORD)
-# Trying and failing to use token X completely invalidates token X, even for
-# account B (which now owns the token) later in this test.
-# helpers.try_to_validate_email(email_c_id, vcode_x)
-# fails(assert_title, 'Complete email address validation')
-
-# try y from a, should fail
-helpers.try_to_validate_email(email_c_id, vcode_y, finish_validation=False)
-fails(assert_title, 'Complete email address validation')
-
-# both x & y should work for b, but using one should kill the other.
-# try x from b, should work
-helpers.logout()
-helpers.login(email_b_id, PASSWORD)
-helpers.try_to_validate_email(email_c_id, vcode_x, finish_validation=False)
-wait_for(assert_title, 'Complete email address validation')
-
-# now, y from b should fail, because address C was already verified (but would
-# normally work)
-helpers.try_to_validate_email(email_c_id, vcode_y, finish_validation=False)
-fails(assert_title, 'Complete email address validation')
+# Once one account adds an email, no-one else can add it, even if
+# it is not yet verified.
+your_email_addresses = pages.YourEmailAddresses(open_page=True)
+your_email_addresses.add_email(email_c_id)
+assert_equal('Email already registered.',
+             your_email_addresses.get_form_errors())