1
=== modified file 'Greeter/Greeter.qml'
2
--- Greeter/Greeter.qml	2013-06-28 12:07:29 +0000
3
+++ Greeter/Greeter.qml	2013-08-02 14:09:24 +0000
4
@@ -34,7 +34,7 @@
5
34
34
6
35
    property alias dragHandleWidth: dragHandle.width
35
    property alias dragHandleWidth: dragHandle.width
7
36
    property alias model: greeterContentLoader.model
36
    property alias model: greeterContentLoader.model
9
37
    property bool locked: shown && multiUser && !greeterContentLoader.promptless
37
    property bool locked: shown && !LightDM.Greeter.promptless
10
38
38
11
39
    readonly property bool narrowMode: !multiUser && width <= units.gu(60)
39
    readonly property bool narrowMode: !multiUser && width <= units.gu(60)
12
40
    readonly property bool multiUser: LightDM.Users.count > 1
40
    readonly property bool multiUser: LightDM.Users.count > 1
13
@@ -59,7 +59,6 @@
14
59
        anchors.fill: parent
59
        anchors.fill: parent
15
60
        property var model: LightDM.Users
60
        property var model: LightDM.Users
16
61
        property int currentIndex: 0
61
        property int currentIndex: 0
17
62
        property bool promptless: item ? item.promptless : false
18
63
        property var infographicModel: LightDM.Infographic
62
        property var infographicModel: LightDM.Infographic
19
64
63
20
65
        source: required ? "GreeterContent.qml" : ""
64
        source: required ? "GreeterContent.qml" : ""
21
@@ -113,7 +112,7 @@
22
113
        // UI element)
112
        // UI element)
23
114
        distanceThreshold: 0
113
        distanceThreshold: 0
24
115
114
26
116
        enabled: !greeter.locked
115
        enabled: greeter.narrowMode || !greeter.locked
27
117
116
28
118
        direction: Direction.Leftwards
117
        direction: Direction.Leftwards
29
119
    }
118
    }
30
120
119
31
=== modified file 'Greeter/GreeterContent.qml'
32
--- Greeter/GreeterContent.qml	2013-07-03 10:33:48 +0000
33
+++ Greeter/GreeterContent.qml	2013-08-02 14:09:24 +0000
34
@@ -23,7 +23,6 @@
35
23
    id: root
23
    id: root
36
24
    anchors.fill: parent
24
    anchors.fill: parent
37
25
25
38
26
    property bool promptless: loginLoader.status == Loader.Ready && LightDM.Greeter.promptless
39
27
    property bool ready: wallpaper.status == Image.Ready
26
    property bool ready: wallpaper.status == Image.Ready
40
28
    property bool leftTeaserPressed: teasingMouseArea.pressed &&
27
    property bool leftTeaserPressed: teasingMouseArea.pressed &&
41
29
                                     teasingMouseArea.mouseX < teasingMouseArea.width / 2
28
                                     teasingMouseArea.mouseX < teasingMouseArea.width / 2
42
30
29
43
=== modified file 'Shell.qml'
44
--- Shell.qml	2013-08-01 09:49:24 +0000
45
+++ Shell.qml	2013-08-02 14:09:24 +0000
46
@@ -552,7 +552,7 @@
47
552
            anchors.bottom: parent.bottom
552
            anchors.bottom: parent.bottom
48
553
            width: parent.width
553
            width: parent.width
49
554
            dragAreaWidth: shell.edgeSize
554
            dragAreaWidth: shell.edgeSize
51
555
            available: !greeter.locked
555
            available: !greeter.shown || greeter.narrowMode
52
556
            onDashItemSelected: {
556
            onDashItemSelected: {
53
557
                greeter.hide()
557
                greeter.hide()
54
558
                // Animate if moving between application and dash
558
                // Animate if moving between application and dash
55
559
559
56
=== modified file 'tests/autopilot/unity8/shell/emulators/greeter.py'
57
--- tests/autopilot/unity8/shell/emulators/greeter.py	2013-07-23 11:42:11 +0000
58
+++ tests/autopilot/unity8/shell/emulators/greeter.py	2013-08-02 14:09:24 +0000
59
@@ -25,7 +25,7 @@
60
25
25
61
26
    """An emulator that understands the greeter screen."""
26
    """An emulator that understands the greeter screen."""
62
27
27
64
28
    def unlock(self):
28
    def swipe(self):
65
29
        """Swipe the greeter screen away."""
29
        """Swipe the greeter screen away."""
66
30
        self.created.wait_for(True)
30
        self.created.wait_for(True)
67
31
        touch = Touch.create()
31
        touch = Touch.create()
68
@@ -38,3 +38,6 @@
69
38
        touch.drag(start_x, start_y, stop_x, stop_y)
38
        touch.drag(start_x, start_y, stop_x, stop_y)
70
39
39
71
40
        self.created.wait_for(False)
40
        self.created.wait_for(False)
72
41
73
42
    def get_prompt(self):
74
43
        return self.select_single("TextField", objectName="passwordInput")
75
41
44
76
=== modified file 'tests/autopilot/unity8/shell/tests/test_hud.py'
77
--- tests/autopilot/unity8/shell/tests/test_hud.py	2013-07-25 05:10:12 +0000
78
+++ tests/autopilot/unity8/shell/tests/test_hud.py	2013-08-02 14:09:24 +0000
79
@@ -37,7 +37,7 @@
80
37
37
81
38
        """
38
        """
82
39
        self.launch_unity()
39
        self.launch_unity()
84
40
        self.main_window.get_greeter().unlock()
40
        self.main_window.get_greeter().swipe()
85
41
        window = self.main_window.get_qml_view()
41
        window = self.main_window.get_qml_view()
86
42
        hud_show_button = self.main_window.get_hud_show_button()
42
        hud_show_button = self.main_window.get_hud_show_button()
87
43
        hud = self.main_window.get_hud()
43
        hud = self.main_window.get_hud()
88
@@ -58,7 +58,7 @@
89
58
58
90
59
        """
59
        """
91
60
        self.launch_unity()
60
        self.launch_unity()
93
61
        self.main_window.get_greeter().unlock()
61
        self.main_window.get_greeter().swipe()
94
62
        window = self.main_window.get_qml_view()
62
        window = self.main_window.get_qml_view()
95
63
        hud_show_button = self.main_window.get_hud_show_button()
63
        hud_show_button = self.main_window.get_hud_show_button()
96
64
        hud = self.main_window.get_hud()
64
        hud = self.main_window.get_hud()
97
@@ -81,7 +81,7 @@
98
81
    def test_hide_hud_click(self):
81
    def test_hide_hud_click(self):
99
82
        """Tapping the close button of the Hud must dismiss it."""
82
        """Tapping the close button of the Hud must dismiss it."""
100
83
        self.launch_unity()
83
        self.launch_unity()
102
84
        self.main_window.get_greeter().unlock()
84
        self.main_window.get_greeter().swipe()
103
85
        hud = self.main_window.get_hud()
85
        hud = self.main_window.get_hud()
104
86
86
105
87
        self._launch_test_app_from_app_screen()
87
        self._launch_test_app_from_app_screen()
106
@@ -97,7 +97,7 @@
107
97
97
108
98
        """
98
        """
109
99
        self.launch_unity()
99
        self.launch_unity()
111
100
        self.main_window.get_greeter().unlock()
100
        self.main_window.get_greeter().swipe()
112
101
        hud = self.main_window.get_hud()
101
        hud = self.main_window.get_hud()
113
102
        window = self.main_window.get_qml_view()
102
        window = self.main_window.get_qml_view()
114
103
103
115
@@ -114,7 +114,7 @@
116
114
    def test_launcher_hides_hud(self):
114
    def test_launcher_hides_hud(self):
117
115
        """Opening the Launcher while the Hud is active must close the Hud."""
115
        """Opening the Launcher while the Hud is active must close the Hud."""
118
116
        self.launch_unity()
116
        self.launch_unity()
120
117
        self.main_window.get_greeter().unlock()
117
        self.main_window.get_greeter().swipe()
121
118
        hud = self.main_window.get_hud()
118
        hud = self.main_window.get_hud()
122
119
        launcher = self.main_window.get_launcher()
119
        launcher = self.main_window.get_launcher()
123
120
120
124
121
121
125
=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
126
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2013-07-25 17:50:36 +0000
127
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2013-08-02 14:09:24 +0000
128
@@ -40,52 +40,68 @@
129
40
        """Must be able to unlock the PIN entry lock screen."""
40
        """Must be able to unlock the PIN entry lock screen."""
130
41
        self.launch_unity()
41
        self.launch_unity()
131
42
        greeter = self.main_window.get_greeter()
42
        greeter = self.main_window.get_greeter()
138
43
        greeter.unlock()
43
139
44
44
        if greeter.narrowMode:
140
45
        lockscreen = self._wait_for_lockscreen()
45
            greeter.swipe()
141
46
        self._enter_pincode("1234")
46
            lockscreen = self._wait_for_lockscreen()
142
47
47
            self._enter_pincode("1234")
143
48
        self.assertThat(lockscreen.shown, Eventually(Equals(False)))
48
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
144
49
        else:
145
50
            self._enter_prompt_passphrase("1234")
146
51
            self.assertThat(greeter.shown, Eventually(Equals(False)))
147
49
52
148
50
    @with_lightdm_mock("single-passphrase")
53
    @with_lightdm_mock("single-passphrase")
149
51
    def test_can_unlock_passphrase_screen(self):
54
    def test_can_unlock_passphrase_screen(self):
150
52
        """Must be able to unlock the passphrase entry screen."""
55
        """Must be able to unlock the passphrase entry screen."""
151
53
        self.launch_unity()
56
        self.launch_unity()
152
54
        greeter = self.main_window.get_greeter()
57
        greeter = self.main_window.get_greeter()
159
55
        greeter.unlock()
58
160
56
59
        if greeter.narrowMode:
161
57
        lockscreen = self._wait_for_lockscreen()
60
            greeter.swipe()
162
58
        self._enter_passphrase("password")
61
            lockscreen = self._wait_for_lockscreen()
163
59
62
            self._enter_pin_passphrase("password")
164
60
        self.assertThat(lockscreen.shown, Eventually(Equals(False)))
63
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
165
64
        else:
166
65
            self._enter_prompt_passphrase("password")
167
66
            self.assertThat(greeter.shown, Eventually(Equals(False)))
168
61
67
169
62
    @with_lightdm_mock("single-pin")
68
    @with_lightdm_mock("single-pin")
170
63
    def test_pin_screen_wrong_code(self):
69
    def test_pin_screen_wrong_code(self):
171
64
        """Entering the wrong pin code must not dismiss the lock screen."""
70
        """Entering the wrong pin code must not dismiss the lock screen."""
172
65
        self.launch_unity()
71
        self.launch_unity()
173
66
        greeter = self.main_window.get_greeter()
72
        greeter = self.main_window.get_greeter()
182
67
        greeter.unlock()
73
183
68
74
        if greeter.narrowMode:
184
69
        lockscreen = self._wait_for_lockscreen()
75
            greeter.swipe()
185
70
        self._enter_pincode("4321")
76
            lockscreen = self._wait_for_lockscreen()
186
71
77
            self._enter_pincode("4321")
187
72
        pinentryField = self.main_window.get_pinentryField()
78
            pinentryField = self.main_window.get_pinentryField()
188
73
        self.assertThat(pinentryField.text, Eventually(Equals("")))
79
            self.assertThat(pinentryField.text, Eventually(Equals("")))
189
74
        self.assertThat(lockscreen.shown, Eventually(Equals(True)))
80
            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
190
81
        else:
191
82
            self._enter_prompt_passphrase("4231")
192
83
            prompt = self.main_window.get_greeter().get_prompt()
193
84
            self.assertThat(prompt.text, Eventually(Equals("")))
194
85
            self.assertThat(greeter.shown, Eventually(Equals(True)))
195
75
86
196
76
    @with_lightdm_mock("single-passphrase")
87
    @with_lightdm_mock("single-passphrase")
197
77
    def test_passphrase_screen_wrong_password(self):
88
    def test_passphrase_screen_wrong_password(self):
198
78
        """Entering the wrong password must not dismiss the lock screen."""
89
        """Entering the wrong password must not dismiss the lock screen."""
199
79
        self.launch_unity()
90
        self.launch_unity()
200
80
        greeter = self.main_window.get_greeter()
91
        greeter = self.main_window.get_greeter()
209
81
        greeter.unlock()
92
210
82
93
        if greeter.narrowMode:
211
83
        lockscreen = self._wait_for_lockscreen()
94
            greeter.swipe()
212
84
        self._enter_passphrase("foobar")
95
            lockscreen = self._wait_for_lockscreen()
213
85
96
            self._enter_pin_passphrase("foobar")
214
86
        pinentryField = self.main_window.get_pinentryField()
97
            pinentryField = self.main_window.get_pinentryField()
215
87
        self.assertThat(pinentryField.text, Eventually(Equals("")))
98
            self.assertThat(pinentryField.text, Eventually(Equals("")))
216
88
        self.assertThat(lockscreen.shown, Eventually(Equals(True)))
99
            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
217
100
        else:
218
101
            self._enter_prompt_passphrase("foobar")
219
102
            prompt = self.main_window.get_greeter().get_prompt()
220
103
            self.assertThat(prompt.text, Eventually(Equals("")))
221
104
            self.assertThat(greeter.shown, Eventually(Equals(True)))
222
89
105
223
90
    def _wait_for_lockscreen(self):
106
    def _wait_for_lockscreen(self):
224
91
        """Wait for the lock screen to load, and return it."""
107
        """Wait for the lock screen to load, and return it."""
225
@@ -114,9 +130,9 @@
226
114
                )
130
                )
227
115
            self.touch.tap_object(self.main_window.get_pinPadButton(int(num)))
131
            self.touch.tap_object(self.main_window.get_pinPadButton(int(num)))
228
116
132
230
117
    def _enter_passphrase(self, passphrase):
133
    def _enter_pin_passphrase(self, passphrase):
231
118
        """Enter the password specified in 'passphrase' into the password entry
134
        """Enter the password specified in 'passphrase' into the password entry
233
119
        field.
135
        field of the pin lock screen.
234
120
136
235
121
        :param passphrase: The string you want to enter.
137
        :param passphrase: The string you want to enter.
236
122
        :raises: TypeError if passphrase is not a string.
138
        :raises: TypeError if passphrase is not a string.
237
@@ -129,3 +145,19 @@
238
129
        self.touch.tap_object(pinentryField)
145
        self.touch.tap_object(pinentryField)
239
130
        self.keyboard.type(passphrase)
146
        self.keyboard.type(passphrase)
240
131
        self.keyboard.type("\n")
147
        self.keyboard.type("\n")
241
148
242
149
    def _enter_prompt_passphrase(self, passphrase):
243
150
        """Enter the password specified in 'passphrase' into the password entry
244
151
        field of the main user list's prompt.
245
152
246
153
        :param passphrase: The string you want to enter.
247
154
        :raises: TypeError if passphrase is not a string.
248
155
249
156
        """
250
157
        if not isinstance(passphrase, basestring):
251
158
            raise TypeError("'passphrase' parameter must be a string.")
252
159
253
160
        prompt = self.main_window.get_greeter().get_prompt()
254
161
        self.touch.tap_object(prompt)
255
162
        self.keyboard.type(passphrase)
256
163
        self.keyboard.type("\n")
257
132
164
258
=== modified file 'tests/mocks/LightDM/single/GreeterPrivate.cpp'
259
--- tests/mocks/LightDM/single/GreeterPrivate.cpp	2013-06-05 22:03:08 +0000
260
+++ tests/mocks/LightDM/single/GreeterPrivate.cpp	2013-08-02 14:09:24 +0000
261
@@ -34,10 +34,8 @@
262
34
{
34
{
263
35
    Q_Q(Greeter);
35
    Q_Q(Greeter);
264
36
36
269
37
    if (authenticationUser == "one") {
37
    authenticated = true;
270
38
        authenticated = true;
38
    Q_EMIT q->authenticationComplete();
267
39
        Q_EMIT q->authenticationComplete();
268
40
    }
271
41
}
39
}
272
42
40
273
43
void GreeterPrivate::handleRespond(QString const &response)
41
void GreeterPrivate::handleRespond(QString const &response)
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2013-07-26	Approve on 2013-08-02
PS Jenkins bot (community)	continuous-integration		Approve on 2013-08-02
Katie Taylor	design	2013-07-29	Pending
Review via email: mp+177225@code.launchpad.net
1	=== modified file 'Greeter/Greeter.qml'
2	--- Greeter/Greeter.qml 2013-06-28 12:07:29 +0000
3	+++ Greeter/Greeter.qml 2013-08-02 14:09:24 +0000
4	@@ -34,7 +34,7 @@
5	34		34
6	35	property alias dragHandleWidth: dragHandle.width	35	property alias dragHandleWidth: dragHandle.width
7	36	property alias model: greeterContentLoader.model	36	property alias model: greeterContentLoader.model
9	37	property bool locked: shown && multiUser && !greeterContentLoader.promptless	37	property bool locked: shown && !LightDM.Greeter.promptless
10	38		38
11	39	readonly property bool narrowMode: !multiUser && width <= units.gu(60)	39	readonly property bool narrowMode: !multiUser && width <= units.gu(60)
12	40	readonly property bool multiUser: LightDM.Users.count > 1	40	readonly property bool multiUser: LightDM.Users.count > 1
13	@@ -59,7 +59,6 @@
14	59	anchors.fill: parent	59	anchors.fill: parent
15	60	property var model: LightDM.Users	60	property var model: LightDM.Users
16	61	property int currentIndex: 0	61	property int currentIndex: 0
17	62	property bool promptless: item ? item.promptless : false
18	63	property var infographicModel: LightDM.Infographic	62	property var infographicModel: LightDM.Infographic
19	64		63
20	65	source: required ? "GreeterContent.qml" : ""	64	source: required ? "GreeterContent.qml" : ""
21	@@ -113,7 +112,7 @@
22	113	// UI element)	112	// UI element)
23	114	distanceThreshold: 0	113	distanceThreshold: 0
24	115		114
26	116	enabled: !greeter.locked	115	enabled: greeter.narrowMode \|\| !greeter.locked
27	117		116
28	118	direction: Direction.Leftwards	117	direction: Direction.Leftwards
29	119	}	118	}
30	120		119
31	=== modified file 'Greeter/GreeterContent.qml'
32	--- Greeter/GreeterContent.qml 2013-07-03 10:33:48 +0000
33	+++ Greeter/GreeterContent.qml 2013-08-02 14:09:24 +0000
34	@@ -23,7 +23,6 @@
35	23	id: root	23	id: root
36	24	anchors.fill: parent	24	anchors.fill: parent
37	25		25
38	26	property bool promptless: loginLoader.status == Loader.Ready && LightDM.Greeter.promptless
39	27	property bool ready: wallpaper.status == Image.Ready	26	property bool ready: wallpaper.status == Image.Ready
40	28	property bool leftTeaserPressed: teasingMouseArea.pressed &&	27	property bool leftTeaserPressed: teasingMouseArea.pressed &&
41	29	teasingMouseArea.mouseX < teasingMouseArea.width / 2	28	teasingMouseArea.mouseX < teasingMouseArea.width / 2
42	30		29
43	=== modified file 'Shell.qml'
44	--- Shell.qml 2013-08-01 09:49:24 +0000
45	+++ Shell.qml 2013-08-02 14:09:24 +0000
46	@@ -552,7 +552,7 @@
47	552	anchors.bottom: parent.bottom	552	anchors.bottom: parent.bottom
48	553	width: parent.width	553	width: parent.width
49	554	dragAreaWidth: shell.edgeSize	554	dragAreaWidth: shell.edgeSize
51	555	available: !greeter.locked	555	available: !greeter.shown \|\| greeter.narrowMode
52	556	onDashItemSelected: {	556	onDashItemSelected: {
53	557	greeter.hide()	557	greeter.hide()
54	558	// Animate if moving between application and dash	558	// Animate if moving between application and dash
55	559		559
56	=== modified file 'tests/autopilot/unity8/shell/emulators/greeter.py'
57	--- tests/autopilot/unity8/shell/emulators/greeter.py 2013-07-23 11:42:11 +0000
58	+++ tests/autopilot/unity8/shell/emulators/greeter.py 2013-08-02 14:09:24 +0000
59	@@ -25,7 +25,7 @@
60	25		25
61	26	"""An emulator that understands the greeter screen."""	26	"""An emulator that understands the greeter screen."""
62	27		27
64	28	def unlock(self):	28	def swipe(self):
65	29	"""Swipe the greeter screen away."""	29	"""Swipe the greeter screen away."""
66	30	self.created.wait_for(True)	30	self.created.wait_for(True)
67	31	touch = Touch.create()	31	touch = Touch.create()
68	@@ -38,3 +38,6 @@
69	38	touch.drag(start_x, start_y, stop_x, stop_y)	38	touch.drag(start_x, start_y, stop_x, stop_y)
70	39		39
71	40	self.created.wait_for(False)	40	self.created.wait_for(False)
72			41
73			42	def get_prompt(self):
74			43	return self.select_single("TextField", objectName="passwordInput")
75	41		44
76	=== modified file 'tests/autopilot/unity8/shell/tests/test_hud.py'
77	--- tests/autopilot/unity8/shell/tests/test_hud.py 2013-07-25 05:10:12 +0000
78	+++ tests/autopilot/unity8/shell/tests/test_hud.py 2013-08-02 14:09:24 +0000
79	@@ -37,7 +37,7 @@
80	37		37
81	38	"""	38	"""
82	39	self.launch_unity()	39	self.launch_unity()
84	40	self.main_window.get_greeter().unlock()	40	self.main_window.get_greeter().swipe()
85	41	window = self.main_window.get_qml_view()	41	window = self.main_window.get_qml_view()
86	42	hud_show_button = self.main_window.get_hud_show_button()	42	hud_show_button = self.main_window.get_hud_show_button()
87	43	hud = self.main_window.get_hud()	43	hud = self.main_window.get_hud()
88	@@ -58,7 +58,7 @@
89	58		58
90	59	"""	59	"""
91	60	self.launch_unity()	60	self.launch_unity()
93	61	self.main_window.get_greeter().unlock()	61	self.main_window.get_greeter().swipe()
94	62	window = self.main_window.get_qml_view()	62	window = self.main_window.get_qml_view()
95	63	hud_show_button = self.main_window.get_hud_show_button()	63	hud_show_button = self.main_window.get_hud_show_button()
96	64	hud = self.main_window.get_hud()	64	hud = self.main_window.get_hud()
97	@@ -81,7 +81,7 @@
98	81	def test_hide_hud_click(self):	81	def test_hide_hud_click(self):
99	82	"""Tapping the close button of the Hud must dismiss it."""	82	"""Tapping the close button of the Hud must dismiss it."""
100	83	self.launch_unity()	83	self.launch_unity()
102	84	self.main_window.get_greeter().unlock()	84	self.main_window.get_greeter().swipe()
103	85	hud = self.main_window.get_hud()	85	hud = self.main_window.get_hud()
104	86		86
105	87	self._launch_test_app_from_app_screen()	87	self._launch_test_app_from_app_screen()
106	@@ -97,7 +97,7 @@
107	97		97
108	98	"""	98	"""
109	99	self.launch_unity()	99	self.launch_unity()
111	100	self.main_window.get_greeter().unlock()	100	self.main_window.get_greeter().swipe()
112	101	hud = self.main_window.get_hud()	101	hud = self.main_window.get_hud()
113	102	window = self.main_window.get_qml_view()	102	window = self.main_window.get_qml_view()
114	103		103
115	@@ -114,7 +114,7 @@
116	114	def test_launcher_hides_hud(self):	114	def test_launcher_hides_hud(self):
117	115	"""Opening the Launcher while the Hud is active must close the Hud."""	115	"""Opening the Launcher while the Hud is active must close the Hud."""
118	116	self.launch_unity()	116	self.launch_unity()
120	117	self.main_window.get_greeter().unlock()	117	self.main_window.get_greeter().swipe()
121	118	hud = self.main_window.get_hud()	118	hud = self.main_window.get_hud()
122	119	launcher = self.main_window.get_launcher()	119	launcher = self.main_window.get_launcher()
123	120		120
124	121		121
125	=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
126	--- tests/autopilot/unity8/shell/tests/test_lock_screen.py 2013-07-25 17:50:36 +0000
127	+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py 2013-08-02 14:09:24 +0000
128	@@ -40,52 +40,68 @@
129	40	"""Must be able to unlock the PIN entry lock screen."""	40	"""Must be able to unlock the PIN entry lock screen."""
130	41	self.launch_unity()	41	self.launch_unity()
131	42	greeter = self.main_window.get_greeter()	42	greeter = self.main_window.get_greeter()
138	43	greeter.unlock()	43
139	44		44	if greeter.narrowMode:
140	45	lockscreen = self._wait_for_lockscreen()	45	greeter.swipe()
141	46	self._enter_pincode("1234")	46	lockscreen = self._wait_for_lockscreen()
142	47		47	self._enter_pincode("1234")
143	48	self.assertThat(lockscreen.shown, Eventually(Equals(False)))	48	self.assertThat(lockscreen.shown, Eventually(Equals(False)))
144			49	else:
145			50	self._enter_prompt_passphrase("1234")
146			51	self.assertThat(greeter.shown, Eventually(Equals(False)))
147	49		52
148	50	@with_lightdm_mock("single-passphrase")	53	@with_lightdm_mock("single-passphrase")
149	51	def test_can_unlock_passphrase_screen(self):	54	def test_can_unlock_passphrase_screen(self):
150	52	"""Must be able to unlock the passphrase entry screen."""	55	"""Must be able to unlock the passphrase entry screen."""
151	53	self.launch_unity()	56	self.launch_unity()
152	54	greeter = self.main_window.get_greeter()	57	greeter = self.main_window.get_greeter()
159	55	greeter.unlock()	58
160	56		59	if greeter.narrowMode:
161	57	lockscreen = self._wait_for_lockscreen()	60	greeter.swipe()
162	58	self._enter_passphrase("password")	61	lockscreen = self._wait_for_lockscreen()
163	59		62	self._enter_pin_passphrase("password")
164	60	self.assertThat(lockscreen.shown, Eventually(Equals(False)))	63	self.assertThat(lockscreen.shown, Eventually(Equals(False)))
165			64	else:
166			65	self._enter_prompt_passphrase("password")
167			66	self.assertThat(greeter.shown, Eventually(Equals(False)))
168	61		67
169	62	@with_lightdm_mock("single-pin")	68	@with_lightdm_mock("single-pin")
170	63	def test_pin_screen_wrong_code(self):	69	def test_pin_screen_wrong_code(self):
171	64	"""Entering the wrong pin code must not dismiss the lock screen."""	70	"""Entering the wrong pin code must not dismiss the lock screen."""
172	65	self.launch_unity()	71	self.launch_unity()
173	66	greeter = self.main_window.get_greeter()	72	greeter = self.main_window.get_greeter()
182	67	greeter.unlock()	73
183	68		74	if greeter.narrowMode:
184	69	lockscreen = self._wait_for_lockscreen()	75	greeter.swipe()
185	70	self._enter_pincode("4321")	76	lockscreen = self._wait_for_lockscreen()
186	71		77	self._enter_pincode("4321")
187	72	pinentryField = self.main_window.get_pinentryField()	78	pinentryField = self.main_window.get_pinentryField()
188	73	self.assertThat(pinentryField.text, Eventually(Equals("")))	79	self.assertThat(pinentryField.text, Eventually(Equals("")))
189	74	self.assertThat(lockscreen.shown, Eventually(Equals(True)))	80	self.assertThat(lockscreen.shown, Eventually(Equals(True)))
190			81	else:
191			82	self._enter_prompt_passphrase("4231")
192			83	prompt = self.main_window.get_greeter().get_prompt()
193			84	self.assertThat(prompt.text, Eventually(Equals("")))
194			85	self.assertThat(greeter.shown, Eventually(Equals(True)))
195	75		86
196	76	@with_lightdm_mock("single-passphrase")	87	@with_lightdm_mock("single-passphrase")
197	77	def test_passphrase_screen_wrong_password(self):	88	def test_passphrase_screen_wrong_password(self):
198	78	"""Entering the wrong password must not dismiss the lock screen."""	89	"""Entering the wrong password must not dismiss the lock screen."""
199	79	self.launch_unity()	90	self.launch_unity()
200	80	greeter = self.main_window.get_greeter()	91	greeter = self.main_window.get_greeter()
209	81	greeter.unlock()	92
210	82		93	if greeter.narrowMode:
211	83	lockscreen = self._wait_for_lockscreen()	94	greeter.swipe()
212	84	self._enter_passphrase("foobar")	95	lockscreen = self._wait_for_lockscreen()
213	85		96	self._enter_pin_passphrase("foobar")
214	86	pinentryField = self.main_window.get_pinentryField()	97	pinentryField = self.main_window.get_pinentryField()
215	87	self.assertThat(pinentryField.text, Eventually(Equals("")))	98	self.assertThat(pinentryField.text, Eventually(Equals("")))
216	88	self.assertThat(lockscreen.shown, Eventually(Equals(True)))	99	self.assertThat(lockscreen.shown, Eventually(Equals(True)))
217			100	else:
218			101	self._enter_prompt_passphrase("foobar")
219			102	prompt = self.main_window.get_greeter().get_prompt()
220			103	self.assertThat(prompt.text, Eventually(Equals("")))
221			104	self.assertThat(greeter.shown, Eventually(Equals(True)))
222	89		105
223	90	def _wait_for_lockscreen(self):	106	def _wait_for_lockscreen(self):
224	91	"""Wait for the lock screen to load, and return it."""	107	"""Wait for the lock screen to load, and return it."""
225	@@ -114,9 +130,9 @@
226	114	)	130	)
227	115	self.touch.tap_object(self.main_window.get_pinPadButton(int(num)))	131	self.touch.tap_object(self.main_window.get_pinPadButton(int(num)))
228	116		132
230	117	def _enter_passphrase(self, passphrase):	133	def _enter_pin_passphrase(self, passphrase):
231	118	"""Enter the password specified in 'passphrase' into the password entry	134	"""Enter the password specified in 'passphrase' into the password entry
233	119	field.	135	field of the pin lock screen.
234	120		136
235	121	:param passphrase: The string you want to enter.	137	:param passphrase: The string you want to enter.
236	122	:raises: TypeError if passphrase is not a string.	138	:raises: TypeError if passphrase is not a string.
237	@@ -129,3 +145,19 @@
238	129	self.touch.tap_object(pinentryField)	145	self.touch.tap_object(pinentryField)
239	130	self.keyboard.type(passphrase)	146	self.keyboard.type(passphrase)
240	131	self.keyboard.type("\n")	147	self.keyboard.type("\n")
241			148
242			149	def _enter_prompt_passphrase(self, passphrase):
243			150	"""Enter the password specified in 'passphrase' into the password entry
244			151	field of the main user list's prompt.
245			152
246			153	:param passphrase: The string you want to enter.
247			154	:raises: TypeError if passphrase is not a string.
248			155
249			156	"""
250			157	if not isinstance(passphrase, basestring):
251			158	raise TypeError("'passphrase' parameter must be a string.")
252			159
253			160	prompt = self.main_window.get_greeter().get_prompt()
254			161	self.touch.tap_object(prompt)
255			162	self.keyboard.type(passphrase)
256			163	self.keyboard.type("\n")
257	132		164
258	=== modified file 'tests/mocks/LightDM/single/GreeterPrivate.cpp'
259	--- tests/mocks/LightDM/single/GreeterPrivate.cpp 2013-06-05 22:03:08 +0000
260	+++ tests/mocks/LightDM/single/GreeterPrivate.cpp 2013-08-02 14:09:24 +0000
261	@@ -34,10 +34,8 @@
262	34	{	34	{
263	35	Q_Q(Greeter);	35	Q_Q(Greeter);
264	36		36
269	37	if (authenticationUser == "one") {	37	authenticated = true;
270	38	authenticated = true;	38	Q_EMIT q->authenticationComplete();
267	39	Q_EMIT q->authenticationComplete();
268	40	}
271	41	}	39	}
272	42		40
273	43	void GreeterPrivate::handleRespond(QString const &response)	41	void GreeterPrivate::handleRespond(QString const &response)