Merge lp:~mterry/unity8/fix-emulator-tutorial into lp:unity8

[Michael Terry]

Skip the tutorial entirely when in desktop mode. This fixes the emulator not being able to pass the tutorial.

Previously, only part of the tutorial was reliant on DDAs, but now even the launcher needs it. Since the emulator has a separate bug preventing drags from working and comes up as desktop mode, this will skip the tutorial on the emulator.

When the emulator fixes its drags and can be shown in phone mode again, presumably the tutorial will work correctly again in that case.

Skip the tutorial entirely when in desktop mode. This fixes the emulator not being able to pass the tutorial.

Previously, only part of the tutorial was reliant on DDAs, but now even the launcher needs it. Since the emulator has a separate bug preventing drags from working and comes up as desktop mode, this will skip the tutorial on the emulator.

When the emulator fixes its drags and can be shown in phone mode again, presumably the tutorial will work correctly again in that case.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1928
http://jenkins.qa.ubuntu.com/job/unity8-ci/6230/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/580/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/260/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/469/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/470/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/580/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/fix-emulator-tutorial]

1929. By Michael Terry on 2015-08-20

Fix test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1929
http://jenkins.qa.ubuntu.com/job/unity8-ci/6231/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/581/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/261/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/470/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/471/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/581/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

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

 * Did CI run pass?
it's on holiday

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

review: Approve

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-08-03 13:47:44 +0000
+++ qml/Shell.qml	2015-08-20 15:38:59 +0000
@@ -367,20 +367,19 @@
             id: tutorial
             objectName: "tutorial"
             anchors.fill: parent
-            active: AccountsService.demoEdges
-            paused: LightDM.Greeter.active
-            launcher: launcher
-            panel: panel
-            edgeSize: shell.edgeSize
 
             // EdgeDragAreas don't work with mice.  So to avoid trapping the user,
-            // we'll tell the tutorial to avoid using them on the Desktop.  The
+            // we skip the tutorial on the Desktop to avoid using them.  The
             // Desktop doesn't use the same spread design anyway.  The tutorial is
             // all a bit of a placeholder on non-phone form factors right now.
             // When the design team gives us more guidance, we can do something
             // more clever here.
-            // TODO: use DeviceConfiguration instead of checking source
-            useEdgeDragArea: applicationsDisplayLoader.source != Qt.resolvedUrl("Stages/DesktopStage.qml")
+            active: usageScenario != "desktop" && AccountsService.demoEdges
+
+            paused: LightDM.Greeter.active
+            launcher: launcher
+            panel: panel
+            edgeSize: shell.edgeSize
 
             onFinished: {
                 AccountsService.demoEdges = false;

=== modified file 'qml/Tutorial/Tutorial.qml'
--- qml/Tutorial/Tutorial.qml	2015-04-03 14:23:02 +0000
+++ qml/Tutorial/Tutorial.qml	2015-08-20 15:38:59 +0000
@@ -23,7 +23,6 @@
     property alias active: loader.active
     property bool paused
     property real edgeSize
-    property bool useEdgeDragArea
 
     property Item launcher
     property Item panel
@@ -61,12 +60,6 @@
 
         Binding {
             target: loader.item
-            property: "useEdgeDragArea"
-            value: root.useEdgeDragArea
-        }
-
-        Binding {
-            target: loader.item
             property: "launcher"
             value: root.launcher
         }

=== modified file 'qml/Tutorial/TutorialContent.qml'
--- qml/Tutorial/TutorialContent.qml	2015-04-03 14:23:02 +0000
+++ qml/Tutorial/TutorialContent.qml	2015-08-20 15:38:59 +0000
@@ -32,7 +32,6 @@
 
     property bool paused: false
     property real edgeSize
-    property bool useEdgeDragArea
 
     signal finished()
 
@@ -78,17 +77,11 @@
         anchors.fill: parent
         textXOffset: root.launcher.panelWidth
         paused: !shown || root.paused
-        text: root.useEdgeDragArea ? i18n.tr("Tap here to continue.") : i18n.tr("Click here to finish.")
+        text: i18n.tr("Tap here to continue.")
 
         onFinished: {
             root.launcher.hide();
-            if (root.useEdgeDragArea) {
-                tutorialRight.show();
-            } else {
-                // Last two screens use EdgeDragArea (right edge spread and
-                // bottom edge).  So just end tutorial here.
-                root.finish();
-            }
+            tutorialRight.show();
         }
     }
 

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-08-03 13:47:44 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-08-20 15:38:59 +0000
@@ -263,12 +263,14 @@
             goToPage(null);
         }
 
-        function test_walkthroughOnDesktop() {
+        function test_skipOnDesktop() {
+            var tutorial = findChild(shell, "tutorial");
+            tryCompare(tutorial, "active", true);
+            tryCompare(tutorial, "running", true);
+
             shell.usageScenario = "desktop";
-            var page = goToPage("tutorialLeftFinish");
-            var tick = findChild(page, "tick");
-            tap(tick);
-            checkFinished();
+            tryCompare(tutorial, "active", false);
+            tryCompare(tutorial, "running", false);
         }
 
         function test_launcherShortDrag() {