Merge lp:~mterry/unity8/wizard-dash-reset into lp:unity8

[Michael Terry]

Don't close wizard & edge tutorial when the unity8-dash closes

As happens when the user switches languages in the wizard! (LP: #1425484)

Don't close wizard & edge tutorial when the unity8-dash closes (as happens when the user switches languages in the wizard!) (LP: #1425484)

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Yes, the prerequisite https://code.launchpad.net/~mterry/unity8/unlock-sim-after-wizard/+merge/251005

 * 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:1637
http://jenkins.qa.ubuntu.com/job/unity8-ci/5365/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/529
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/530
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18392

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

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

* Did CI run pass? If not, please explain why.
No. Failing autopilot test seems unrelated.

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

review: Approve

[Michał Sawicz (saviq)]

Text conflict in tests/qmltests/tst_Shell.qml
1 conflicts encountered.

Please remerge with prerequisite.

[lp:~mterry/unity8/wizard-dash-reset]

1638. By Michael Terry on 2015-03-10

Merge from prereq

[Michael Terry (mterry)]

> Please remerge with prerequisite.

Done.

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-03-10 14:25:31 +0000
+++ qml/Shell.qml	2015-03-10 14:25:31 +0000
@@ -192,7 +192,7 @@
             onFocusedApplicationIdChanged: {
                 var appId = ApplicationManager.focusedApplicationId;
 
-                if (tutorial.running && appId != "unity8-dash") {
+                if (tutorial.running && appId != "" && appId != "unity8-dash") {
                     // If this happens on first boot, we may be in edge
                     // tutorial or wizard while receiving a call.  But a call
                     // is more important than wizard so just bail out of those.

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-02-20 19:37:30 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2015-03-10 14:25:31 +0000
@@ -241,10 +241,6 @@
 
 bool ApplicationManager::stopApplication(const QString &appId)
 {
-    if (appId == "unity8-dash") {
-        return false;
-    }
-
     ApplicationInfo *application = findApplication(appId);
     if (application == nullptr)
         return false;

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-03-10 14:25:31 +0000
+++ tests/qmltests/tst_Shell.qml	2015-03-10 14:25:31 +0000
@@ -957,6 +957,37 @@
             compare(unlockAllModemsSpy.count, 1);
         }
 
+        function test_wizardEarlyExit() {
+            Wizard.System.wizardEnabled = true;
+            AccountsService.demoEdges = true;
+            loadShell("phone");
+
+            var wizard = findChild(shell, "wizard");
+            var tutorial = findChild(shell, "tutorial");
+            tryCompare(wizard, "active", true);
+            tryCompare(tutorial, "running", true);
+            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+
+            // Make sure we stay running when nothing focused (can happen for
+            // a moment when we restart the dash after switching language)
+            ApplicationManager.stopApplication("unity8-dash");
+            tryCompare(ApplicationManager, "focusedApplicationId", "");
+            compare(wizard.shown, true);
+            compare(tutorial.running, true);
+
+            // And make sure we stay running when dash focused again
+            ApplicationManager.startApplication("unity8-dash");
+            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+            compare(wizard.shown, true);
+            compare(tutorial.running, true);
+
+            // And make sure we stop when something else is focused
+            ApplicationManager.startApplication("gallery-app");
+            tryCompare(ApplicationManager, "focusedApplicationId", "gallery-app");
+            compare(wizard.shown, false);
+            compare(tutorial.running, false);
+        }
+
         function test_tapOnRightEdgeReachesApplicationSurface() {
             loadShell("phone");
             swipeAwayGreeter();