Merge lp:~saviq/unity8/dont-preview-in-clickscope into lp:unity8

[Michał Sawicz]

Activate all results in click scope by default.

 * 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?
N/A

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1041
http://jenkins.qa.ubuntu.com/job/unity8-ci/3424/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1929
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/518
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/518
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3037
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3037/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9768

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

It looks better this way.

review: Approve

[lp:~saviq/unity8/dont-preview-in-clickscope]

1042. By Michał Sawicz on 2014-07-14

Don't use special clickscope in tst_GenericScopeView.qml by default.

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Ok, makes sense

* Did CI run pass? If not, please explain why.
Waiting...

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1042
http://jenkins.qa.ubuntu.com/job/unity8-ci/3427/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/521
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/521
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/521
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3057
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3057/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9793

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

review: Approve (continuous-integration)

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-09 19:44:02 +0000
+++ qml/Dash/GenericScopeView.qml	2014-07-14 14:15:35 +0000
@@ -193,7 +193,7 @@
                 Connections {
                     target: rendererLoader.item
                     onClicked: {
-                        if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && (categoryId == "local" || categoryId == "store"))) {
+                        if (scopeView.scope.id === "scopes" || scopeView.scope.id == "clickscope") {
                             // TODO Technically it is possible that calling activate() will make the scope emit
                             // previewRequested so that we show a preview but there's no scope that does that yet
                             // so it's not implemented

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-07-09 19:44:02 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-07-14 14:15:35 +0000
@@ -56,7 +56,7 @@
             property Item previewListView: findChild(genericScopeView, "previewListView")
 
             function init() {
-                genericScopeView.scope = scopes.getScope(2)
+                genericScopeView.scope = scopes.getScope(1)
                 shell.width = units.gu(120)
                 genericScopeView.categoryView.positionAtBeginning();
                 tryCompare(genericScopeView.categoryView, "contentY", 0)
@@ -76,13 +76,13 @@
 
             function test_showDash() {
                 testCase.previewListView.open = true;
-                scopes.getScope(2).showDash();
+                scopes.getScope(1).showDash();
                 tryCompare(testCase.previewListView, "open", false);
             }
 
             function test_hideDash() {
                 testCase.previewListView.open = true;
-                scopes.getScope(2).hideDash();
+                scopes.getScope(1).hideDash();
                 tryCompare(testCase.previewListView, "open", false);
             }
 
@@ -99,8 +99,8 @@
 
             function test_changeScope() {
                 genericScopeView.scope.searchQuery = "test"
+                genericScopeView.scope = scopes.getScope(2)
                 genericScopeView.scope = scopes.getScope(1)
-                genericScopeView.scope = scopes.getScope(2)
                 tryCompare(genericScopeView.scope, "searchQuery", "test")
             }