Merge lp:~mterry/unity8/unlock-sim-after-wizard into lp:unity8

[Michael Terry]

Only call unlockAllModems once the wizard is done. (LP: #1425161)

Only call unlockAllModems once the wizard is done. (LP: #1425161)

This is only a problem in vivid because in RTM, the shell isn't running when the wizard is.

I never noticed this when testing because I'm a silly American.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * Did you make sure that your branch does not contain spurious tags?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 NA

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1636
http://jenkins.qa.ubuntu.com/job/unity8-ci/5362/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/527
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1538
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18358

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Would you mind rebasing it on top of lp:~dandrader/unity8/unifyShellTests?

With unifyShellTests, tests functions have to load the shell explicitly using the loadShell(form-factor) helper function, which will be useful for your new test.

Besides, the two conflict anyway, so either of the MPs would have to do that in any case.

[lp:~mterry/unity8/unlock-sim-after-wizard]

1637. By Michael Terry on 2015-03-03

Merge unifyShellTests

1638. By Michael Terry on 2015-03-10

Merge from unifyShellTests

1639. By Michael Terry on 2015-03-11

Add some comments on why we cache the 'active' bool instead of using an alias

Unmerged revisions

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-02-23 15:43:41 +0000
+++ qml/Greeter/Greeter.qml	2015-03-03 14:57:58 +0000
@@ -19,7 +19,6 @@
 import LightDM 0.1 as LightDM
 import Ubuntu.Components 1.1
 import Ubuntu.SystemImage 0.1
-import Unity.Connectivity 0.1
 import Unity.Launcher 0.1
 import "../Components"
 
@@ -179,10 +178,6 @@
         }
     }
 
-    Component.onCompleted: {
-        Connectivity.unlockAllModems();
-    }
-
     Timer {
         id: forcedDelayTimer
         interval: 1000 * 60

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-02-23 15:43:41 +0000
+++ qml/Shell.qml	2015-03-03 14:57:58 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Gestures 0.1
 import Ubuntu.Telephony 0.1 as Telephony
+import Unity.Connectivity 0.1
 import Unity.Launcher 0.1
 import Utils 0.1
 import LightDM 0.1 as LightDM
@@ -535,8 +536,18 @@
 
         Wizard {
             id: wizard
+            objectName: "wizard"
             anchors.fill: parent
             background: shell.background
+
+            function unlockWhenDoneWithWizard() {
+                if (!active) {
+                    Connectivity.unlockAllModems();
+                }
+            }
+
+            Component.onCompleted: unlockWhenDoneWithWizard()
+            onActiveChanged: unlockWhenDoneWithWizard()
         }
 
         Rectangle {

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2014-11-24 17:56:44 +0000
+++ qml/Wizard/Wizard.qml	2015-03-03 14:57:58 +0000
@@ -25,7 +25,7 @@
     // The background wallpaper to use
     property string background
 
-    readonly property alias active: loader.active
+    readonly property bool active: loader.active
 
     hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
 

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-02-18 13:33:49 +0000
+++ tests/qmltests/CMakeLists.txt	2015-03-03 14:57:58 +0000
@@ -20,7 +20,6 @@
 
 add_qml_test(. Shell)
 add_qml_test(. ShellWithPin)
-add_qml_test(. TabletShell)
 add_qml_test(Components Background)
 add_qml_test(Components Carousel)
 add_qml_test(Components Dialogs)

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-02-23 15:43:41 +0000
+++ tests/qmltests/tst_Shell.qml	2015-03-03 14:57:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * Authors:
  *   Daniel d'Andrada <[e-mail]>
@@ -31,12 +31,14 @@
 import Unity.Notifications 1.0
 import Unity.Test 0.1 as UT
 import Powerd 0.1
+import Wizard 0.1 as Wizard
 
 import "../../qml"
 
-Item {
+Rectangle {
     id: root
-    width: units.gu(60)
+    color: "grey"
+    width: units.gu(100) + controls.width
     height: units.gu(71)
 
     Component.onCompleted: {
@@ -62,12 +64,37 @@
         }
     }
 
-    Row {
-        anchors.fill: parent
+    Item {
+        anchors.left: root.left
+        anchors.right: controls.left
+        anchors.top: root.top
+        anchors.bottom: root.bottom
         Loader {
             id: shellLoader
             focus: true
 
+            anchors.centerIn: parent
+
+            state: "phone"
+            states: [
+                State {
+                    name: "phone"
+                    PropertyChanges {
+                        target: shellLoader
+                        width: units.gu(40)
+                        height: units.gu(71)
+                    }
+                },
+                State {
+                    name: "tablet"
+                    PropertyChanges {
+                        target: shellLoader
+                        width: units.gu(100)
+                        height: units.gu(71)
+                    }
+                }
+            ]
+
             active: false
             property bool itemDestroyed: false
             sourceComponent: Component {
@@ -80,42 +107,56 @@
                 }
             }
         }
-
-        Rectangle {
-            color: "darkgrey"
-            width: units.gu(30)
-            height: shellLoader.height
-
-            Column {
-                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
-                spacing: units.gu(1)
-                Row {
-                    anchors { left: parent.left; right: parent.right }
-                    Button {
-                        text: "Show Greeter"
-                        activeFocusOnPress: false
-                        onClicked: {
-                            if (shellLoader.status !== Loader.Ready)
-                                return;
-
-                            var greeter = testCase.findChild(shellLoader.item, "greeter");
-                            if (!greeter.shown) {
-                                LightDM.Greeter.showGreeter();
-                            }
+    }
+
+    Rectangle {
+        id: controls
+        color: "darkgrey"
+        width: units.gu(30)
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        anchors.right: root.right
+
+        Column {
+            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+            spacing: units.gu(1)
+            Row {
+                anchors { left: parent.left; right: parent.right }
+                Button {
+                    text: "Show Greeter"
+                    activeFocusOnPress: false
+                    onClicked: {
+                        if (shellLoader.status !== Loader.Ready)
+                            return;
+
+                        var greeter = testCase.findChild(shellLoader.item, "greeter");
+                        if (!greeter.shown) {
+                            LightDM.Greeter.showGreeter();
                         }
                     }
                 }
-                ListItem.ItemSelector {
-                    anchors { left: parent.left; right: parent.right }
-                    activeFocusOnPress: false
-                    text: "LightDM mock mode"
-                    model: ["single", "single-passphrase", "single-pin"]
-                    onSelectedIndexChanged: {
-                        shellLoader.active = false;
-                        LightDM.Greeter.mockMode = model[selectedIndex];
-                        LightDM.Users.mockMode = model[selectedIndex];
-                        shellLoader.active = true;
-                    }
+            }
+            ListItem.ItemSelector {
+                anchors { left: parent.left; right: parent.right }
+                activeFocusOnPress: false
+                text: "LightDM mock mode"
+                model: ["single", "single-passphrase", "single-pin", "full"]
+                onSelectedIndexChanged: {
+                    shellLoader.active = false;
+                    LightDM.Greeter.mockMode = model[selectedIndex];
+                    LightDM.Users.mockMode = model[selectedIndex];
+                    shellLoader.active = true;
+                }
+            }
+            ListItem.ItemSelector {
+                anchors { left: parent.left; right: parent.right }
+                activeFocusOnPress: false
+                text: "Size"
+                model: ["phone", "tablet"]
+                onSelectedIndexChanged: {
+                    shellLoader.active = false;
+                    shellLoader.state = model[selectedIndex];
+                    shellLoader.active = true;
                 }
             }
         }
@@ -186,20 +227,49 @@
         property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
 
         function init() {
+            if (shellLoader.active) {
+                // happens for the very first test function as shell
+                // is loaded by default
+                tearDown();
+            }
+
+        }
+
+        function cleanup() {
+            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
+            tearDown();
+        }
+
+        function loadShell(formFactor) {
+            shellLoader.state = formFactor;
+            shellLoader.active = true;
+            tryCompare(shellLoader, "status", Loader.Ready);
+            removeTimeConstraintsFromDirectionalDragAreas(shellLoader.item);
             tryCompare(shell, "enabled", true); // enabled by greeter when ready
-            shell.indicatorProfile = "phone";
-
-            swipeAwayGreeter();
 
             sessionSpy.target = findChild(shell, "greeter")
             dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator");
 
             var launcher = findChild(shell, "launcher");
             launcherShowDashHomeSpy.target = launcher;
-        }
-
-        function cleanup() {
-            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
+
+            waitForGreeterToStabilize();
+        }
+
+        function waitForGreeterToStabilize() {
+            var greeter = findChild(shell, "greeter");
+            verify(greeter);
+
+            var loginList = findChild(greeter, "loginList");
+            // Only present in WideView
+            if (loginList) {
+                var userList = findChild(loginList, "userList");
+                verify(userList);
+                tryCompare(userList, "movingInternally", false);
+            }
+        }
+
+        function tearDown() {
             launcherShowDashHomeSpy.target = null;
 
             shellLoader.itemDestroyed = false;
@@ -216,17 +286,18 @@
             // Shell instance gets destroyed.
             tryCompare(shellLoader, "itemDestroyed", true);
 
+            setLightDMMockMode("single"); // back to the default value
+
+            AccountsService.demoEdges = false;
+            Wizard.System.wizardEnabled = false;
+
             // kill all (fake) running apps
             killApps(ApplicationManager);
 
             unlockAllModemsSpy.clear()
             LightDM.Greeter.authenticate(""); // reset greeter
 
-            // reload our test subject to get it in a fresh state once again
-            shellLoader.active = true;
-
-            tryCompare(shellLoader, "status", Loader.Ready);
-            removeTimeConstraintsFromDirectionalDragAreas(shellLoader.item);
+            sessionSpy.clear();
         }
 
         function killApps() {
@@ -238,6 +309,8 @@
         }
 
         function test_snapDecisionDismissalReturnsFocus() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var notifications = findChild(shell, "notificationList");
             var app = ApplicationManager.startApplication("camera-app");
             var stage = findChild(shell, "stage")
@@ -296,19 +369,41 @@
             mockNotificationsModel.append(n)
         }
 
-        function test_leftEdgeDrag_data() {
+        function test_phoneLeftEdgeDrag_data() {
             return [
-                {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
-                {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
-                {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false, greeterShown: false},
-                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
-                {tag: "small swipe with greeter", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false, greeterShown: true},
-                {tag: "long swipe with greeter", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: true},
-                {tag: "swipe over dash", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash", launcherHides: false, greeterShown: false},
+                {tag: "without launcher",
+                 revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app",
+                 launcherHides: true, greeterShown: false},
+
+                {tag: "with launcher",
+                 revealLauncher: true, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app",
+                 launcherHides: true, greeterShown: false},
+
+                {tag: "small swipe",
+                 revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app",
+                 launcherHides: false, greeterShown: false},
+
+                {tag: "long swipe",
+                 revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app",
+                 launcherHides: true, greeterShown: false},
+
+                {tag: "small swipe with greeter",
+                 revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app",
+                 launcherHides: false, greeterShown: true},
+
+                {tag: "long swipe with greeter",
+                 revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app",
+                 launcherHides: true, greeterShown: true},
+
+                {tag: "swipe over dash",
+                 revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash",
+                 launcherHides: false, greeterShown: false},
             ];
         }
 
-        function test_leftEdgeDrag(data) {
+        function test_phoneLeftEdgeDrag(data) {
+            loadShell("phone");
+            swipeAwayGreeter();
             dragLauncherIntoView();
             tapOnAppIconInLauncher();
             waitUntilApplicationWindowIsFullyVisible();
@@ -317,8 +412,7 @@
 
             var greeter = findChild(shell, "greeter");
             if (data.greeterShown) {
-                LightDM.Greeter.showGreeter();
-                tryCompare(greeter, "fullyShown", true);
+                showGreeter();
             }
 
             if (data.revealLauncher) {
@@ -342,7 +436,32 @@
             compare(animateTimer.nextState, "visible");
         }
 
+        function test_tabletLeftEdgeDrag_data() {
+            return [
+                {tag: "without password", user: "no-password", loggedIn: true, demo: false},
+                {tag: "with password", user: "has-password", loggedIn: false, demo: false},
+                {tag: "with demo", user: "has-password", loggedIn: true, demo: true},
+            ]
+        }
+
+        function test_tabletLeftEdgeDrag(data) {
+            setLightDMMockMode("full");
+            loadShell("tablet");
+
+            selectUser(data.user)
+
+            AccountsService.demoEdges = data.demo
+            var tutorial = findChild(shell, "tutorial");
+            tryCompare(tutorial, "running", data.demo);
+
+            swipeFromLeftEdge(shell.width * 0.75)
+            wait(500) // to give time to handle dash() signal from Launcher
+            confirmLoggedIn(data.loggedIn)
+        }
+
         function test_suspend() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var greeter = findChild(shell, "greeter");
 
             // Launch an app from the launcher
@@ -375,7 +494,15 @@
             tryCompare(greeter, "fullyShown", true);
 
             // Swipe away greeter to focus app
+
+            // greeter unloads its internal components when hidden
+            // and reloads them when shown. Thus we have to do this
+            // again before interacting with it otherwise any
+            // DirectionalDragAreas in there won't be easily fooled by
+            // fake swipes.
+            removeTimeConstraintsFromDirectionalDragAreas(greeter);
             swipeAwayGreeter();
+
             tryCompare(ApplicationManager, "suspended", false);
             compare(mainApp.state, ApplicationInfoInterface.Running);
             tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
@@ -394,6 +521,60 @@
             waitForRendering(greeter);
         }
 
+        function selectUserAtIndex(i) {
+            // We could be anywhere in list; find target index to know which direction
+            var greeter = findChild(shell, "greeter")
+            var userlist = findChild(greeter, "userList")
+            if (userlist.currentIndex == i)
+                keyClick(Qt.Key_Escape) // Reset state if we're not moving
+            while (userlist.currentIndex != i) {
+                var next = userlist.currentIndex + 1
+                if (userlist.currentIndex > i) {
+                    next = userlist.currentIndex - 1
+                }
+                tap(findChild(greeter, "username"+next));
+                tryCompare(userlist, "currentIndex", next)
+                tryCompare(userlist, "movingInternally", false)
+            }
+        }
+
+        function selectUser(name) {
+            // Find index of user with the right name
+            for (var i = 0; i < LightDM.Users.count; i++) {
+                if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == name) {
+                    break
+                }
+            }
+            if (i == LightDM.Users.count) {
+                fail("Didn't find name")
+                return -1
+            }
+            selectUserAtIndex(i)
+            return i
+        }
+
+        function clickPasswordInput(isButton) {
+            var greeter = findChild(shell, "greeter")
+            tryCompare(greeter, "fullyShown", true);
+
+            var passwordMouseArea = findChild(shell, "passwordMouseArea")
+            tryCompare(passwordMouseArea, "enabled", isButton)
+
+            var passwordInput = findChild(shell, "passwordInput")
+            mouseClick(passwordInput)
+        }
+
+        function confirmLoggedIn(loggedIn) {
+            var greeter = findChild(shell, "greeter");
+            tryCompare(greeter, "shown", loggedIn ? false : true);
+            verify(loggedIn ? sessionSpy.count > 0 : sessionSpy.count === 0);
+        }
+
+        function setLightDMMockMode(mode) {
+            LightDM.Greeter.mockMode = mode;
+            LightDM.Users.mockMode = mode;
+        }
+
         /*
           Regression test for bug https://bugs.launchpad.net/touch-preview-images/+bug/1193419
 
@@ -406,6 +587,8 @@
           - verify the setCurrentScope() D-Bus call to the dash has been called for the correct scope id.
          */
         function test_minimizingAppTakesToDashApps() {
+            loadShell("phone");
+            swipeAwayGreeter();
             dragLauncherIntoView();
 
             // Launch an app from the launcher
@@ -426,6 +609,8 @@
         }
 
         function test_showInputMethod() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var item = findChild(shell, "inputMethod");
             var surface = SurfaceManager.inputMethodSurface();
 
@@ -464,6 +649,8 @@
         }
 
         function test_surfaceLosesActiveFocusWhilePanelIsOpen() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var app = ApplicationManager.startApplication("dialer-app");
             waitUntilAppWindowIsFullyLoaded(app);
 
@@ -494,28 +681,26 @@
             tryCompare(app.session.surface, "activeFocus", true);
         }
 
-        function test_launchedAppHasActiveFocus() {
-            var dialerApp = ApplicationManager.startApplication("dialer-app");
+        function test_launchedAppHasActiveFocus_data() {
+            return [
+                {tag:"phone", formFactor:"phone"},
+                {tag:"tablet", formFactor:"tablet"},
+            ];
+        }
+
+        function test_launchedAppHasActiveFocus(data) {
+            loadShell(data.formFactor);
+            swipeAwayGreeter();
+
+            var dialerApp = ApplicationManager.startApplication("webbrowser-app");
             verify(dialerApp);
-            waitUntilAppSurfaceShowsUp("dialer-app")
+            waitUntilAppSurfaceShowsUp("webbrowser-app")
 
             verify(dialerApp.session.surface);
 
             tryCompare(dialerApp.session.surface, "activeFocus", true);
         }
 
-        // Wait for the whole UI to settle down
-        function waitForUIToSettle() {
-            var launcher = findChild(shell, "launcherPanel")
-            tryCompareFunction(function() {return launcher.x === 0 || launcher.x === -launcher.width;}, true);
-            if (launcher.x === 0) {
-                mouseClick(shell)
-            }
-            tryCompare(launcher, "x", -launcher.width)
-
-            waitForRendering(shell)
-        }
-
         function waitUntilAppSurfaceShowsUp(appId) {
             var appWindow = findChild(shell, "appWindow_" + appId);
             verify(appWindow);
@@ -593,11 +778,27 @@
                 && itemRectInShell.y + itemRectInShell.height <= shell.height;
         }
 
+        function showGreeter() {
+            var greeter = findChild(shell, "greeter");
+            LightDM.Greeter.showGreeter();
+            waitForRendering(greeter);
+            tryCompare(greeter, "fullyShown", true);
+
+            // greeter unloads its internal components when hidden
+            // and reloads them when shown. Thus we have to do this
+            // again before interacting with it otherwise any
+            // DirectionalDragAreas in there won't be easily fooled by
+            // fake swipes.
+            removeTimeConstraintsFromDirectionalDragAreas(greeter);
+        }
+
         function test_greeterDoesNotChangeIndicatorProfile() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var panel = findChild(shell, "panel");
             tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
 
-            LightDM.Greeter.showGreeter();
+            showGreeter();
             tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
 
             LightDM.Greeter.hideGreeter();
@@ -605,6 +806,8 @@
         }
 
         function test_shellProfileChangesReachIndicators() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var panel = findChild(shell, "panel");
 
             shell.indicatorProfile = "test1";
@@ -621,6 +824,8 @@
         }
 
         function test_focusRequestedHidesGreeter() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var greeter = findChild(shell, "greeter");
 
             var app = ApplicationManager.startApplication("dialer-app");
@@ -632,8 +837,7 @@
 
             waitUntilDashIsFocused();
 
-            LightDM.Greeter.showGreeter();
-            tryCompare(greeter, "fullyShown", true);
+            showGreeter();
 
             // The main point of this test
             ApplicationManager.requestFocusApplication("dialer-app");
@@ -642,6 +846,8 @@
         }
 
         function test_focusRequestedHidesIndicators() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var indicators = findChild(shell, "indicators");
 
             showIndicators();
@@ -654,6 +860,8 @@
         }
 
         function test_showAndHideGreeterDBusCalls() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var greeter = findChild(shell, "greeter")
             tryCompare(greeter, "shown", false)
             waitForRendering(greeter);
@@ -664,18 +872,21 @@
             tryCompare(greeter, "shown", false)
         }
 
-        function test_login() {
-            var greeter = findChild(shell, "greeter")
-            waitForRendering(greeter)
-            LightDM.Greeter.showGreeter();
-            tryCompare(greeter, "fullyShown", true)
+        function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {
+            loadShell("phone");
+            swipeAwayGreeter();
 
             sessionSpy.clear();
-            swipeAwayGreeter()
-            tryCompare(sessionSpy, "count", 1)
+            verify(sessionSpy.valid);
+
+            showGreeter();
+
+            tryCompare(sessionSpy, "count", 1);
         }
 
         function test_fullscreen() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var panel = findChild(shell, "panel");
             compare(panel.fullscreenMode, false);
             ApplicationManager.startApplication("camera-app");
@@ -689,6 +900,8 @@
         }
 
         function test_leftEdgeDragFullscreen() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var panel = findChild(shell, "panel");
             tryCompare(panel, "fullscreenMode", false)
 
@@ -710,6 +923,8 @@
         }
 
         function test_unlockedProperties() {
+            loadShell("phone");
+            swipeAwayGreeter();
             // Confirm that various properties have the correct values when unlocked
             var greeter = findChild(shell, "greeter");
             tryCompare(greeter, "locked", false);
@@ -722,10 +937,29 @@
         }
 
         function test_unlockAllModemsOnBoot() {
+            loadShell("phone");
+            swipeAwayGreeter();
             tryCompare(unlockAllModemsSpy, "count", 1)
         }
 
+        function test_unlockAllModemsAfterWizard() {
+            Wizard.System.wizardEnabled = true;
+            loadShell("phone");
+
+            var wizard = findChild(shell, "wizard");
+            compare(wizard.active, true);
+            compare(Wizard.System.wizardEnabled, true);
+            compare(unlockAllModemsSpy.count, 0);
+
+            wizard.hide();
+            tryCompare(wizard, "active", false);
+            compare(Wizard.System.wizardEnabled, false);
+            compare(unlockAllModemsSpy.count, 1);
+        }
+
         function test_tapOnRightEdgeReachesApplicationSurface() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var topmostSpreadDelegate = findChild(shell, "appDelegate0");
             var topmostSurface = findChild(topmostSpreadDelegate, "surfaceContainer").surface;
             var rightEdgeDragArea = findChild(shell, "spreadDragArea");
@@ -748,6 +982,8 @@
             by the right-edge drag area)
          */
         function test_rightEdgeDragDoesNotReachApplicationSurface() {
+            loadShell("phone");
+            swipeAwayGreeter();
             var topmostSpreadDelegate = findChild(shell, "appDelegate0");
             var topmostSurface = findChild(topmostSpreadDelegate, "surfaceContainer").surface;
             var rightEdgeDragArea = findChild(shell, "spreadDragArea");
@@ -792,6 +1028,8 @@
         }
 
         function test_tapUbuntuIconInLauncherOverAppSpread() {
+            loadShell("phone");
+            swipeAwayGreeter();
 
             waitUntilFocusedApplicationIsShowingItsSurface();
 
@@ -838,19 +1076,75 @@
         function test_background_data() {
             return [
                 {tag: "color", accounts: Qt.resolvedUrl("data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>"), gsettings: "", output: Qt.resolvedUrl("data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>")},
-                {tag: "empty", accounts: "", gsettings: "", output: shell.defaultBackground},
+                {tag: "empty", accounts: "", gsettings: "", output: "defaultBackground"},
                 {tag: "as-specified", accounts: Qt.resolvedUrl("../data/unity/backgrounds/blue.png"), gsettings: "", output: Qt.resolvedUrl("../data/unity/backgrounds/blue.png")},
                 {tag: "gs-specified", accounts: "", gsettings: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), output: Qt.resolvedUrl("../data/unity/backgrounds/red.png")},
                 {tag: "both-specified", accounts: Qt.resolvedUrl("../data/unity/backgrounds/blue.png"), gsettings: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), output: Qt.resolvedUrl("../data/unity/backgrounds/blue.png")},
                 {tag: "invalid-as", accounts: Qt.resolvedUrl("../data/unity/backgrounds/nope.png"), gsettings: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), output: Qt.resolvedUrl("../data/unity/backgrounds/red.png")},
-                {tag: "invalid-both", accounts: Qt.resolvedUrl("../data/unity/backgrounds/nope.png"), gsettings: Qt.resolvedUrl("../data/unity/backgrounds/stillnope.png"), output: shell.defaultBackground},
+                {tag: "invalid-both", accounts: Qt.resolvedUrl("../data/unity/backgrounds/nope.png"), gsettings: Qt.resolvedUrl("../data/unity/backgrounds/stillnope.png"), output: "defaultBackground"},
             ]
         }
         function test_background(data) {
+            loadShell("phone");
+            swipeAwayGreeter();
             AccountsService.backgroundFile = data.accounts;
             var backgroundSettings = findInvisibleChild(shell, "backgroundSettings");
             backgroundSettings.pictureUri = data.gsettings;
-            tryCompare(shell, "background", data.output);
+
+            if (data.output === "defaultBackground") {
+                tryCompare(shell, "background", shell.defaultBackground);
+            } else {
+                tryCompare(shell, "background", data.output);
+            }
+        }
+
+        function test_tabletLogin_data() {
+            return [
+                {tag: "auth error", user: "auth-error", loggedIn: false, password: ""},
+                {tag: "with password", user: "has-password", loggedIn: true, password: "password"},
+                {tag: "without password", user: "no-password", loggedIn: true, password: ""},
+            ]
+        }
+
+        function test_tabletLogin(data) {
+            setLightDMMockMode("full");
+            loadShell("tablet");
+
+            selectUser(data.user);
+
+            clickPasswordInput(data.password === "" /* isButton */);
+
+            if (data.password !== "") {
+                typeString(data.password);
+                keyClick(Qt.Key_Enter);
+            }
+
+            confirmLoggedIn(data.loggedIn);
+        }
+
+        function test_appLaunchDuringGreeter_data() {
+            return [
+                {tag: "auth error", user: "auth-error", loggedIn: false, passwordFocus: false},
+                {tag: "without password", user: "no-password", loggedIn: true, passwordFocus: false},
+                {tag: "with password", user: "has-password", loggedIn: false, passwordFocus: true},
+            ]
+        }
+
+        function test_appLaunchDuringGreeter(data) {
+            setLightDMMockMode("full");
+            loadShell("tablet");
+
+            selectUser(data.user)
+
+            var greeter = findChild(shell, "greeter")
+            var app = ApplicationManager.startApplication("dialer-app")
+
+            confirmLoggedIn(data.loggedIn)
+
+            if (data.passwordFocus) {
+                var passwordInput = findChild(greeter, "passwordInput")
+                tryCompare(passwordInput, "focus", true)
+            }
         }
     }
 }

=== removed file 'tests/qmltests/tst_TabletShell.qml'
--- tests/qmltests/tst_TabletShell.qml	2015-02-09 15:24:48 +0000
+++ tests/qmltests/tst_TabletShell.qml	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2013,2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import QtTest 1.0
-import AccountsService 0.1
-import GSettings 1.0
-import LightDM 0.1 as LightDM
-import Ubuntu.Components 1.1
-import Ubuntu.Telephony 0.1 as Telephony
-import Unity.Application 0.1
-import Unity.Connectivity 0.1
-import Unity.Test 0.1 as UT
-import Powerd 0.1
-
-import "../../qml"
-
-Item {
-    id: root
-    width: units.gu(120)
-    height: units.gu(80)
-
-    Component.onCompleted: {
-        // must set the mock mode before loading the Shell
-        LightDM.Greeter.mockMode = "full";
-        LightDM.Users.mockMode = "full";
-        shellLoader.active = true;
-    }
-
-    QtObject {
-        id: applicationArguments
-
-        function hasGeometry() {
-            return false
-        }
-
-        function width() {
-            return 0
-        }
-
-        function height() {
-            return 0
-        }
-    }
-
-    Row {
-        anchors.fill: parent
-        Loader {
-            id: shellLoader
-
-            active: false
-            width: units.gu(100)
-            height: parent.height
-
-            property bool itemDestroyed: false
-            sourceComponent: Component {
-                Shell {
-                    property string indicatorProfile: "phone"
-
-                    Component.onDestruction: {
-                        shellLoader.itemDestroyed = true
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            color: "white"
-            width: units.gu(20)
-            height: parent.height
-
-            Column {
-                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
-                spacing: units.gu(1)
-                Button {
-                    text: "Show Greeter"
-                    onClicked: {
-                        if (shellLoader.status !== Loader.Ready)
-                            return
-
-                        var greeter = testCase.findChild(shellLoader.item, "greeter")
-                        if (!greeter.shown) {
-                            greeter.show()
-                        }
-                    }
-                }
-                Button {
-                    text: "Demo edges"
-                    onClicked: {
-                        AccountsService.demoEdges = true;
-                    }
-                }
-            }
-        }
-    }
-
-    SignalSpy {
-        id: sessionSpy
-        signalName: "sessionStarted"
-    }
-
-    SignalSpy {
-        id: dashCommunicatorSpy
-        signalName: "setCurrentScopeCalled"
-    }
-
-    SignalSpy {
-        id: unlockAllModemsSpy
-        target: Connectivity
-        signalName: "unlockingAllModems"
-    }
-
-    Telephony.CallEntry {
-        id: phoneCall
-        phoneNumber: "[phone]"
-    }
-
-    UT.UnityTestCase {
-        id: testCase
-        name: "TabletShell"
-        when: windowShown
-
-        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
-
-        function init() {
-            tryCompare(shell, "enabled", true); // will be enabled when greeter is all ready
-            var userList = findChild(shell, "userList");
-            tryCompare(userList, "movingInternally", false);
-            sessionSpy.clear()
-            sessionSpy.target = findChild(shell, "greeter")
-            dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator")
-        }
-
-        function cleanup() {
-            tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
-
-            shellLoader.itemDestroyed = false
-
-            shellLoader.active = false
-
-            tryCompare(shellLoader, "status", Loader.Null)
-            tryCompare(shellLoader, "item", null)
-            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
-            // item might still be alive. So if we set Loader.active back to true
-            // again right now we will get the very same Shell instance back. So no reload
-            // actually took place. Likely because Loader waits until the next event loop
-            // iteration to do its work. So to ensure the reload, we will wait until the
-            // Shell instance gets destroyed.
-            tryCompare(shellLoader, "itemDestroyed", true)
-
-            // kill all (fake) running apps
-            killApps()
-
-            unlockAllModemsSpy.clear()
-            AccountsService.demoEdges = false
-            LightDM.Greeter.authenticate(""); // reset greeter
-
-            // reload our test subject to get it in a fresh state once again
-            shellLoader.active = true
-
-            tryCompare(shellLoader, "status", Loader.Ready)
-            removeTimeConstraintsFromDirectionalDragAreas(shellLoader.item)
-        }
-
-        function killApps() {
-            while (ApplicationManager.count > 1) {
-                var appIndex = ApplicationManager.get(0).appId == "unity8-dash" ? 1 : 0
-                ApplicationManager.stopApplication(ApplicationManager.get(appIndex).appId)
-            }
-            compare(ApplicationManager.count, 1)
-        }
-
-        function selectIndex(i) {
-            // We could be anywhere in list; find target index to know which direction
-            var greeter = findChild(shell, "greeter")
-            var userlist = findChild(greeter, "userList")
-            if (userlist.currentIndex == i)
-                keyClick(Qt.Key_Escape) // Reset state if we're not moving
-            while (userlist.currentIndex != i) {
-                var next = userlist.currentIndex + 1
-                if (userlist.currentIndex > i) {
-                    next = userlist.currentIndex - 1
-                }
-                tap(findChild(greeter, "username"+next));
-                tryCompare(userlist, "currentIndex", next)
-                tryCompare(userlist, "movingInternally", false)
-            }
-        }
-
-        function selectUser(name) {
-            // Find index of user with the right name
-            for (var i = 0; i < LightDM.Users.count; i++) {
-                if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == name) {
-                    break
-                }
-            }
-            if (i == LightDM.Users.count) {
-                fail("Didn't find name")
-                return -1
-            }
-            selectIndex(i)
-            return i
-        }
-
-        function clickPasswordInput(isButton) {
-            var greeter = findChild(shell, "greeter")
-            tryCompare(greeter, "fullyShown", true);
-
-            var passwordMouseArea = findChild(shell, "passwordMouseArea")
-            tryCompare(passwordMouseArea, "enabled", isButton)
-
-            var passwordInput = findChild(shell, "passwordInput")
-            mouseClick(passwordInput)
-        }
-
-        function confirmLoggedIn(loggedIn) {
-            var greeter = findChild(shell, "greeter");
-            tryCompare(greeter, "shown", loggedIn ? false : true);
-            verify(loggedIn ? sessionSpy.count > 0 : sessionSpy.count === 0);
-        }
-
-        function swipeFromLeftEdge(swipeLength) {
-            var touchStartX = 2
-            var touchStartY = shell.height / 2
-            touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY)
-        }
-
-        function test_login_data() {
-            return [
-                {tag: "auth error", user: "auth-error", loggedIn: false, password: ""},
-                {tag: "with password", user: "has-password", loggedIn: true, password: "password"},
-                {tag: "without password", user: "no-password", loggedIn: true, password: ""},
-            ]
-        }
-
-        function test_login(data) {
-            selectUser(data.user)
-
-            clickPasswordInput(data.password === "")
-
-            if (data.password !== "") {
-                typeString(data.password)
-                keyClick(Qt.Key_Enter)
-            }
-
-            confirmLoggedIn(data.loggedIn)
-        }
-
-        function test_appLaunchDuringGreeter_data() {
-            return [
-                {tag: "auth error", user: "auth-error", loggedIn: false, passwordFocus: false},
-                {tag: "without password", user: "no-password", loggedIn: true, passwordFocus: false},
-                {tag: "with password", user: "has-password", loggedIn: false, passwordFocus: true},
-            ]
-        }
-
-        function test_appLaunchDuringGreeter(data) {
-            selectUser(data.user)
-
-            var greeter = findChild(shell, "greeter")
-            var app = ApplicationManager.startApplication("dialer-app")
-
-            confirmLoggedIn(data.loggedIn)
-
-            if (data.passwordFocus) {
-                var passwordInput = findChild(greeter, "passwordInput")
-                tryCompare(passwordInput, "focus", true)
-            }
-        }
-
-        function test_leftEdgeDrag_data() {
-            return [
-                {tag: "without password", user: "no-password", loggedIn: true, demo: false},
-                {tag: "with password", user: "has-password", loggedIn: false, demo: false},
-                {tag: "with demo", user: "has-password", loggedIn: true, demo: true},
-            ]
-        }
-
-        function test_leftEdgeDrag(data) {
-            selectUser(data.user)
-
-            AccountsService.demoEdges = data.demo
-            var tutorial = findChild(shell, "tutorial");
-            tryCompare(tutorial, "running", data.demo);
-
-            swipeFromLeftEdge(shell.width * 0.75)
-            wait(500) // to give time to handle dash() signal from Launcher
-            confirmLoggedIn(data.loggedIn)
-        }
-    }
-}