Merge lp:~jaboing/canonical-identity-provider/more_device_tests_refactored into lp:canonical-identity-provider/release

[Julien Funk]

Refactored many of the devices tests, Google, Yubikey, Paper, Generate_Codes and Device Warning.

[lp:~jaboing/canonical-identity-provider/more_device_tests_refactored]

851. By Julien Funk on 2013-05-10

Attempting to fix merge conflict

852. By Julien Funk on 2013-05-10

Merging my changes for proposal.

853. By Julien Funk on 2013-05-10

Removed conflicts from source.

[Leo Arias (elopio)]

<jfunk> elopio, there's a couple things in there we might need to go over - line 10,11 + 118-121
<elopio> jfunk: what's up with those lines?
<jfunk> elopio, well, they methods come from the old helpers, I changed the test a bit so it didn't need those methods, but they seem like they'd be useful for other tests
<jfunk> I didn't want them to get lost so I added them to the page object, but they're referencing the helpers, duno if that's approporiate or not
<elopio> jfunk: in my opinion, the right place for get_key_from_qrcode is inside AddGoogleDevice as a _private method
<elopio> but I'm not sure if it's still used somewhere else.
<jfunk> elopio, maybe it's not a good idea, but one option is to copy the helpers until we've migrated the entire acceptance test collection
<jfunk> then delete the old ones
<elopio> jfunk: that's fine, with a TODO comment saying that.
<elopio> after we finish all the devices tests refactors, we can get rid of the acceptance/devices/__init__.py
<jfunk> elopio, ok I'll make that change now
<jfunk> please look at the changes I made to the code generation test cases
<jfunk> elopio, I made large change to the process
<jfunk> namely I stopped using the paper code to log in, and only verified that we create a new set of codes
<jfunk> I figured that testing the succes of a 2F login belonged in a different test suite
<elopio> One second, I'm still reading.
<elopio> l 362. it's weird.
<elopio> I think it will look better doing
<elopio> start = super(TestAddDevice, self).navigate_to_page()
<elopio> return navigate_to_device_add_page(start)
<elopio> after reading some of your code, now I think that naviaget_to_page is not a good name.
<elopio> sometimes we will use it to navigate_to_page, prepare some preconditions, keep navigating.
<elopio> and some other times we will use it to get the start page.
<elopio> I think that the fixtures project might help to makes things clearer here.
<jfunk> elopio, we can do it that way, I thought it was nice since that function is called 4 or 5 times to have as few lines as possible
<elopio> jfunk: yes, but the function is not clear, and the way you call it makes it even less clear.
<elopio> it's my fault, but while we find a clearer way to handle the preconditions, I'd prefer it to be more verbose.
<jfunk> elopio, re: navigate_to_page - I prefer using this method over setUp because it's simpler
<jfunk> elopio, perhaps just a better name
<elopio> jfunk: I think the name is one problem, and the second is that it's a magic secondary effect of calling set up.
<elopio> that's where fixtures can come handy, make the magic more explicit.
<jfunk> yeah, I think I mentioned that in my first experience with it
<elopio> jfunk: yes, next week I'll try to change it.
<elopio> let me know if you have more ideas related to it.
<jfunk> elopio, not at the moment, but I'll let you know if anything pops up, can you tell me more about the fixtures project?
<elopio> jfunk: https://pypi.python.org/pypi/fixtures/0.3.8
<elopio> our preconditions are really complex, so we can model them in a fixture
<elopio> and currently we are sharing preconditions between tests using inheritance
<elopio> with this we can make fixtur...

[Simon Davy (bloodearnest)]

Minor quibble - l346-348 seem to be over indented, pep8-wise.

Other than that, looks good to me.

[Natalia Bidart (nataliabidart)]

Setting MP as Rejected to reduce numbers of landing candidates in @reviewlist. Change status again if this MP is still current.

Unmerged revisions

853. By Julien Funk on 2013-05-10

Removed conflicts from source.

852. By Julien Funk on 2013-05-10

Merging my changes for proposal.

851. By Julien Funk on 2013-05-10

Attempting to fix merge conflict

850. By Julien Funk on 2013-05-10

Refactored backup device warning tests

849. By Julien Funk on 2013-05-10

refactored generate paper codes, removed uncessary steps and made into TestCase format

848. By Julien Funk on 2013-05-09

Refactored the Google, Yubikey and Paper device add tests into the class format and moved to test_add_devices.py

=== modified file 'acceptance/pages.py'
--- acceptance/pages.py	2013-05-10 00:45:35 +0000
+++ acceptance/pages.py	2013-05-10 13:57:27 +0000
@@ -7,6 +7,12 @@
 import sst.actions
 import u1testutils.sso.sst.pages
 
+from acceptance.devices import (
+    get_key_from_qrcode,
+    store_paper_device,
+    update_paper_device
+)
+
 from u1testutils.sst import log_action
 
 
@@ -188,12 +194,20 @@
         return AddNewAuthenticationDevice()
 
     @log_action(logging.info)
-    def delete_authentication_device(self):
-        delete_link = sst.actions.get_element_by_css(
+    def delete_authentication_device(self, index=0):
+        delete_link = sst.actions.get_elements_by_css(
             'a[data-qa-id="delete-device"]')
-        sst.actions.click_link(delete_link)
+        sst.actions.click_link(delete_link[index])
         return DeleteAuthenticationDevice()
 
+    def is_warning_displayed(self):
+        try:
+            warning_message = sst.actions.get_element_by_css(
+                '#missing_backup_device')
+            return warning_message.is_displayed()
+        except AssertionError:
+            return False
+
 
 class DeleteAuthenticationDevice(PageWithUsernameInTitle):
 
@@ -250,6 +264,21 @@
         self._add_device('type_generic')
         return AddGenericDevice()
 
+    @log_action(logging.info)
+    def add_google_device(self):
+        self._add_device('type_google')
+        return AddGoogleDevice()
+
+    @log_action(logging.info)
+    def add_yubikey_device(self):
+        self._add_device('type_yubi')
+        return AddYubikeyDevice()
+
+    @log_action(logging.info)
+    def add_paper_device(self):
+        self._add_device('type_paper')
+        return PaperDevice()
+
     def _add_device(self, device_radio_identifier):
         sst.actions.set_radio_value(device_radio_identifier)
         add_button = sst.actions.get_element(
@@ -322,3 +351,82 @@
 
     def get_key(self):
         return sst.actions.get_element(name='hex_key').get_attribute('value')
+
+
+class AddGoogleDevice(AddDevice):
+
+    def get_key(self, email):
+        return get_key_from_qrcode(email)
+
+
+class AddYubikeyDevice(AddDevice):
+
+    def get_key(self):
+        return sst.actions.get_element(name='hex_key').get_attribute('value')
+
+    def assert_warning(self):
+        # Check that the YubiKey warning is showing
+        warning = ('Warning: The YubiKey is shipped with a credential in the '
+           'short-press slot')
+        sst.actions.assert_element(css_class='warning', text_regex=warning)
+
+
+class PaperDevice(PageWithUsernameInTitle):
+
+    title = "{0}'s devices"
+    url_path = '/device-print/.*'
+    is_url_path_regex = True
+    headings1 = ['Ubuntu Single Sign On','Printable backup codes']
+
+    def assert_codes_present(self):
+        # ol.codelist has list of N codes
+        sst.actions.assert_element(tag='ol', css_class='codelist')
+
+    def assert_print_button_visible(self):
+        sst.actions.assert_element(tag='a', id='printbtn', css_class='btn')
+
+    @log_action(logging.info)
+    def go_back_to_device_list(self):
+        device_list_link = sst.actions.get_element_by_css(
+            'a[data-qa-id="go_back"]')
+        sst.actions.click_link(device_list_link)
+        return YourAuthenticationDevices()
+
+    @log_action(logging.info)
+    def generate_new_codes(self):
+        generate_link = sst.actions.get_element_by_css(
+            'a[data-qa-id="generate_codes"]')
+        sst.actions.click_link(generate_link)
+        return GenerateNewPaperCodes()
+
+    def get_first_code(self):
+        return sst.actions.get_elements_by_css('ol.codelist li')[0].text
+
+    def store_paper_device(self, name='Printable Backup Codes'):
+        acceptance.devices.store_paper_device(name)
+
+    def update_paper_device(self, name='Printable Backup Codes'):
+        acceptance.devices.update_paper_device(name)
+
+
+class GenerateNewPaperCodes(PageWithUsernameInTitle):
+
+    title = "{0}'s devices"
+    url_path = '/device-generate/.*'
+    is_url_path_regex = True
+    headings1 = ['Ubuntu Single Sign On','Generate new codes']
+
+    @log_action(logging.info)
+    def confirm_new_codes(self):
+        confirm_button = sst.actions.get_element_by_css(
+            'button[data-qa-id="confirm-codes"]')
+        sst.actions.click_button(confirm_button)
+        return PaperDevice()
+
+    @log_action(logging.info)
+    def cancel(self):
+        cancel_link = sst.actions.get_element_by_css('a[data-qa-id="cancel"]')
+        sst.actions.click_link(cancel_link)
+        return PaperDevice()
+
+

=== removed file 'acceptance/tests/devices/add_device_google.py'
--- acceptance/tests/devices/add_device_google.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/devices/add_device_google.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# Test google device addition
-from oath import hotp
-from sst.actions import (
-    assert_table_has_rows,
-    assert_table_row_contains_text,
-    click_link,
-    get_element,
-    set_radio_value,
-    write_textfield,
-)
-from u1testutils.sst import config
-
-from acceptance import helpers
-from acceptance.devices import (
-    click_add_device_button,
-    click_add_new_device_link,
-    get_key_from_qrcode,
-    store_device,
-)
-
-
-config.set_base_url_from_env()
-
-email = helpers.login_or_register_account(device_cleanup=True)
-
-# Go to the authentication devices page
-click_link('devices-link')
-
-# Click on "Add a new authentication device" link
-click_add_new_device_link()
-
-# Choose "Google device" and click add device
-set_radio_value('type_google')
-click_add_device_button()
-
-# get/check the image
-aes_key = get_key_from_qrcode(email)
-
-# set device name
-name = get_element(tag='input', name='name')
-write_textfield(name, 'add_device_google')
-
-# Add correctly generated OTP
-valid_otp = hotp.hotp(aes_key, 0)
-write_textfield(get_element(tag='input', name='otp'), valid_otp)
-
-# Click "Add device"
-click_add_device_button()
-store_device('add_device_google', aes_key)
-
-# Check our new device is now in the table, with the correct name
-assert_table_has_rows('device-list', 1)
-assert_table_row_contains_text('device-list', 0,
-                               ['add_device_google', 'Delete'], regex=True)

=== removed file 'acceptance/tests/devices/add_device_paper.py'
--- acceptance/tests/devices/add_device_paper.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/devices/add_device_paper.py	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-# Test google device addition
-from sst.actions import (
-    assert_element,
-    assert_table_has_rows,
-    assert_table_row_contains_text,
-    assert_url_contains,
-    check_flags,
-    click_link,
-    get_element,
-    go_to,
-    set_radio_value,
-)
-from u1testutils.sst import config
-
-from acceptance import helpers
-from acceptance.devices import (
-    click_add_device_button,
-    click_add_new_device_link,
-    store_paper_device,
-)
-
-check_flags('paper_device')
-
-config.set_base_url_from_env()
-
-email = helpers.login_or_register_account(device_cleanup=True)
-
-# Go to the authentication devices page
-click_link('devices-link')
-
-# Click on "Add a new authentication device" link
-click_add_new_device_link()
-
-# Choose "paper" device and click add device
-set_radio_value('type_paper')
-click_add_device_button()
-
-# check the page is correct
-assert_url_contains('/device-print/')
-assert_element(tag='h1', text='Printable backup codes')
-
-# ol.codelist has list of N codes
-assert_element(tag='ol', css_class='codelist')
-# make sure print button is visible
-assert_element(tag='a', id='printbtn', css_class='btn')
-
-# Go to the device-list page
-go_to('/device-list')
-
-# Check our new device is now in the table, with the correct name
-assert_table_has_rows('device-list', 1)
-texts = ['Printable Backup Codes', 'Rename Delete View Codes']
-assert_table_row_contains_text('device-list', 0, texts, regex=True)
-
-# Save the device for cleanup
-store_paper_device(name='Printable Backup Codes')
-
-# Go to the print view
-click_link(get_element(tag='a', text='View Codes'))
-assert_url_contains('/device-print/')
-
-# ol.codelist has list of N codes
-assert_element(tag='ol', css_class='codelist')
-# make sure print button is visible
-assert_element(tag='a', id='printbtn')

=== removed file 'acceptance/tests/devices/add_device_yubikey.py'
--- acceptance/tests/devices/add_device_yubikey.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/devices/add_device_yubikey.py	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-# Test YubiKey device addition
-from oath import hotp
-from sst.actions import (
-    assert_element,
-    assert_table_has_rows,
-    assert_table_row_contains_text,
-    click_link,
-    get_element,
-    set_radio_value,
-    write_textfield,
-)
-from u1testutils.sst import config
-
-from acceptance import helpers
-from acceptance.devices import (
-    click_add_device_button,
-    click_add_new_device_link,
-    store_device,
-)
-
-
-config.set_base_url_from_env()
-
-email = helpers.login_or_register_account(device_cleanup=True)
-
-# Go to the authentication devices page
-click_link('devices-link')
-
-# Click on "Add a new authentication device" link
-click_add_new_device_link()
-
-# Choose YubiKey and click add device
-set_radio_value('type_yubi')
-click_add_device_button()
-
-# Check that the YubiKey warning is showing
-warning = ('Warning: The YubiKey is shipped with a credential in the '
-           'short-press slot')
-assert_element(css_class='warning', text_regex=warning)
-
-# set device name
-name = get_element(tag='input', name='name')
-write_textfield(name, 'add_device_yubikey')
-
-# Add correctly generated OTP
-aes_key = get_element(name='hex_key').get_attribute('value')
-valid_otp = hotp.hotp(aes_key, 0)
-write_textfield(get_element(tag='input', name='otp'), valid_otp)
-
-# Click "Add device"
-click_add_device_button()
-store_device('add_device_yubikey', aes_key)
-
-# Check our new device is now in the table, with the correct name
-assert_table_has_rows('device-list', 1)
-assert_table_row_contains_text('device-list', 0,
-                               ['add_device_yubikey', 'Delete'], regex=True)

=== modified file 'acceptance/tests/devices/test_add_device.py'
--- acceptance/tests/devices/test_add_device.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/devices/test_add_device.py	2013-05-10 13:57:27 +0000
@@ -11,6 +11,12 @@
 from acceptance import base
 
 
+def navigate_to_device_add_page(start):
+        # 'start' is the base YourAccount page object.
+        authentication_devices = start.subheader.go_to_authentication_devices()
+        return authentication_devices.add_new_authentication_device()  
+
+
 class TestAddDevice(base.SSTTestCaseWithLogIn):
 
     def navigate_to_page(self):
@@ -19,10 +25,8 @@
         It will be accessible for the tests from the page attribute.
 
         """
-        # Start from where the base test case leaves us, the YourAccount page.
-        start = super(TestAddDevice, self).navigate_to_page()
-        authentication_devices = start.subheader.go_to_authentication_devices()
-        return authentication_devices.add_new_authentication_device()
+        return navigate_to_device_add_page(
+            super(TestAddDevice, self).navigate_to_page())
 
     def test_cancel_device_addition(self):
         your_authentication_devices = self.page.cancel()
@@ -54,11 +58,9 @@
         It will be accessible for the tests from the page attribute.
 
         """
-        # Start from where the base test case leaves us, the YourAccount page.
-        start = super(TestAddGenericDevice, self).navigate_to_page()
-        authentication_devices = start.subheader.go_to_authentication_devices()
-        add_device = authentication_devices.add_new_authentication_device()
-        return add_device.add_generic_device()
+        add_device_page = navigate_to_device_add_page(
+            super(TestAddGenericDevice, self).navigate_to_page())
+        return add_device_page.add_generic_device()
 
     def test_open_add_generic_device_page(self):
         name, one_time_password = self.page.get_form_values()
@@ -105,3 +107,69 @@
             'Test generic device', one_time_password)
         self.assertEqual(
             your_authentication_devices.get_devices(), ['Test generic device'])
+
+
+class TestAddGoogleDevice(base.SSTTestCaseWithLogIn):
+
+    def navigate_to_page(self):
+        """Go to the AddGoogleDevice page.
+
+        It will be accessible for the tests from the page attribute.
+
+        """
+        add_device_page = navigate_to_device_add_page(
+            super(TestAddGoogleDevice, self).navigate_to_page())
+        return add_device_page.add_google_device()         
+
+    def test_add_google_device(self):
+        aes_key = self.page.get_key(self.user.email)
+        one_time_password = hotp.hotp(aes_key, 0)
+        your_authentication_devices = self.page.add_device(
+            'Test Google device', one_time_password)
+        self.assertEqual(
+            your_authentication_devices.get_devices(), ['Test Google device'])
+
+
+class TestAddYubikeyDevice(base.SSTTestCaseWithLogIn):
+
+    def navigate_to_page(self):
+        """Go to the AddYubikeyDevice page.
+
+        It will be accessible for the tests from the page attribute.
+
+        """
+        add_device_page = navigate_to_device_add_page(
+            super(TestAddYubikeyDevice, self).navigate_to_page())
+        return add_device_page.add_yubikey_device()         
+
+    def test_add_yubikey_device(self):
+        self.page.assert_warning()
+        aes_key = self.page.get_key()
+        one_time_password = hotp.hotp(aes_key, 0)
+        your_authentication_devices = self.page.add_device(
+            'Test Yubikey device', one_time_password)
+        self.assertEqual(
+            your_authentication_devices.get_devices(), ['Test Yubikey device'])
+
+
[e-mail]('paper_device' not in sst.config.flags,
+    'Paper device is not enabled.')
+class TestAddPaperDevice(base.SSTTestCaseWithLogIn):
+
+    def navigate_to_page(self):
+        """Go to the PaperDevice page.
+
+        It will be accessible for the tests from the page attribute.
+
+        """
+        add_device_page = navigate_to_device_add_page(
+            super(TestAddPaperDevice, self).navigate_to_page())
+        return add_device_page.add_paper_device()         
+
+    def test_add_paper_device(self):
+        self.page.assert_codes_present()
+        self.page.assert_print_button_visible()
+        your_authentication_devices = self.page.go_back_to_device_list()
+        self.assertEqual(
+            your_authentication_devices.get_devices(), ['Printable Backup Codes'])
+

=== renamed file 'acceptance/tests/devices/warn_about_backup_device.py' => 'acceptance/tests/devices/test_backup_device_warning.py'
--- acceptance/tests/devices/warn_about_backup_device.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/devices/test_backup_device_warning.py	2013-05-10 13:57:27 +0000
@@ -1,34 +1,56 @@
-# Test enabling/disabling the warn_about_backup_device preference
-
-from sst.actions import (
-    fails,
-    go_to,
-)
-from u1testutils.sst import config
-
-from acceptance.devices import (
-    add_device,
-    delete_device,
-)
-from acceptance import helpers, urls
-
-
-# setup
-config.set_base_url_from_env()
-helpers.login_or_register_account(device_cleanup=True)
-
-# the test: no warnings if no device
-go_to(urls.DEVICES)
-fails(helpers.get_backup_device_warning_div)
-add_device('the single device')
-
-# the test: show warning if missing backup device
-helpers.assert_backup_device_warning()
-
-# add a second device, ensure that the warning is no longer shown
-add_device('the backup device')
-fails(helpers.get_backup_device_warning_div)
-
-# delete one device and ensure the warning is back
-delete_device()
-helpers.assert_backup_device_warning()
+# Copyright 2012, 2013 Canonical Ltd.
+# This software is licensed under the GNU Affero General Public License
+# version 3 (see the file LICENSE).
+
+import unittest
+
+import sst
+
+from oath import hotp
+
+from acceptance import base
+
+
+class TestBackupDeviceWarning(base.SSTTestCaseWithLogIn):
+
+    def navigate_to_page(self):
+        """Go to the YourAuthenticationDevices page.
+
+        It will be accessible for the tests from the page attribute.
+
+        """
+        # 'start' is the base YourAccount page object.
+        start = super(TestBackupDeviceWarning, self).navigate_to_page()
+        return start.subheader.go_to_authentication_devices()
+
+    def test_no_warning_before_adding_device(self):
+        self.assertFalse(self.page.is_warning_displayed())
+
+    def test_warning_displayed_for_single_device(self):
+        your_auth_devices_page = self.add_device(
+            self.page, 'Test device warning')        
+        self.assertTrue(your_auth_devices_page.is_warning_displayed())
+
+    def test_warning_removed_after_second_device_added(self):
+        your_auth_devices_page = self.add_device(
+            self.page, 'Test device warning 1')        
+        your_auth_devices_page = self.add_device(
+            your_auth_devices_page, 'Test device warning 2')        
+        self.assertFalse(your_auth_devices_page.is_warning_displayed())
+
+    def test_warning_returns_after_second_device_deleted(self):
+        your_auth_devices_page = self.add_device(
+            self.page, 'Test device warning 1')        
+        your_auth_devices_page = self.add_device(
+            your_auth_devices_page, 'Test device warning 2') 
+        rm_device_page = your_auth_devices_page.delete_authentication_device()
+        your_auth_devices_page = rm_device_page.confirm_delete_device()
+        self.assertTrue(your_auth_devices_page.is_warning_displayed())
+
+    def add_device(self, auth_devices_page, device_name):
+        add_new_device_page = auth_devices_page.add_new_authentication_device()
+        add_generic_device_page = add_new_device_page.add_generic_device()
+        aes_key = add_generic_device_page.get_key()
+        one_time_password = hotp.hotp(aes_key, 0)
+        return add_generic_device_page.add_device(
+            device_name, one_time_password)

=== modified file 'acceptance/tests/devices/test_delete_device.py'
--- acceptance/tests/devices/test_delete_device.py	2013-05-10 00:45:35 +0000
+++ acceptance/tests/devices/test_delete_device.py	2013-05-10 13:57:27 +0000
@@ -13,8 +13,8 @@
         """Navigate to DeleteAuthenticationDevices with a device added."""
         # Start from where the base test case leaves us, the YourAccount page.
         start = super(TestDeleteDevice, self).navigate_to_page()
-        auth_devices = start.subheader.go_to_authentication_devices()
-        return self.add_device(auth_devices)
+        auth_devices_page = start.subheader.go_to_authentication_devices()
+        return self.add_device(auth_devices_page)
 
     def test_device_deletion(self):
         your_auth_devices = self.page.confirm_delete_device()
@@ -26,11 +26,11 @@
         self.assertEqual(
             your_auth_devices.get_devices(), ['Test device delete'])
 
-    def add_device(self, auth_devices):
-        test_device_page = auth_devices.add_new_authentication_device()
+    def add_device(self, auth_devices_page):
+        test_device_page = auth_devices_page.add_new_authentication_device()
         add_device_page = test_device_page.add_generic_device()
         aes_key = add_device_page.get_key()
         one_time_password = hotp.hotp(aes_key, 0)
-        auth_devices = add_device_page.add_device(
+        auth_devices_page = add_device_page.add_device(
             'Test device delete', one_time_password)
-        return auth_devices.delete_authentication_device()
+        return auth_devices_page.delete_authentication_device()

=== renamed file 'acceptance/tests/devices/generate_paper_codes.py' => 'acceptance/tests/devices/test_generate_paper_codes.py'
--- acceptance/tests/devices/generate_paper_codes.py	2013-05-02 17:20:14 +0000
+++ acceptance/tests/devices/test_generate_paper_codes.py	2013-05-10 13:57:27 +0000
@@ -1,62 +1,44 @@
-# Test google device addition
-from sst.actions import *
-from u1testutils.sst import config
-
-from acceptance import helpers
-from acceptance.devices import (
-    click_add_device_button,
-    click_add_new_device_link,
-    enter_otp,
-    store_paper_device,
-    update_paper_device,
-)
-
-check_flags('paper_device')
-
-config.set_base_url_from_env()
-
-email = helpers.login_or_register_account(device_cleanup=True)
-
-# Go to the authentication devices page
-click_link('devices-link')
-
-# Click on "Add a new authentication device" link
-click_add_new_device_link()
-
-# Add the paper device
-set_radio_value('type_paper')
-click_add_device_button()
-
-# Get the first code which we will invalidate
-old_code = get_elements_by_css('ol.codelist li')[0].text
-
-# Save the device
-store_paper_device('Printable backup codes')
-
-# Generate new codes
-click_link(get_element(tag='a', text='Generate new codes'))
-
-# Fetch a new codes
-new_code = get_elements_by_css('ol.codelist li')[0].text
-
-# Confirm the new codes
-click_button(get_element(tag='button', text='Confirm new codes'))
-
-# Update our stored codes for device removal
-update_paper_device('Printable backup codes', counter=1)
-
-# Set "twofactor required" in account preferences
-helpers.set_twofactor_to_always_required()
-add_cleanup(helpers.set_twofactor_to_required_as_needed)
-
-# Logout and back in again
-helpers.logout_and_in()
-go_to('/')
-
-# Check the first (invalidated) code fails
-enter_otp(old_code)
-assert_displayed('id_oath_token')
-
-# Check the new code works
-enter_otp(new_code)
-assert_url('/')
+# Copyright 2012, 2013 Canonical Ltd.
+# This software is licensed under the GNU Affero General Public License
+# version 3 (see the file LICENSE).
+
+import unittest
+
+import sst
+
+from oath import hotp
+
+from acceptance import base
+
+
[e-mail]('paper_device' not in sst.config.flags,
+    'Paper device is not enabled.')
+class TestGeneratePaperCodes(base.SSTTestCaseWithLogIn):
+
+    def navigate_to_page(self):
+        """Go to the PaperDevice page.
+
+        It will be accessible for the tests from the page attribute.
+
+        """
+        # 'start' is the base YourAccount page object.
+        start = super(TestGeneratePaperCodes, self).navigate_to_page()
+        authentication_devices = start.subheader.go_to_authentication_devices()
+        add_device_page =  authentication_devices.add_new_authentication_device()  
+        return add_device_page.add_paper_device()         
+
+    def test_generate_paper_codes(self):
+        # Get the first code which we will invalidate
+        old_code = self.page.get_first_code()
+        new_codes_page = self.page.generate_new_codes()
+        paper_device_page = new_codes_page.confirm_new_codes()   
+        new_code = paper_device_page.get_first_code()
+        self.assertNotEqual(old_code, new_code)
+
+    def test_cancel_generating_paper_codes(self):
+        # Get the first code which should remain after cancel
+        the_code = self.page.get_first_code()
+        new_codes_page = self.page.generate_new_codes()
+        paper_device_page = new_codes_page.cancel()
+        the_same_code = paper_device_page.get_first_code()
+        self.assertEqual(the_code, the_same_code)

=== modified file 'webui/templates/device/generate-codes.html'
--- webui/templates/device/generate-codes.html	2012-10-25 21:22:30 +0000
+++ webui/templates/device/generate-codes.html	2013-05-10 13:57:27 +0000
@@ -28,10 +28,10 @@
 <form method="post">
   {% csrf_token %}
   <p>
-    <button class="btn" type="submit">
+    <button class="btn" type="submit" data-qa-id="confirm-codes">
       <span><span>{% trans "Confirm new codes" %}</span></span>
     </button>
-    {% trans "or" %} <a href="{% url device-print device_id %}">{% trans "cancel" %}</a>
+    {% trans "or" %} <a href="{% url device-print device_id %}" data-qa-id="cancel">{% trans "cancel" %}</a>
   </p>
 </form>
 {% endblock %}

=== modified file 'webui/templates/device/print-codes.html'
--- webui/templates/device/print-codes.html	2012-10-25 21:22:30 +0000
+++ webui/templates/device/print-codes.html	2013-05-10 13:57:27 +0000
@@ -25,10 +25,10 @@
   <a class="btn" id="printbtn" onclick="window.print()"><span><span>{% trans "Print Codes" %}</span></span>
   </a>
   {% if generation_enabled %}
-  <a class="btn" href="{% url device-generate device_id %}">
+  <a class="btn" href="{% url device-generate device_id %}" data-qa-id="generate_codes">
     <span><span>{% trans "Generate new codes" %}</span></span>
   </a>
   {% endif %}
-  {% trans "or" %} <a href="{% url device-list %}">{% trans "go back to device list" %}</a>
+  {% trans "or" %} <a href="{% url device-list %}" data-qa-id="go_back">{% trans "go back to device list" %}</a>
 </p>
 {% endblock %}