Merge lp:~aacid/unity8/urldispatcher_hideeverything into lp:unity8

[Albert Astals Cid]

Make url-dispatching scope activation when the dash is not on the main scopes

i.e. temp scope or preview or manage scopes

 * Are there any related MPs required for this MP to build/function as expected?
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?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/urldispatcher_hideeverything]

1691. By Albert Astals Cid on 2015-03-19

fix variable ^_^

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1691
http://jenkins.qa.ubuntu.com/job/unity8-ci/5466/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1872
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/631
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/631
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1652
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1870
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19002

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

tested, works. do we have a change to test this?

review: Needs Information

[lp:~aacid/unity8/urldispatcher_hideeverything]

1692. By Albert Astals Cid on 2015-03-27

Test uri dispatcher does what it has to do

The uri dispatcher calls are not dbus activated but fake signals,
but here we're not testing the uri dispatcher itself that is on the SDK
just checking that when it's activated it does what it should

1693. By Albert Astals Cid on 2015-03-27

And forgot i need this too

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1693
http://jenkins.qa.ubuntu.com/job/unity8-ci/5493/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/658
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2009
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19236

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

lovely. thanks a lot!

 * 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. looks unrelated. unity didn't seem to start within the expected time

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

yes

review: Approve

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-02-17 08:26:20 +0000
+++ qml/Dash/Dash.qml	2015-03-27 12:30:49 +0000
@@ -28,29 +28,42 @@
 
     visible: shown
 
+    Connections {
+        target: UriHandler
+        onOpened: {
+            backToDashContent()
+            dashContent.currentScope.performQuery(uris[0])
+        }
+    }
+
     DashCommunicatorService {
         objectName: "dashCommunicatorService"
         onSetCurrentScopeRequested: {
             if (!isSwipe || !window.active || bottomEdgeController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {
                 if (bottomEdgeController.progress != 0 && window.active) animate = false;
                 dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)
-                // Close dash overview and nested temp scopes in it
-                if (bottomEdgeController.progress != 0) {
-                    bottomEdgeController.enableAnimation = window.active;
-                    bottomEdgeController.progress = 0;
-                }
-                // Close normal temp scopes (e.g. App Store)
-                if (scopeItem.scope) {
-                    scopeItem.backClicked();
-                }
-                // Close previews
-                if (dashContent.subPageShown) {
-                    dashContent.closePreview();
-                }
+                backToDashContent()
             }
         }
     }
 
+    function backToDashContent()
+    {
+        // Close dash overview and nested temp scopes in it
+        if (bottomEdgeController.progress != 0) {
+            bottomEdgeController.enableAnimation = window.active;
+            bottomEdgeController.progress = 0;
+        }
+        // Close normal temp scopes (e.g. App Store)
+        if (scopeItem.scope) {
+            scopeItem.backClicked();
+        }
+        // Close previews
+        if (dashContent.subPageShown) {
+            dashContent.closePreview();
+        }
+    }
+
     function setCurrentScope(scopeId, animate, reset) {
         var scopeIndex = -1;
         for (var i = 0; i < scopes.count; ++i) {

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2015-01-16 14:40:52 +0000
+++ qml/Dash/DashContent.qml	2015-03-27 12:30:49 +0000
@@ -63,11 +63,6 @@
         }
     }
 
-    Connections {
-        target: UriHandler
-        onOpened: dashContentList.currentItem.theScope.performQuery(uris[0])
-    }
-
     function setCurrentScopeAtIndex(index, animate, reset) {
         // if the scopes haven't loaded yet, then wait until they are.
         if (!scopes.loaded) {

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2015-02-11 17:17:20 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2015-03-27 12:30:49 +0000
@@ -310,3 +310,12 @@
         Q_EMIT currentNavigationIdChanged();
     }
 }
+
+void Scope::performQuery(const QString& query)
+{
+    Q_EMIT queryPerformed(query);
+    if (query.startsWith("scopes://")) {
+        QString scopeId = query.mid(9);
+        Q_EMIT gotoScope(scopeId);
+    }
+}

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-09-26 19:47:09 +0000
+++ tests/mocks/Unity/fake_scope.h	2015-03-27 12:30:49 +0000
@@ -72,7 +72,7 @@
     Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;
     Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;
     Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;
-    Q_SIGNAL void performQuery(const QString& query) override;
+    void performQuery(const QString& query) override;
 
     Status status() const override;
     QVariantMap customizations() const override;
@@ -80,7 +80,9 @@
     Q_INVOKABLE void refresh() override;
 
 Q_SIGNALS:
-    void refreshed(); // This is not in the Interface, here for testing benefits
+    // These are not in the Interface, here for testing benefits
+    void refreshed();
+    void queryPerformed(const QString& query);
 
 protected:
 

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2015-03-12 16:08:14 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2015-03-27 12:30:49 +0000
@@ -315,7 +315,7 @@
 
             var scopesList = findChild(dash, "scopesList");
             spy.target = scopesList.scope;
-            spy.signalName = "performQuery";
+            spy.signalName = "queryPerformed";
 
             // Click on the store
             var scopesListPageHeader = findChild(scopesList, "pageHeader");
@@ -517,5 +517,53 @@
             tryCompare(dashTempScopeItem, "x", dash.width);
             tryCompare(dashTempScopeItem, "visible", false);
         }
+
+        function test_UriDispatcher()
+        {
+            var dashContentList = findChild(dash, "dashContentList");
+
+            UriHandler.opened("scopes://clickscope");
+            tryCompare(dashContentList, "currentIndex", 1);
+
+            // Show the manage dash
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
+            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
+            tryCompare(bottomEdgeController, "progress", 1);
+
+            // UriHandler changes to a scope and closes the manage scopes
+            UriHandler.opened("scopes://MockScope1");
+            tryCompare(dashContentList, "currentIndex", 0);
+            tryCompare(bottomEdgeController, "progress", 0);
+
+            // Show a preview
+            var scopeLoader0 = findChild(dashContent, "scopeLoader0");
+            var dashCategory0 = findChild(scopeLoader0, "dashCategory0");
+            var delegate0 = findChild(dashCategory0, "delegate0");
+            mouseClick(delegate0);
+            tryCompare(dashContent, "subPageShown", true)
+
+            // UriHandler changes to a scope and closes the manage scopes
+            UriHandler.opened("scopes://clickscope");
+            tryCompare(dashContentList, "currentIndex", 1);
+            tryCompare(dashContent, "subPageShown", false);
+
+            // Go to a temp scope
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
+            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
+            tryCompare(bottomEdgeController, "progress", 1);
+            var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
+            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
+            tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
+            mouseClick(nonfavScopesListCategoryList.currentItem);
+            var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
+            tryCompare(dashTempScopeItem, "x", 0);
+            tryCompare(dashTempScopeItem, "visible", true);
+
+            // UriHandler changes to a scope and closes the temp scope
+            UriHandler.opened("scopes://MockScope1");
+            tryCompare(dashContentList, "currentIndex", 0);
+            tryCompare(dashTempScopeItem, "x", dashTempScopeItem.width);
+            tryCompare(dashTempScopeItem, "visible", false);
+        }
     }
 }

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-02-11 08:34:50 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2015-03-27 12:30:49 +0000
@@ -206,7 +206,7 @@
                 var header = findChild(genericScopeView, "dashSectionHeader1");
 
                 spy.target = genericScopeView.scope;
-                spy.signalName = "performQuery";
+                spy.signalName = "queryPerformed";
 
                 mouseClick(header);