Merge lp:~diegosarmentero/ubuntuone-windows-installer/reset-password-page into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Reset Password Page Complete.

Reset Password Page Complete.

[lp:~diegosarmentero/ubuntuone-windows-installer/reset-password-page]

46. By Diego Sarmentero on 2011-09-01

Changed utils.ui to common in setup_account and test_setup_account.
Merge.

[Diego Sarmentero (diegosarmentero)]

Needs this branch: https://code.launchpad.net/~diegosarmentero/ubuntu-sso-client/reset-password

[lp:~diegosarmentero/ubuntuone-windows-installer/reset-password-page]

47. By Diego Sarmentero on 2011-09-06

Assigning bug.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-08-31 16:23:45 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-09-06 15:25:05 +0000
@@ -23,6 +23,7 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntu_sso.qt import common
 from ubuntu_sso.qt import gui as sso_gui
 
 from ubuntuone_installer.gui.qt import enhanced_check_box
@@ -30,10 +31,7 @@
 _ = gettext.gettext
 
 # pylint: disable=C0103
-BAD = u'<img src=":/password_hint_warning.png" /><font> %s </font>'
 ERROR = u'<font color="#df2d1f"><b> %s </b></font>'
-GOOD = u'<img src=":/password_hint_ok.png" /><font> %s </font>'
-NORMAL = u'<font> %s </font>'
 TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
 
 EMAIL = _("Email")
@@ -42,11 +40,6 @@
 EMAIL_MATCH = _("The email addresses do not match")
 NAME = _("Name")
 PASSWORD = _("Create a password")
-PASSWORD_LENGTH = _("At least 8 characters")
-PASSWORD_DIGIT = _("At least one number")
-PASSWORD_UPPER = _("At least one uppercase letter")
-PASSWORD_MATCH = _("Passwords don't match")
-PASSWORD_MUST_CONTAIN = _("Your password must contain")
 RETYPE_EMAIL = _("Retype email")
 RETYPE_PASSWORD = _("Retype password")
 SUBTITLE = _("You only need to set up your account "
@@ -67,7 +60,9 @@
     def __init__(self, *args, **kwargs):
         super(SetupAccountPage, self).__init__(*args, **kwargs)
         self.ui.password_edit.textEdited.connect(
-            lambda: self.password_assistance(NORMAL))
+            lambda: common.password_assistance(self.ui.password_edit,
+                                                 self.ui.password_assistance,
+                                                 common.NORMAL))
         terms = TERMS.format(terms_and_conditions=TERMS_LINK,
                          privacy_policy=PRIVACY_POLICY_LINK)
         self.terms_checkbox = enhanced_check_box.EnhancedCheckBox(terms)
@@ -78,9 +73,15 @@
             self.name_assistance,
             self.email_assistance,
             self.confirm_email_assistance,
-            self.password_check_match]
+            self.password_check_match_wrapper]
         self.set_up_button = None
 
+    def password_check_match_wrapper(self):
+        """Wrapper between validation_functions calls and utils function."""
+        common.password_check_match(self.ui.password_edit,
+                                      self.ui.confirm_password_edit,
+                                      self.ui.password_assistance)
+
     # Invalid name "initializePage"
     # pylint: disable=C0103
 
@@ -114,7 +115,7 @@
             QtGui.QWizard.Stretch,
             QtGui.QWizard.CustomButton3])
 
-        self.password_default_assistance()
+        common.password_default_assistance(self.ui.password_assistance)
         # Hide assistance labels by default
         self.ui.name_assistance.setVisible(False)
         self.ui.email_assistance.setVisible(False)
@@ -145,10 +146,10 @@
         if not text.strip():
             self.ui.name_assistance.setVisible(True)
             self.ui.name_assistance.setText(ERROR % EMPTY_NAME)
-            self.check_as_invalid(self.ui.name_edit)
+            common.check_as_invalid(self.ui.name_edit)
         else:
             self.ui.name_assistance.setVisible(False)
-            self.check_as_valid(self.ui.name_edit)
+            common.check_as_valid(self.ui.name_edit)
 
     def email_assistance(self):
         """Show help for the email field."""
@@ -156,10 +157,10 @@
         if not is_correct_email(text):
             self.ui.email_assistance.setText(ERROR % INVALID_EMAIL)
             self.ui.email_assistance.setVisible(True)
-            self.check_as_invalid(self.ui.email_edit)
+            common.check_as_invalid(self.ui.email_edit)
         else:
             self.ui.email_assistance.setVisible(False)
-            self.check_as_valid(self.ui.email_edit)
+            common.check_as_valid(self.ui.email_edit)
 
     def confirm_email_assistance(self):
         """Show help for the confirm email field."""
@@ -168,67 +169,10 @@
         if text1 != text2:
             self.ui.confirm_email_assistance.setText(ERROR % EMAIL_MATCH)
             self.ui.confirm_email_assistance.setVisible(True)
-            self.check_as_invalid(self.ui.confirm_email_edit)
+            common.check_as_invalid(self.ui.confirm_email_edit)
         else:
             self.ui.confirm_email_assistance.setVisible(False)
-            self.check_as_valid(self.ui.confirm_email_edit)
-
-    def password_assistance(self, icon_type=BAD):
-        """Show help for the password field."""
-        text1 = unicode(self.ui.password_edit.text())
-        label_text = ["<b>%s</b>" % PASSWORD_MUST_CONTAIN, ]
-
-        if len(text1) < 8:
-            sign = icon_type
-        else:
-            sign = GOOD
-        label_text.append(sign % PASSWORD_LENGTH)
-
-        if re.search('[A-Z]', text1) is None:
-            sign = icon_type
-        else:
-            sign = GOOD
-        label_text.append(sign % PASSWORD_UPPER)
-
-        if re.search('[\d+]', text1) is None:
-            sign = icon_type
-        else:
-            sign = GOOD
-        label_text.append(sign % PASSWORD_DIGIT)
-
-        self.ui.password_assistance.setText("<br>".join(label_text))
-
-    def password_check_match(self):
-        """Check if passwords match, otherwise show a message."""
-        self.password_assistance()
-        label_text = unicode(self.ui.password_assistance.text())
-        text1 = unicode(self.ui.password_edit.text())
-        text2 = unicode(self.ui.confirm_password_edit.text())
-        if text1 != text2:
-            label_text += "<br>" + BAD % PASSWORD_MATCH
-        self.ui.password_assistance.setText(label_text)
-
-    def password_default_assistance(self):
-        """Show default help for the password field."""
-        label_text = ["<b>%s</b>" % PASSWORD_MUST_CONTAIN, ]
-
-        label_text.append(NORMAL % PASSWORD_LENGTH)
-        label_text.append(NORMAL % PASSWORD_UPPER)
-        label_text.append(NORMAL % PASSWORD_DIGIT)
-
-        self.ui.password_assistance.setText("<br>".join(label_text))
-
-    def check_as_invalid(self, line_edit):
-        """Set QLineEdit's formError property as True, refresh the style."""
-        line_edit.setProperty("formError", True)
-        line_edit.style().unpolish(line_edit)
-        line_edit.style().polish(line_edit)
-
-    def check_as_valid(self, line_edit):
-        """Set QLineEdit's formError property as False, refresh the style."""
-        line_edit.setProperty("formError", False)
-        line_edit.style().unpolish(line_edit)
-        line_edit.style().polish(line_edit)
+            common.check_as_valid(self.ui.confirm_email_edit)
 
     def showEvent(self, event):
         """Set set_up_button as default button when the page is shown."""

=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
--- ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-08-30 16:09:00 +0000
+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-06 15:25:05 +0000
@@ -22,6 +22,8 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntu_sso.qt import common
+
 from ubuntuone_installer.gui.qt import gui, setup_account
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
 from ubuntuone_installer.gui.qt.ui import (
@@ -135,103 +137,6 @@
             setup_account.ERROR % setup_account.EMPTY_NAME)
         self.ui.hide()
 
-    def test_short_password(self):
-        """Status with short password.
-
-        * Password assistance contains the right message.
-        """
-        self.ui.ui.password_edit.setText("foobar")
-        self.ui.password_assistance()
-        self.assertIn(
-            setup_account.BAD % setup_account.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_long_password(self):
-        """Status with long password.
-
-        * Password assistance contains the right message.
-        """
-        self.ui.ui.password_edit.setText("foobarbaz")
-        self.ui.password_assistance()
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_no_number_password(self):
-        """Status with password without a number.
-
-        * Password assistance contains the right message.
-        """
-        self.ui.ui.password_edit.setText("foobarbaz")
-        self.ui.password_assistance()
-        self.assertIn(
-            setup_account.BAD % setup_account.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_number_password(self):
-        """Status with password with a number.
-
-        * Password assistance contains the right message.
-        """
-        self.ui.ui.password_edit.setText("foobarba7")
-        self.ui.password_assistance()
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_no_uppercase_password(self):
-        """Status with password without uppercase letters.
-
-        * Password assistance contains the right message.
-        """
-        self.ui.ui.password_edit.setText("foobarbaz")
-        self.ui.password_assistance()
-        self.assertIn(
-            setup_account.BAD % setup_account.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_upper_password(self):
-        """Status with password with uppercase letters.
-
-        * Password assistance contains the right message.
-        """
-        self.ui.ui.password_edit.setText("Foobarba7")
-        self.ui.password_assistance()
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_matching_passwords(self):
-        """Status when the passwords match.
-
-        * Password assistance doesn't contain the message.
-        """
-        self.ui.ui.password_edit.setText("Foobarba7")
-        self.ui.ui.confirm_password_edit.setText("Foobarba7")
-        self.ui.password_check_match()
-        self.assertNotIn(
-            setup_account.BAD % setup_account.PASSWORD_MATCH,
-            unicode(self.ui.ui.password_assistance.text()))
-
-    def test_not_matching_passwords(self):
-        """Status when the passwords not match.
-
-        * Password assistance contains the right message.
-        """
-        self.ui.ui.password_edit.setText("Foobarba7")
-        self.ui.ui.confirm_password_edit.setText("BazBarFo0")
-        self.ui.password_check_match()
-        self.assertIn(
-            setup_account.BAD % setup_account.PASSWORD_MATCH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
     def test_password_default_assistance(self):
         """Status when the password line edit receive focus and shows popup.
 
@@ -242,91 +147,15 @@
         self.ui.validate_data_on_focus_changed(4)
         self.ui.focus_changed(None, self.ui.ui.password_edit)
         self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_password_assistance_in_focus_length_correct(self):
-        """Check the QLineEdit for password when the length is correct."""
-        self.ui.ui.password_edit.setText("aaaaaaaaa")
-        self.ui.ui.confirm_password_edit.setText("")
-        self.ui.password_assistance(setup_account.NORMAL)
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_password_assistance_in_focus_with_upper(self):
-        """Check the QLineEdit for password when it has an upper case char."""
-        self.ui.ui.password_edit.setText("AAa")
-        self.ui.ui.confirm_password_edit.setText("")
-        self.ui.password_assistance(setup_account.NORMAL)
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_password_assistance_in_focus_with_number(self):
-        """Check the QLineEdit for password when it contains numbers."""
-        self.ui.ui.password_edit.setText("a123")
-        self.ui.ui.confirm_password_edit.setText("")
-        self.ui.password_assistance(setup_account.NORMAL)
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.NORMAL % setup_account.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-
-    def test_password_assistance_in_focus_all_ok(self):
-        """Check the QLineEdit for password when all the condition are ok."""
-        self.ui.ui.password_edit.setText("T3st3rqw")
-        self.ui.ui.confirm_password_edit.setText("T3st3rqw")
-        self.ui.password_assistance(setup_account.NORMAL)
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_LENGTH,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_UPPER,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertIn(
-            setup_account.GOOD % setup_account.PASSWORD_DIGIT,
-            unicode(self.ui.ui.password_assistance.text()),
-        )
-        self.assertNotIn(
-            setup_account.NORMAL % setup_account.PASSWORD_MATCH,
+            common.NORMAL % common.PASSWORD_LENGTH,
+            unicode(self.ui.ui.password_assistance.text()),
+        )
+        self.assertIn(
+            common.NORMAL % common.PASSWORD_UPPER,
+            unicode(self.ui.ui.password_assistance.text()),
+        )
+        self.assertIn(
+            common.NORMAL % common.PASSWORD_DIGIT,
             unicode(self.ui.ui.password_assistance.text()),
         )
 
@@ -343,16 +172,6 @@
         self.ui.on_currentIdChanged(self.ui.CONGRATULATIONS_PAGE)
         self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
 
-    def test_check_valid(self):
-        """Check the propery value of a QLineEdit marked as valid."""
-        self.ui.check_as_valid(self.ui.ui.name_edit)
-        self.assertFalse(self.ui.ui.name_edit.property("formError").toBool())
-
-    def test_check_invalid(self):
-        """Check the propery value of a QLineEdit marked as invalid."""
-        self.ui.check_as_invalid(self.ui.ui.name_edit)
-        self.assertTrue(self.ui.ui.name_edit.property("formError").toBool())
-
     def test_focus_changed_1(self):
         """Check functions execution when focus_changed() is executed."""
         self.patch(self.ui, 'validation_functions', FakeValidationDict())