Ubuntu Single Sign On Client

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

  1. 930720
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Natalia Bidart
Approved revision: 866
Merged at revision: 868
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/930720
Merge into: lp:ubuntu-sso-client
Diff against target: 117 lines (+39/-8)
4 files modified
ubuntu_sso/qt/success_page.py (+5/-2)
ubuntu_sso/qt/tests/test_qt_views.py (+2/-5)
ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py (+25/-0)
ubuntu_sso/qt/ubuntu_sso_wizard.py (+7/-1)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/930720
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+92815@code.launchpad.net

Commit message

- Fixed: Qt UI: congratulations page is empty (LP: #930720).

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks and works great!

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (63.9 KiB)

The attempt to merge lp:~diegosarmentero/ubuntu-sso-client/930720 into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.tests.test_account
  AccountTestCase
    test_generate_captcha ... [OK]
    test_is_not_validated ... [OK]
    test_is_not_validated_empty_result ... [OK]
    test_is_validated ... [OK]
    test_login_if_http_error ... [OK]
    test_login_if_no_error ... [OK]
    test_register_user_checks_valid_email ... [OK]
    test_register_user_checks_valid_password ... [OK]
    test_register_user_if_status_error ... [OK]
    test_register_user_if_status_error_with_string_message ... [OK]
    test_register_user_if_status_ok ... [OK]
    test_register_user_if_status_unknown ... [OK]
    test_request_password_reset_token_if_http_error ... [OK]
    test_request_password_reset_token_if_status_ok ... [OK]
    test_request_password_reset_token_if_status_unknown ... [OK]
    test_set_new_password_if_http_error ... [OK]
    test_set_new_password_if_status_ok ... [OK]
    test_set_new_password_if_status_unknown ... [OK]
    test_validate_email_if_status_error ... [OK]
    test_validate_email_if_status_error_with_string_message ... [OK]
    test_validate_email_if_status_ok ... [OK]
    test_validate_email_if_status_unknown ... [OK]
  EnvironOverridesTestCase
    test_no_override_service_url ... [OK]
    test_override_service_url ... [OK]
    test_service_url_as_parameter ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.tests.test_account
  TimestampedAuthorizerTestCase
    test_authorize_request_includes_timestamp ... [OK]
ubuntu_sso.tests.test_credentials
  BasicTestCase
    runTest ... [OK]
  ClearCredentialsTestCase
    test_clear_credentials ... [OK]
    test_keyring_failure ... [OK]
  CredentialsCallbacksTestCase
    test_creation_parameters_are_stored ... [OK]
    test_help_text_defaults_to_empty_string ... [OK]
    test_ping_url_defaults_to_none ... [OK]
    test_policy_url_defaults_to_none ... [OK]
    test_tc...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/qt/success_page.py'
2--- ubuntu_sso/qt/success_page.py 2012-02-07 18:59:36 +0000
3+++ ubuntu_sso/qt/success_page.py 2012-02-13 18:15:24 +0000
4@@ -17,11 +17,14 @@
5 """Success page UI."""
6
7 from ubuntu_sso.qt.gui import SSOWizardPage
8+from ubuntu_sso.utils.ui import SUCCESS
9
10
11 class SuccessPage(SSOWizardPage):
12 """Page used to display success message."""
13
14- def __init__(self, ui, *args, **kwargs):
15+ def __init__(self, ui, image_pixmap, *args, **kwargs):
16 super(SuccessPage, self).__init__(ui, *args, **kwargs)
17- self.next = -1
18+ self.ui.image_label.setPixmap(image_pixmap)
19+ message = SUCCESS % {'app_name': self.app_name}
20+ self.ui.success_message_body.setText(message)
21
22=== modified file 'ubuntu_sso/qt/tests/test_qt_views.py'
23--- ubuntu_sso/qt/tests/test_qt_views.py 2012-02-13 16:05:13 +0000
24+++ ubuntu_sso/qt/tests/test_qt_views.py 2012-02-13 18:15:24 +0000
25@@ -75,18 +75,15 @@
26 """Setup tests."""
27 super(SuccessPageTestCase, self).setUp()
28 self.ui = Ui_SuccessPage()
29- self.controller = FakeController()
30- self.widget = SuccessPage(self.ui, self.controller)
31+ self.widget = SuccessPage(self.ui, QtGui.QPixmap())
32
33 def test_constructor(self):
34 """Test that the constructor works as expected."""
35 mocker = Mocker()
36 ui = mocker.mock()
37- controller = mocker.mock()
38 ui.setupUi(MATCH(lambda x: isinstance(x, SuccessPage)))
39- controller.setupUi(MATCH(lambda x: isinstance(x, SuccessPage)))
40 mocker.replay()
41- self.widget = SuccessPage(self.ui, self.controller)
42+ self.widget = SuccessPage(self.ui, QtGui.QPixmap())
43
44
45 class ErrorPageTestCase(TestCase):
46
47=== modified file 'ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py'
48--- ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py 2012-02-13 15:19:57 +0000
49+++ ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py 2012-02-13 18:15:24 +0000
50@@ -16,6 +16,7 @@
51
52 """Test Ubunto SSO Wizard."""
53
54+from PyQt4 import QtGui
55 from twisted.internet import defer
56
57 from ubuntu_sso.qt import ubuntu_sso_wizard
58@@ -47,3 +48,27 @@
59 self.assertEqual(self._called,
60 ((ubuntu_sso_wizard.USER_SUCCESS,), {}))
61 # pylint: enable=W0212
62+
63+
64+class UbuntuSSOWizardTestCase(BaseTestCase):
65+
66+ """Test Case for UbuntuSSOWizard"""
67+
68+ @defer.inlineCallbacks
69+ def setUp(self):
70+ yield super(UbuntuSSOWizardTestCase, self).setUp()
71+ self.app_name = 'app_name'
72+ self.ui = ubuntu_sso_wizard.UbuntuSSOWizard(self.app_name)
73+
74+ # pylint: disable=W0212
75+ def test_move_to_success_page_state(self):
76+ """Test _move_to_success_page method."""
77+ self.patch(self.ui, 'setButtonLayout', self._set_called)
78+ self.ui._move_to_success_page(self.app_name)
79+ self.assertEqual(self.ui._next_id, -1)
80+ self.assertEqual(self.ui._next_id, -1)
81+ self.assertEqual(self._called,
82+ (([QtGui.QWizard.Stretch, QtGui.QWizard.FinishButton],), {}))
83+ self.assertTrue(self.ui.button(QtGui.QWizard.FinishButton).isEnabled())
84+ self.assertEqual(self.ui._done, ubuntu_sso_wizard.USER_SUCCESS)
85+ # pylint: enable=W0212
86
87=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
88--- ubuntu_sso/qt/ubuntu_sso_wizard.py 2012-02-13 17:12:09 +0000
89+++ ubuntu_sso/qt/ubuntu_sso_wizard.py 2012-02-13 18:15:24 +0000
90@@ -65,6 +65,7 @@
91 parent = kwargs.get('parent')
92 super(UbuntuSSOWizard, self).__init__(parent)
93 self._next_id = -1
94+ self.setOption(QWizard.HaveFinishButtonOnEarlyPages, True)
95 self._done = USER_CANCELLATION
96
97 # store common useful data provided by the app
98@@ -117,7 +118,7 @@
99 self.email_verification.registrationSuccess.connect(
100 self._move_to_success_page)
101
102- self.success = SuccessPage(Ui_SuccessPage(),
103+ self.success = SuccessPage(Ui_SuccessPage(), QPixmap(),
104 app_name=self.app_name, parent=self)
105 self.error = ErrorPage(Ui_ErrorPage(),
106 app_name=self.app_name)
107@@ -199,6 +200,11 @@
108 """Move to the success page wizard."""
109 self._next_id = self.success_page_id
110 self.next()
111+ self.setButtonLayout([
112+ QWizard.Stretch,
113+ QWizard.FinishButton])
114+ self.button(QWizard.FinishButton).setEnabled(True)
115+ self.button(QWizard.FinishButton).setFocus()
116 self._done = USER_SUCCESS
117 self._next_id = -1
118

Subscribers

People subscribed via source and target branches