Merge lp:~diegosarmentero/ubuntu-sso-client/845750 into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed button style from Reset Password Page and Forgotten Password Page. (LP: #845750).

Fixed button style from Reset Password Page and Forgotten Password Page.

[Natalia Bidart (nataliabidart)]

Code looks good!

A simple improvement to the test code

in FakeForgottenPasswordPage, instead of:

    def setProperty(self, key, val):
        """Fake setProperty to restyle some widget."""
        self.property_key = key
        self.property_value = val

it would be better to have an instance attr:

    self.properties = {}

and then:

    def setProperty(self, key, val):
        """Fake setProperty to restyle some widget."""
        self.propertyies[key] = val

With that change, you can have:

    def setDefault(self, val):
        """Fake button setDefault."""
        self.is_default = val

become:

    def setDefault(self, val):
        """Fake button setDefault."""
        self.properties['default'] = val

The next improvement would be to have the common functionality for the fakes into a base class and reuse that from the 2 controllers (FakeForgottenPasswordPage, FakeResetPasswordPage) and any other class that needs a similar testing.

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/845750]

789. By Diego Sarmentero on 2011-09-15

Improved generic wizard fake.

[Natalia Bidart (nataliabidart)]

I'm getting:

== Python Lint Notices ==

ubuntu_sso/qt/controllers.py:
    758: [C0103, ResetPasswordController.pageInitialized] Invalid name "pageInitialized" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/845750]

790. By Diego Sarmentero on 2011-09-15

Fixed lint issue

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-09-15 19:51:28 +0000
+++ ubuntu_sso/qt/controllers.py	2011-09-15 21:40:25 +0000
@@ -642,6 +642,20 @@
         self.message_box = message_box
         super(ForgottenPasswordController, self).__init__(title, subtitle)
 
+    #pylint: disable=C0103
+    def pageInitialized(self):
+        """Set the initial state of ForgottenPassword page."""
+        self.view.send_button.setDefault(True)
+        self.view.send_button.setEnabled(False)
+        # The style from this property come from the Wizard
+        self.view.send_button.setProperty("DisabledState",
+            not self.view.send_button.isEnabled())
+        self.view.send_button.style().unpolish(
+            self.view.send_button)
+        self.view.send_button.style().polish(
+            self.view.send_button)
+    #pylint: enable=C0103
+
     def _register_fields(self):
         """Register the fields of the wizard page."""
         self.view.registerField('email_address',
@@ -679,6 +693,12 @@
         """Validate that we have an email."""
         email = unicode(self.view.email_address_line_edit.text())
         self.view.send_button.setEnabled(is_correct_email(email))
+        self.view.send_button.setProperty("DisabledState",
+            not self.view.send_button.isEnabled())
+        self.view.send_button.style().unpolish(
+            self.view.send_button)
+        self.view.send_button.style().polish(
+            self.view.send_button)
 
     def on_try_again(self):
         """Set back the widget to the initial state."""
@@ -735,6 +755,20 @@
         self.message_box = message_box
         super(ResetPasswordController, self).__init__(title, subtitle)
 
+    #pylint: disable=C0103
+    def pageInitialized(self):
+        """Set the initial state of ForgottenPassword page."""
+        self.view.ui.reset_password_button.setDefault(True)
+        self.view.ui.reset_password_button.setEnabled(False)
+        # The style from this property come from the Wizard
+        self.view.ui.reset_password_button.setProperty("DisabledState",
+            not self.view.ui.reset_password_button.isEnabled())
+        self.view.ui.reset_password_button.style().unpolish(
+            self.view.ui.reset_password_button)
+        self.view.ui.reset_password_button.style().polish(
+            self.view.ui.reset_password_button)
+    #pylint: enable=C0103
+
     def _set_translated_strings(self):
         """Translate the diff strings used in the app."""
         self.view.ui.reset_password_button.setText(RESET_PASSWORD)
@@ -766,6 +800,12 @@
         elif not code:
             enabled = False
         self.view.ui.reset_password_button.setEnabled(enabled)
+        self.view.ui.reset_password_button.setProperty("DisabledState",
+            not self.view.ui.reset_password_button.isEnabled())
+        self.view.ui.reset_password_button.style().unpolish(
+            self.view.ui.reset_password_button)
+        self.view.ui.reset_password_button.style().polish(
+            self.view.ui.reset_password_button)
 
     def _add_line_edits_validations(self):
         """Add the validations to be use by the line edits."""

=== modified file 'ubuntu_sso/qt/tests/test_windows.py'
--- ubuntu_sso/qt/tests/test_windows.py	2011-09-15 19:51:28 +0000
+++ ubuntu_sso/qt/tests/test_windows.py	2011-09-15 21:40:25 +0000
@@ -971,33 +971,13 @@
         self.controller.setupUi(self.view)
 
 
-class FakeForgottenPasswordPage(FakeView):
+class FakeForgottenPasswordPage(tests.FakePageUiStyle):
     """Fake the page."""
 
     def __init__(self):
+        super(FakeForgottenPasswordPage, self).__init__()
         self.email_address_line_edit = self
         self.send_button = self
-        self._text = ""
-        self._enabled = False
-        super(FakeForgottenPasswordPage, self).__init__()
-
-    def text(self):
-        """Return text."""
-        return self._text
-
-    # setText, setEnabled are inherited
-    # pylint: disable=C0103
-    def setText(self, text):
-        """Save text."""
-        self._text = text
-
-    def setEnabled(self, value):
-        """Fake setEnabled."""
-        self._enabled = value
-
-    def enabled(self):
-        """Fake enabled."""
-        return self._enabled
 
 
 class ForgottenPasswordControllerValidationTest(TestCase):
@@ -1017,6 +997,17 @@
         """Store 'args' and 'kwargs' for test assertions."""
         self._called = (args, kwargs)
 
+    def test_page_initialized(self):
+        """Test the initial state of the page when it is loaded."""
+        self.controller.pageInitialized()
+        self.assertFalse(self.controller.view.send_button.enabled())
+        self.assertTrue(self.controller.view.send_button.properties['default'])
+        self.assertTrue("DisabledState" in self.controller.view.properties)
+        self.assertEqual(self.controller.view.properties["DisabledState"],
+            not self.controller.view.send_button.enabled())
+        self.assertTrue(self.controller.view.properties.get('unpolish', False))
+        self.assertTrue(self.controller.view.properties.get('polish', False))
+
     def test_valid(self):
         """The submit button should be enabled with a valid email."""
         self.controller.view.email_address_line_edit.setText("a@b")
@@ -1024,6 +1015,11 @@
             self.controller.view.email_address_line_edit.text()), u"")
         self.controller._validate()
         self.assertTrue(self.controller.view.send_button.enabled())
+        self.assertTrue("DisabledState" in self.controller.view.properties)
+        self.assertEqual(self.controller.view.properties["DisabledState"],
+            not self.controller.view.send_button.enabled())
+        self.assertTrue(self.controller.view.properties.get('unpolish', False))
+        self.assertTrue(self.controller.view.properties.get('polish', False))
 
     def test_invalid(self):
         """The submit button should be disabled with an invalid email."""
@@ -1032,6 +1028,11 @@
             unicode(self.controller.view.email_address_line_edit.text()), u"")
         self.controller._validate()
         self.assertFalse(self.controller.view.send_button.enabled())
+        self.assertTrue("DisabledState" in self.controller.view.properties)
+        self.assertEqual(self.controller.view.properties["DisabledState"],
+            not self.controller.view.send_button.enabled())
+        self.assertTrue(self.controller.view.properties.get('unpolish', False))
+        self.assertTrue(self.controller.view.properties.get('polish', False))
 
     def test_empty(self):
         """The submit button should be disabled without email."""
@@ -1225,29 +1226,19 @@
                                                                     password))
 
 
-class FakeResetPasswordPage(object):
+class FakeResetPasswordPage(tests.FakePageUiStyle):
 
     """Fake ResetPasswordPage."""
 
     def __init__(self, *args):
         """Initialize."""
-        self.ui = self
+        super(FakeResetPasswordPage, self).__init__()
         self.ui.reset_code_line_edit = FakeLineEdit()
         self.ui.password_line_edit = FakeLineEdit()
         self.ui.confirm_password_line_edit = FakeLineEdit()
         self.reset_password_button = self
         self._enabled = 9  # Intentionally wrong.
 
-    # setEnabled is inherited
-    # pylint: disable=C0103
-    def setEnabled(self, value):
-        """Fake setEnabled."""
-        self._enabled = value
-
-    def enabled(self):
-        """Fake enabled."""
-        return self._enabled
-
 
 class ResetPasswordControllerValidationTest(TestCase):
 
@@ -1260,6 +1251,19 @@
         self.controller.view = FakeResetPasswordPage()
         self._called = False
 
+    def test_page_initialized(self):
+        """Test the initial state of the page when it is loaded."""
+        self.controller.pageInitialized()
+        self.assertFalse(
+            self.controller.view.reset_password_button.enabled())
+        self.assertTrue(
+            self.controller.view.reset_password_button.properties['default'])
+        self.assertTrue("DisabledState" in self.controller.view.properties)
+        self.assertEqual(self.controller.view.properties["DisabledState"],
+            not self.controller.view.reset_password_button.enabled())
+        self.assertTrue(self.controller.view.properties.get('unpolish', False))
+        self.assertTrue(self.controller.view.properties.get('polish', False))
+
     def _set_called(self, *args, **kwargs):
         """Store 'args' and 'kwargs' for test assertions."""
         self._called = (args, kwargs)
@@ -1271,6 +1275,11 @@
         self.controller.view.confirm_password_line_edit.setText("1234567A")
         self.controller._validate()
         self.assertTrue(self.controller.view.reset_password_button.enabled())
+        self.assertTrue("DisabledState" in self.controller.view.properties)
+        self.assertEqual(self.controller.view.properties["DisabledState"],
+            not self.controller.view.reset_password_button.enabled())
+        self.assertTrue(self.controller.view.properties.get('unpolish', False))
+        self.assertTrue(self.controller.view.properties.get('polish', False))
 
     def test_invalid_code(self):
         """Disable the button with an invalid code."""
@@ -1279,6 +1288,11 @@
         self.controller.view.confirm_password_line_edit.setText("1234567A")
         self.controller._validate()
         self.assertFalse(self.controller.view.reset_password_button.enabled())
+        self.assertTrue("DisabledState" in self.controller.view.properties)
+        self.assertEqual(self.controller.view.properties["DisabledState"],
+            not self.controller.view.reset_password_button.enabled())
+        self.assertTrue(self.controller.view.properties.get('unpolish', False))
+        self.assertTrue(self.controller.view.properties.get('polish', False))
 
     def test_invalid_password(self):
         """Disable the button with an invalid password."""