Merge lp:~elopio/canonical-identity-provider/django-cancel_addition into lp:canonical-identity-provider/release

[Leo Arias]

[Natalia Bidart (nataliabidart)]

Hi! I'm doing some cleanup on SSO MPs, I assume this is no longer valid, will set as Rejected.

Please shange the global status if this is still current. Thanks!

Unmerged revisions

861. By Leo Arias on 2013-05-17

Changed the default device test from SST to django.

860. By Leo Arias on 2013-05-17

Merged with trunk.

=== 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-17 14:58:36 +0000
@@ -28,11 +28,6 @@
         your_authentication_devices = self.page.cancel()
         self.assertEqual(your_authentication_devices.get_devices(), [])
 
-    def test_default_device(self):
-        self.assertEqual(
-            self.page.get_selected_device(),
-            'type_google')
-
     @unittest.skipIf('paper_device' not in sst.config.flags,
                      'Paper device is not enabled.')
     def test_paper_device_enabled(self):

=== modified file 'webui/tests/test_devices.py'
--- webui/tests/test_devices.py	2013-05-15 07:25:13 +0000
+++ webui/tests/test_devices.py	2013-05-17 14:58:36 +0000
@@ -115,15 +115,17 @@
         twofactor_switch.patch()
         self.addCleanup(twofactor_switch.unpatch)
 
-    def get_device_types(self):
+    def test_default_device(self):
+        device_radios = self._get_device_radios()
+        selected_radios = [radio for radio in device_radios if radio.checked]
+        self.assertEqual(len(selected_radios), 1)
+        self.assertEqual(selected_radios[0].value, 'google')
+
+    def _get_device_radios(self):
         response = self.client.get(reverse('device-addition'))
         self.assertEqual(response.status_code, 200)
-
         tree = PyQuery(response.content)
-        nodes = tree.find('input[type="radio"]')
-
-        device_types = [dict(node.items())['value'] for node in nodes]
-        return device_types
+        return tree.find('input[type="radio"]')
 
     def test_paper_device_flag_in_template_user_in_team(self):
         email = EmailAddress.objects.get(email=self.login_email)
@@ -132,6 +134,11 @@
         device_types = self.get_device_types()
         self.assertIn('paper', device_types)
 
+    def get_device_types(self):
+        nodes = self._get_device_radios()
+        device_types = [dict(node.items())['value'] for node in nodes]
+        return device_types
+
     def test_paper_device_flag_in_template_user_not_in_team(self):
         device_types = self.get_device_types()
         self.assertNotIn('paper', device_types)