Merge lp:~mterry/unity8/lockscreen-autopilot into lp:unity8

[Michael Terry]

Fixes the lockscreen and swiping on the greeter still being possible even when in tablet mode.

Fixes the lockscreen and swiping on the greeter still being possible even when in tablet mode.

Then the lockscreen autopilot tests need to be adjusted for tablet mode (which really makes them half lockscreen tests, half greeter tests, but I'm ok with that).

[Michael Zanetti (mzanetti)]

From what I understood from design, swiping the greeter should still be possible if it is not locked (i.e. for the guest user)

The linked bug is more about the lockscreens showing up in tablet mode even though the actual password entry is already handled on the greeter directly. So not really related to the swiping.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/unity8-ci/423/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1612/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/814/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1616/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/423/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

> From what I understood from design, swiping the greeter should still be possible if it is not locked (i.e. for the guest user)

I thought design's stance on the tablet mode is "whatever desktop does now". And the desktop greeter does not include swiping. I don't remember design specifically addressing swiping.

> The linked bug is more about the lockscreens showing up in tablet mode even though the actual password entry is already handled on the greeter directly. So not really related to the swiping.

The lockscreen showing up in tablet mode is fixed by the change in Shell.qml. The swiping is a bonus fix in Greeter.qml because it appeared to be making the same mistake Shell.qml did by treating 'locked' as a synonym for tablet mode (subject of course to whether swiping should be allowed in tablet mode or not, as per your first comment).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/unity8-ci/431/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1634
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/431
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1638
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1638/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1384

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/431/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

> > From what I understood from design, swiping the greeter should still be
> possible if it is not locked (i.e. for the guest user)
>
> I thought design's stance on the tablet mode is "whatever desktop does now".
> And the desktop greeter does not include swiping. I don't remember design
> specifically addressing swiping.
>
> > The linked bug is more about the lockscreens showing up in tablet mode even
> though the actual password entry is already handled on the greeter directly.
> So not really related to the swiping.
>
> The lockscreen showing up in tablet mode is fixed by the change in Shell.qml.
> The swiping is a bonus fix in Greeter.qml because it appeared to be making the
> same mistake Shell.qml did by treating 'locked' as a synonym for tablet mode
> (subject of course to whether swiping should be allowed in tablet mode or not,
> as per your first comment).

When I joined the unity team the Tablet greeter did only swipe and design had a hard time to accept that it cannot be swiped if a password on the Greeter is required. So I think they want it to swipe whenever possible unless they changed their mind like with the rotating list of users. We need to check back with them.

[Michael Zanetti (mzanetti)]

Added Katie to the reviewers.

@Katie: On the tablet, should the user be able to swipe away the greeter in case there is no password set like it is now or should that be disabled in order to make it more like the desktop version?

When I did the first versions the swiping was clearly required but of course that might have changed. Please check back with Oren as he was the one designing the interactions for me in the first edition.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/unity8-ci/432/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1635
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/432
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/432
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1639
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1639/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1385

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/432/rebuild

review: Needs Fixing (continuous-integration)

[Katie Taylor (katie-t)]

Confirmed: On tablet, the user should be able to swipe away the greeter if there is no password set, like it is now and similar to the phone.

In the future, if the desktop is touch, I imagine the user can swipe away a non-password protected greeter too :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/unity8-ci/437/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/437
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/437/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1684
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1684/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1429

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/437/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/unity8-ci/447/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1742
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1746/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1484

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/447/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/unity8-ci/454/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1756
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/859
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/455
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1760
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1760/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1496

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/454/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Thanks a lot Michael!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/unity8-ci/464/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/465
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1811
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1811/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1541

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/464/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/unity8-ci/465/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1808
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/875/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/466
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/466/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1813
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1813/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1543

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/465/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/unity8-ci/468/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1811
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/469
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/469/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1816
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1816/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1546

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/468/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/153/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/1205/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1820
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/152
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1825
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1825/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1555

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Giving up... can you please merge trunk so we get the more stable HUD tests in here...

review: Needs Fixing

[lp:~mterry/unity8/lockscreen-autopilot]

145. By Michael Terry on 2013-08-02

Merge from trunk

146. By Michael Terry on 2013-08-02

Make sure launcher is available when greeter is not shown

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/unity8-ci/474/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/890
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/475
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/475/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1840
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1840/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1570

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/474/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

good now

review: Approve

=== modified file 'Greeter/Greeter.qml'
--- Greeter/Greeter.qml	2013-06-28 12:07:29 +0000
+++ Greeter/Greeter.qml	2013-08-02 14:09:24 +0000
@@ -34,7 +34,7 @@
 
     property alias dragHandleWidth: dragHandle.width
     property alias model: greeterContentLoader.model
-    property bool locked: shown && multiUser && !greeterContentLoader.promptless
+    property bool locked: shown && !LightDM.Greeter.promptless
 
     readonly property bool narrowMode: !multiUser && width <= units.gu(60)
     readonly property bool multiUser: LightDM.Users.count > 1
@@ -59,7 +59,6 @@
         anchors.fill: parent
         property var model: LightDM.Users
         property int currentIndex: 0
-        property bool promptless: item ? item.promptless : false
         property var infographicModel: LightDM.Infographic
 
         source: required ? "GreeterContent.qml" : ""
@@ -113,7 +112,7 @@
         // UI element)
         distanceThreshold: 0
 
-        enabled: !greeter.locked
+        enabled: greeter.narrowMode || !greeter.locked
 
         direction: Direction.Leftwards
     }

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-07-03 10:33:48 +0000
+++ Greeter/GreeterContent.qml	2013-08-02 14:09:24 +0000
@@ -23,7 +23,6 @@
     id: root
     anchors.fill: parent
 
-    property bool promptless: loginLoader.status == Loader.Ready && LightDM.Greeter.promptless
     property bool ready: wallpaper.status == Image.Ready
     property bool leftTeaserPressed: teasingMouseArea.pressed &&
                                      teasingMouseArea.mouseX < teasingMouseArea.width / 2

=== modified file 'Shell.qml'
--- Shell.qml	2013-08-01 09:49:24 +0000
+++ Shell.qml	2013-08-02 14:09:24 +0000
@@ -552,7 +552,7 @@
             anchors.bottom: parent.bottom
             width: parent.width
             dragAreaWidth: shell.edgeSize
-            available: !greeter.locked
+            available: !greeter.shown || greeter.narrowMode
             onDashItemSelected: {
                 greeter.hide()
                 // Animate if moving between application and dash

=== modified file 'tests/autopilot/unity8/shell/emulators/greeter.py'
--- tests/autopilot/unity8/shell/emulators/greeter.py	2013-07-23 11:42:11 +0000
+++ tests/autopilot/unity8/shell/emulators/greeter.py	2013-08-02 14:09:24 +0000
@@ -25,7 +25,7 @@
 
     """An emulator that understands the greeter screen."""
 
-    def unlock(self):
+    def swipe(self):
         """Swipe the greeter screen away."""
         self.created.wait_for(True)
         touch = Touch.create()
@@ -38,3 +38,6 @@
         touch.drag(start_x, start_y, stop_x, stop_y)
 
         self.created.wait_for(False)
+
+    def get_prompt(self):
+        return self.select_single("TextField", objectName="passwordInput")

=== modified file 'tests/autopilot/unity8/shell/tests/test_hud.py'
--- tests/autopilot/unity8/shell/tests/test_hud.py	2013-07-25 05:10:12 +0000
+++ tests/autopilot/unity8/shell/tests/test_hud.py	2013-08-02 14:09:24 +0000
@@ -37,7 +37,7 @@
 
         """
         self.launch_unity()
-        self.main_window.get_greeter().unlock()
+        self.main_window.get_greeter().swipe()
         window = self.main_window.get_qml_view()
         hud_show_button = self.main_window.get_hud_show_button()
         hud = self.main_window.get_hud()
@@ -58,7 +58,7 @@
 
         """
         self.launch_unity()
-        self.main_window.get_greeter().unlock()
+        self.main_window.get_greeter().swipe()
         window = self.main_window.get_qml_view()
         hud_show_button = self.main_window.get_hud_show_button()
         hud = self.main_window.get_hud()
@@ -81,7 +81,7 @@
     def test_hide_hud_click(self):
         """Tapping the close button of the Hud must dismiss it."""
         self.launch_unity()
-        self.main_window.get_greeter().unlock()
+        self.main_window.get_greeter().swipe()
         hud = self.main_window.get_hud()
 
         self._launch_test_app_from_app_screen()
@@ -97,7 +97,7 @@
 
         """
         self.launch_unity()
-        self.main_window.get_greeter().unlock()
+        self.main_window.get_greeter().swipe()
         hud = self.main_window.get_hud()
         window = self.main_window.get_qml_view()
 
@@ -114,7 +114,7 @@
     def test_launcher_hides_hud(self):
         """Opening the Launcher while the Hud is active must close the Hud."""
         self.launch_unity()
-        self.main_window.get_greeter().unlock()
+        self.main_window.get_greeter().swipe()
         hud = self.main_window.get_hud()
         launcher = self.main_window.get_launcher()
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2013-07-25 17:50:36 +0000
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2013-08-02 14:09:24 +0000
@@ -40,52 +40,68 @@
         """Must be able to unlock the PIN entry lock screen."""
         self.launch_unity()
         greeter = self.main_window.get_greeter()
-        greeter.unlock()
-
-        lockscreen = self._wait_for_lockscreen()
-        self._enter_pincode("1234")
-
-        self.assertThat(lockscreen.shown, Eventually(Equals(False)))
+
+        if greeter.narrowMode:
+            greeter.swipe()
+            lockscreen = self._wait_for_lockscreen()
+            self._enter_pincode("1234")
+            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
+        else:
+            self._enter_prompt_passphrase("1234")
+            self.assertThat(greeter.shown, Eventually(Equals(False)))
 
     @with_lightdm_mock("single-passphrase")
     def test_can_unlock_passphrase_screen(self):
         """Must be able to unlock the passphrase entry screen."""
         self.launch_unity()
         greeter = self.main_window.get_greeter()
-        greeter.unlock()
-
-        lockscreen = self._wait_for_lockscreen()
-        self._enter_passphrase("password")
-
-        self.assertThat(lockscreen.shown, Eventually(Equals(False)))
+
+        if greeter.narrowMode:
+            greeter.swipe()
+            lockscreen = self._wait_for_lockscreen()
+            self._enter_pin_passphrase("password")
+            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
+        else:
+            self._enter_prompt_passphrase("password")
+            self.assertThat(greeter.shown, Eventually(Equals(False)))
 
     @with_lightdm_mock("single-pin")
     def test_pin_screen_wrong_code(self):
         """Entering the wrong pin code must not dismiss the lock screen."""
         self.launch_unity()
         greeter = self.main_window.get_greeter()
-        greeter.unlock()
-
-        lockscreen = self._wait_for_lockscreen()
-        self._enter_pincode("4321")
-
-        pinentryField = self.main_window.get_pinentryField()
-        self.assertThat(pinentryField.text, Eventually(Equals("")))
-        self.assertThat(lockscreen.shown, Eventually(Equals(True)))
+
+        if greeter.narrowMode:
+            greeter.swipe()
+            lockscreen = self._wait_for_lockscreen()
+            self._enter_pincode("4321")
+            pinentryField = self.main_window.get_pinentryField()
+            self.assertThat(pinentryField.text, Eventually(Equals("")))
+            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
+        else:
+            self._enter_prompt_passphrase("4231")
+            prompt = self.main_window.get_greeter().get_prompt()
+            self.assertThat(prompt.text, Eventually(Equals("")))
+            self.assertThat(greeter.shown, Eventually(Equals(True)))
 
     @with_lightdm_mock("single-passphrase")
     def test_passphrase_screen_wrong_password(self):
         """Entering the wrong password must not dismiss the lock screen."""
         self.launch_unity()
         greeter = self.main_window.get_greeter()
-        greeter.unlock()
-
-        lockscreen = self._wait_for_lockscreen()
-        self._enter_passphrase("foobar")
-
-        pinentryField = self.main_window.get_pinentryField()
-        self.assertThat(pinentryField.text, Eventually(Equals("")))
-        self.assertThat(lockscreen.shown, Eventually(Equals(True)))
+
+        if greeter.narrowMode:
+            greeter.swipe()
+            lockscreen = self._wait_for_lockscreen()
+            self._enter_pin_passphrase("foobar")
+            pinentryField = self.main_window.get_pinentryField()
+            self.assertThat(pinentryField.text, Eventually(Equals("")))
+            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
+        else:
+            self._enter_prompt_passphrase("foobar")
+            prompt = self.main_window.get_greeter().get_prompt()
+            self.assertThat(prompt.text, Eventually(Equals("")))
+            self.assertThat(greeter.shown, Eventually(Equals(True)))
 
     def _wait_for_lockscreen(self):
         """Wait for the lock screen to load, and return it."""
@@ -114,9 +130,9 @@
                 )
             self.touch.tap_object(self.main_window.get_pinPadButton(int(num)))
 
-    def _enter_passphrase(self, passphrase):
+    def _enter_pin_passphrase(self, passphrase):
         """Enter the password specified in 'passphrase' into the password entry
-        field.
+        field of the pin lock screen.
 
         :param passphrase: The string you want to enter.
         :raises: TypeError if passphrase is not a string.
@@ -129,3 +145,19 @@
         self.touch.tap_object(pinentryField)
         self.keyboard.type(passphrase)
         self.keyboard.type("\n")
+
+    def _enter_prompt_passphrase(self, passphrase):
+        """Enter the password specified in 'passphrase' into the password entry
+        field of the main user list's prompt.
+
+        :param passphrase: The string you want to enter.
+        :raises: TypeError if passphrase is not a string.
+
+        """
+        if not isinstance(passphrase, basestring):
+            raise TypeError("'passphrase' parameter must be a string.")
+
+        prompt = self.main_window.get_greeter().get_prompt()
+        self.touch.tap_object(prompt)
+        self.keyboard.type(passphrase)
+        self.keyboard.type("\n")

=== modified file 'tests/mocks/LightDM/single/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single/GreeterPrivate.cpp	2013-06-05 22:03:08 +0000
+++ tests/mocks/LightDM/single/GreeterPrivate.cpp	2013-08-02 14:09:24 +0000
@@ -34,10 +34,8 @@
 {
     Q_Q(Greeter);
 
-    if (authenticationUser == "one") {
-        authenticated = true;
-        Q_EMIT q->authenticationComplete();
-    }
+    authenticated = true;
+    Q_EMIT q->authenticationComplete();
 }
 
 void GreeterPrivate::handleRespond(QString const &response)