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
17
"""Success page UI."""
17
"""Success page UI."""
6
18
18
7
19
from ubuntu_sso.qt.gui import SSOWizardPage
19
from ubuntu_sso.qt.gui import SSOWizardPage
8
20
from ubuntu_sso.utils.ui import SUCCESS
9
20
21
10
21
22
11
22
class SuccessPage(SSOWizardPage):
23
class SuccessPage(SSOWizardPage):
12
23
    """Page used to display success message."""
24
    """Page used to display success message."""
13
24
25
15
25
    def __init__(self, ui, *args, **kwargs):
26
    def __init__(self, ui, image_pixmap, *args, **kwargs):
16
26
        super(SuccessPage, self).__init__(ui, *args, **kwargs)
27
        super(SuccessPage, self).__init__(ui, *args, **kwargs)
18
27
        self.next = -1
28
        self.ui.image_label.setPixmap(image_pixmap)
19
29
        message = SUCCESS % {'app_name': self.app_name}
20
30
        self.ui.success_message_body.setText(message)
21
28
31
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
75
        """Setup tests."""
75
        """Setup tests."""
27
76
        super(SuccessPageTestCase, self).setUp()
76
        super(SuccessPageTestCase, self).setUp()
28
77
        self.ui = Ui_SuccessPage()
77
        self.ui = Ui_SuccessPage()
31
78
        self.controller = FakeController()
78
        self.widget = SuccessPage(self.ui, QtGui.QPixmap())
30
79
        self.widget = SuccessPage(self.ui, self.controller)
32
80
79
33
81
    def test_constructor(self):
80
    def test_constructor(self):
34
82
        """Test that the constructor works as expected."""
81
        """Test that the constructor works as expected."""
35
83
        mocker = Mocker()
82
        mocker = Mocker()
36
84
        ui = mocker.mock()
83
        ui = mocker.mock()
37
85
        controller = mocker.mock()
38
86
        ui.setupUi(MATCH(lambda x: isinstance(x, SuccessPage)))
84
        ui.setupUi(MATCH(lambda x: isinstance(x, SuccessPage)))
39
87
        controller.setupUi(MATCH(lambda x: isinstance(x, SuccessPage)))
40
88
        mocker.replay()
85
        mocker.replay()
42
89
        self.widget = SuccessPage(self.ui, self.controller)
86
        self.widget = SuccessPage(self.ui, QtGui.QPixmap())
43
90
87
44
91
88
45
92
class ErrorPageTestCase(TestCase):
89
class ErrorPageTestCase(TestCase):
46
93
90
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
16
16
52
17
"""Test Ubunto SSO Wizard."""
17
"""Test Ubunto SSO Wizard."""
53
18
18
54
19
from PyQt4 import QtGui
55
19
from twisted.internet import defer
20
from twisted.internet import defer
56
20
21
57
21
from ubuntu_sso.qt import ubuntu_sso_wizard
22
from ubuntu_sso.qt import ubuntu_sso_wizard
58
@@ -47,3 +48,27 @@
59
47
        self.assertEqual(self._called,
48
        self.assertEqual(self._called,
60
48
            ((ubuntu_sso_wizard.USER_SUCCESS,), {}))
49
            ((ubuntu_sso_wizard.USER_SUCCESS,), {}))
61
49
    # pylint: enable=W0212
50
    # pylint: enable=W0212
62
51
63
52
64
53
class UbuntuSSOWizardTestCase(BaseTestCase):
65
54
66
55
    """Test Case for UbuntuSSOWizard"""
67
56
68
57
    @defer.inlineCallbacks
69
58
    def setUp(self):
70
59
        yield super(UbuntuSSOWizardTestCase, self).setUp()
71
60
        self.app_name = 'app_name'
72
61
        self.ui = ubuntu_sso_wizard.UbuntuSSOWizard(self.app_name)
73
62
74
63
    # pylint: disable=W0212
75
64
    def test_move_to_success_page_state(self):
76
65
        """Test _move_to_success_page method."""
77
66
        self.patch(self.ui, 'setButtonLayout', self._set_called)
78
67
        self.ui._move_to_success_page(self.app_name)
79
68
        self.assertEqual(self.ui._next_id, -1)
80
69
        self.assertEqual(self.ui._next_id, -1)
81
70
        self.assertEqual(self._called,
82
71
            (([QtGui.QWizard.Stretch, QtGui.QWizard.FinishButton],), {}))
83
72
        self.assertTrue(self.ui.button(QtGui.QWizard.FinishButton).isEnabled())
84
73
        self.assertEqual(self.ui._done, ubuntu_sso_wizard.USER_SUCCESS)
85
74
    # pylint: enable=W0212
86
50
75
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
65
        parent = kwargs.get('parent')
65
        parent = kwargs.get('parent')
92
66
        super(UbuntuSSOWizard, self).__init__(parent)
66
        super(UbuntuSSOWizard, self).__init__(parent)
93
67
        self._next_id = -1
67
        self._next_id = -1
94
68
        self.setOption(QWizard.HaveFinishButtonOnEarlyPages, True)
95
68
        self._done = USER_CANCELLATION
69
        self._done = USER_CANCELLATION
96
69
70
97
70
        # store common useful data provided by the app
71
        # store common useful data provided by the app
98
@@ -117,7 +118,7 @@
99
117
        self.email_verification.registrationSuccess.connect(
118
        self.email_verification.registrationSuccess.connect(
100
118
            self._move_to_success_page)
119
            self._move_to_success_page)
101
119
120
103
120
        self.success = SuccessPage(Ui_SuccessPage(),
121
        self.success = SuccessPage(Ui_SuccessPage(), QPixmap(),
104
121
                                   app_name=self.app_name, parent=self)
122
                                   app_name=self.app_name, parent=self)
105
122
        self.error = ErrorPage(Ui_ErrorPage(),
123
        self.error = ErrorPage(Ui_ErrorPage(),
106
123
                               app_name=self.app_name)
124
                               app_name=self.app_name)
107
@@ -199,6 +200,11 @@
108
199
        """Move to the success page wizard."""
200
        """Move to the success page wizard."""
109
200
        self._next_id = self.success_page_id
201
        self._next_id = self.success_page_id
110
201
        self.next()
202
        self.next()
111
203
        self.setButtonLayout([
112
204
            QWizard.Stretch,
113
205
            QWizard.FinishButton])
114
206
        self.button(QWizard.FinishButton).setEnabled(True)
115
207
        self.button(QWizard.FinishButton).setFocus()
116
202
        self._done = USER_SUCCESS
208
        self._done = USER_SUCCESS
117
203
        self._next_id = -1
209
        self._next_id = -1
118
204
210
Reviewer	Review Type	Date Requested	Status
Natalia Bidart (community)		2012-02-13	Approve on 2012-02-13
Review via email: mp+92815@code.launchpad.net