Merge lp:~dobey/unity8/no-more-click into lp:unity8

[dobey]

Remove dependencies on clickscope.

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

No. But other changes in silo 2272 go along nicely with this change.

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

Yes. Uninstalling unity-scope-click in a VM with unity8 behaves fine.

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

Yes.

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

App drawer replacement for click scope is already in unity8, so N/A.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2771
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3002/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3907/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3935
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3780
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3780/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3780
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3780/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3780
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3780/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3780/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3780
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3780/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3780
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3780/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3002/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2771
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3006/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3911
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2291
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2291
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3939
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3783
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3783/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3783
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3783/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3783
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3783/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3783
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3783/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3783
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3783/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3783
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3783/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3006/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Please remove this mentions of the clickscope

./Dash/GenericScopeView.qml:585:
favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"

./Dash/ScopesListCategory.qml:92:
showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)

./Dash/CardTool.qml:80:
readonly property bool isAppLikeScope: scopeId === "clickscope" || scopeId === "libertine-scope.ubuntu_libertine-scope"

./Dash/CardTool.qml:81:
readonly property bool isAppLikeScopeAppCategory: ((scopeId === "clickscope" && (categoryId === "predefined" || categoryId === "local"))

for isAppLikeScopeAppCategory pleae remove it (since it'll always be false together with the ifs) that depend on it

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2771
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3026/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3937/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3965
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3810/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3810/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3810/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3810/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3810/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3810/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3026/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2771
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3023/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3933
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2305
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2305
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3961
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3806
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3806/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3806
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3806/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3806
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3806/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3806
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3806/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3806
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3806/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3806
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3806/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3023/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2771
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3030/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3943/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3971
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3816/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3816/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3816/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3816/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3816/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3816/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3030/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

On Wed, 2017-01-25 at 16:51 +0000, Albert Astals Cid wrote:
> for isAppLikeScopeAppCategory pleae remove it (since it'll always be
> false together with the ifs) that depend on it

I left this value in, as it seems to have a check for libertine scope
as well, but removed the clickscope reference here, as well as the
others you mentioned.

[lp:~dobey/unity8/no-more-click]

2772. By dobey on 2017-01-25

Fixes per review.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2772
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3032/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3946/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3974
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3819/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3819/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3032/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Actually on a second thought I'm not sure that last change i suggested is a good idea.

Will the user still be able to install the click scope even if we don't ship it by default?

If so I guess we want the CardTool.qml changes back in

[dobey (dobey)]

Yes it will still be installable.

On Thu, 2017-01-26 at 08:27 +0000, Albert Astals Cid wrote:
> Actually on a second thought I'm not sure that last change i
> suggested is a good idea.
>
> Will the user still be able to install the click scope even if we
> don't ship it by default?
>
> If so I guess we want the CardTool.qml changes back in

[lp:~dobey/unity8/no-more-click]

2773. By dobey on 2017-01-27

Strip the remaining special casing of libertine scope as well.

2774. By dobey on 2017-01-27

Remove some tests that are no longer relevant.

2775. By dobey on 2017-01-27

Update scope load checks in init.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2773
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3069/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3992
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2337
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2337
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4020
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3864
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3864/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3864
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3864/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3864
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3864/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3864
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3864/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3864
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3864/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3864
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3864/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3069/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2775
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3070/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3993
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2338
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2338
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4021
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3865/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3070/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dobey/unity8/no-more-click]

2776. By dobey on 2017-01-27

Fix the after reset test.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2776
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3071/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3994/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4022
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3866
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3866/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3866
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3866/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3866
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3866/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3866/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3866
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3866/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3866
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3866/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3071/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2776
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3072/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3995
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2339
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2339
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4023
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3867/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3867
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3867/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3072/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Yeah i forgot about the genericscope tests :D

You'll need http://paste.ubuntu.com/23892663/ to make them pass.

[lp:~dobey/unity8/no-more-click]

2777. By Albert Astals Cid on 2017-01-30

More test fixes.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2777
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3080/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4003/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4031
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3875
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3875/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3875
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3875/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3875/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3875
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3875/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3875
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3875/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3875
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3875/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3080/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2777
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3083/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4007
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2348
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2348
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4035
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3879
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3879/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3879
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3879/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3879
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3879/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3879
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3879/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3879
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3879/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3879
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3879/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3083/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2777
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3087/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4014
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2351
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2351
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4042
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3886
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3886/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3886
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3886/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3886
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3886/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3886
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3886/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3886
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3886/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3886
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3886/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3087/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Wops, one more thing, can you remove the

// ↓ This is the ubuntu store icon

comment from CardGrid.qml, makes no sense anymore :D

review: Needs Fixing

[lp:~dobey/unity8/no-more-click]

2778. By dobey on 2017-01-31

Removed comment.

[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? If not, please explain why.
Yes

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2778
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3094/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4022/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4050
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3894
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3894/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3894
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3894/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3894
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3894/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3894/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3894
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3894/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3894
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3894/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3094/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2778
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3098/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4026
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2359
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2359
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4054
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3898
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3898/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3898
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3898/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3898
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3898/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3898
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3898/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3898
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3898/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3898
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3898/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3098/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2017-01-24 07:38:04 +0000
+++ debian/control	2017-01-31 14:31:04 +0000
@@ -141,7 +141,6 @@
 Recommends: indicator-keyboard,
             indicator-session,
             unity-greeter-session-broadcast,
-            unity-scope-click,
 Suggests: unity-scope-mediascanner2,
 Breaks: indicator-network (<< 0.5.1+14.10.20141014),
         ubuntu-touch-session (<< 0.107),
@@ -191,7 +190,6 @@
          python3-gi,
          qttestability-autopilot (>= 1.4),
          ubuntu-ui-toolkit-autopilot (>= 1.3.2030),
-         unity-scope-click,
          unity8 (= ${source:Version}),
          unity8-tests (= ${source:Version}),
          url-dispatcher-tools,

=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2016-10-12 14:29:02 +0000
+++ qml/Dash/CardGrid.qml	2017-01-31 14:31:04 +0000
@@ -25,8 +25,7 @@
         return cardTool.template["collapsed-rows"];
     }
 
-                                                   // ↓ This is the ubuntu store icon
-    readonly property string backgroundShapeStyle: cardTool.isAppLikeScope && !cardTool.isAppLikeScopeAppCategory ? "shadow" : "flat"
+    readonly property string backgroundShapeStyle: "flat"
 
     expandedHeight: grid.totalContentHeight
     collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
@@ -46,7 +45,7 @@
     ResponsiveGridView {
         id: grid
         anchors.fill: parent
-        minimumHorizontalSpacing: (cardTool.isAppLikeScopeAppCategory && cardTool.isWideView) ? units.gu(5) : units.gu(1)
+        minimumHorizontalSpacing: cardTool.isWideView ? units.gu(5) : units.gu(1)
         delegateWidth: cardTool.cardWidth
         delegateHeight: cardTool.cardHeight
         verticalSpacing: units.gu(1)

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2016-10-12 14:29:02 +0000
+++ qml/Dash/CardTool.qml	2017-01-31 14:31:04 +0000
@@ -77,16 +77,8 @@
         return layout;
     }
 
-    readonly property bool isAppLikeScope: scopeId === "clickscope" || scopeId === "libertine-scope.ubuntu_libertine-scope"
-    readonly property bool isAppLikeScopeAppCategory: ((scopeId === "clickscope" && (categoryId === "predefined" || categoryId === "local"))
-                                                      || (scopeId === "libertine-scope.ubuntu_libertine-scope" && categoryId !== "hint"))
-
     readonly property string artShapeStyle: {
-        if (isAppLikeScope) {
-            return isAppLikeScopeAppCategory ? "icon" : "flat";
-        } else {
-            return categoryLayout === "carousel" ? "shadow" : "flat"
-        }
+        return categoryLayout === "carousel" ? "shadow" : "flat"
     }
 
     // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone
@@ -121,18 +113,6 @@
      If -1, should use implicit width of the actual card.
      */
     readonly property real cardWidth: {
-        if (isAppLikeScopeAppCategory) {
-            if (!isNarrowView) {
-                if (isWideView) {
-                    return units.gu(11);
-                } else {
-                    return units.gu(10);
-                }
-            } else {
-                return units.gu(12);
-            }
-        }
-
         switch (categoryLayout) {
             case "grid":
             case "vertical-journal":
@@ -191,11 +171,7 @@
     readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
 
     readonly property size artShapeSize: {
-        if (isAppLikeScopeAppCategory) {
-            return Qt.size(units.gu(8), units.gu(7.5));
-        } else {
-            return cardLoader.item ? cardLoader.item.artShapeSize : Qt.size(0, 0)
-        }
+        return cardLoader.item ? cardLoader.item.artShapeSize : Qt.size(0, 0)
     }
 
     QtObject {

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-11-29 09:37:25 +0000
+++ qml/Dash/GenericScopeView.qml	2017-01-31 14:31:04 +0000
@@ -582,7 +582,7 @@
             showSignatureLine: !showBackButton
             searchEntryEnabled: true
             settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
-            favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
+            favoriteEnabled: scopeView.scope
             favorite: scopeView.scope && scopeView.scope.favorite
             navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""
             scopeStyle: scopeView.scopeStyle

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2016-11-17 20:58:14 +0000
+++ qml/Dash/ScopesListCategory.qml	2017-01-31 14:31:04 +0000
@@ -89,7 +89,7 @@
                 icon: model.art || model.mascot || ""
                 text: model.title || ""
                 subtext: model.subtitle || ""
-                showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)
+                showStar: root.isFavoritesFeed || root.isAlsoInstalled
                 isFavorite: root.isFavoritesFeed
 
                 hideChildren: dragItem.loaderToShrink == loader

=== modified file 'tests/autopilot/unity8/dash.py'
--- tests/autopilot/unity8/dash.py	2016-10-25 09:28:16 +0000
+++ tests/autopilot/unity8/dash.py	2017-01-31 14:31:04 +0000
@@ -48,23 +48,7 @@
         self.dash_content_list = self.wait_select_single(
             'QQuickListView', objectName='dashContentList')
 
-    def get_applications_grid(self):
-        get_grid = self.get_scope('clickscope').wait_select_single(
-            'CardGrid', objectName='local')
-        return get_grid
-
-    def get_application_icon(self, text):
-        """Returns a 'Tile' icon that has the text 'text' from the application
-        grid.
-
-        :param text: String containing the text of the icon to search for.
-
-        """
-        app_grid = self.get_applications_grid()
-        resp_grid = app_grid.wait_select_single('ResponsiveGridView')
-        return resp_grid.select_single('Tile', text=text)
-
-    def get_scope(self, scope_name='clickscope'):
+    def get_scope(self, scope_name):
         return self.dash_content_list.wait_select_single(
             'QQuickLoader', scopeId=scope_name)
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_helpers.py'
--- tests/autopilot/unity8/shell/tests/test_helpers.py	2016-10-25 09:11:13 +0000
+++ tests/autopilot/unity8/shell/tests/test_helpers.py	2017-01-31 14:31:04 +0000
@@ -99,12 +99,6 @@
         self._assert_scope_is_opened(scope, scope_id)
         self.assertIsInstance(scope, dash_helpers.GenericScopeView)
 
-    def test_open_applications_scope(self):
-        scope_id = 'clickscope'
-        scope = self.dash.open_scope(scope_id)
-        self._assert_scope_is_opened(scope, scope_id)
-        self.assertIsInstance(scope, dash_helpers.GenericScopeView)
-
 
 class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):
 
@@ -122,46 +116,3 @@
         """Open an item that requires swiping to make it visible."""
         preview = self.generic_scope.open_preview('2', 'Title.2.0')
         self.assertIsInstance(preview, dash_helpers.Preview)
-
-
-class DashAppsHelperTestCase(tests.DashBaseTestCase):
-
-    available_applications = [
-        'Title.2.0', 'Title.2.1', 'Title.2.2',  'Title.2.3', 'Title.2.4',
-        'Title.2.5', 'Title.2.6', 'Title.2.7',  'Title.2.8', 'Title.2.9',
-        'Title.2.10', 'Title.2.11', 'Title.2.12', 'Title.2.13', 'Title.2.14',
-        'Title.2.15', 'Title.2.16', 'Title.2.17', 'Title.2.18']
-
-    def setUp(self):
-        # Set up the fake scopes before launching unity.
-        self.useFixture(fixture_setup.FakeScopes())
-        super().setUp()
-        self.applications_scope = self.dash.open_scope('clickscope')
-
-    def test_get_applications_should_return_correct_applications(self):
-        category = '2'
-        category_element = self.applications_scope._get_category_element(
-            category)
-        list_view = self.dash.get_scope('clickscope')\
-            .select_single(dash_helpers.ListViewWithPageHeader)
-        expected_apps_count = self._get_number_of_application_slots(category)
-        expected_applications = self.available_applications[
-            :expected_apps_count]
-        x_center = list_view.globalRect.x + list_view.width / 2
-        y_center = list_view.globalRect.y + list_view.height / 2
-        y_diff = (
-            category_element.y - list_view.height + category_element.height
-        )
-        list_view._slow_drag(x_center, x_center, y_center, y_center - y_diff)
-        applications = self.applications_scope.get_applications(category)
-        self.assertEqual(expected_applications, applications)
-
-    def _get_number_of_application_slots(self, category):
-        category_element = self.applications_scope._get_category_element(
-            category)
-        cardgrid = category_element.select_single('CardGrid')
-        if (category_element.expanded):
-            return cardgrid.select_single('QQuickGridView').count
-        else:
-            return cardgrid.collapsedRows \
-                * cardgrid.select_single('ResponsiveGridView').columns

=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2017-01-10 14:46:38 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2017-01-31 14:31:04 +0000
@@ -60,7 +60,6 @@
     addScope(new Scope("MockScope7", "MS7", false, this));
     addScope(new Scope("MockScope8", "MS8", false, this));
     addScope(new Scope("MockScope9", "MS9", false, this));
-    addScope(new Scope("libertine-scope.ubuntu_libertine-scope", "Libertine", true, this));
 
     Scope *longNavigationScope = new Scope(
             "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2016-12-14 17:43:23 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2017-01-31 14:31:04 +0000
@@ -58,7 +58,7 @@
             tryCompare(dashContentList, "count", 0);
             scopes.load();
             tryCompare(dashContentList, "currentIndex", 0);
-            tryCompare(dashContentList, "count", 28);
+            tryCompare(dashContentList, "count", 27);
             tryCompare(scopes, "loaded", true);
             tryCompareFunction(function() {
                 var mockScope1Loader = findChild(dash, "scopeLoader0");
@@ -192,24 +192,6 @@
             tryCompare(expandingItem, "visible", false)
         }
 
-        function test_manage_dash_clickscope_unfavoritable() {
-            open_manage_dash();
-
-            // Click scope star area is not visible (i.e. can't be unfavorited)
-            var favScopesListCategoryList = findChild(findChild(dash, "scopesListCategoryfavorites"), "scopesListCategoryInnerList");
-            var clickScope = findChild(favScopesListCategoryList, "delegateclickscope");
-            var starArea = findChild(clickScope, "starArea");
-            compare(starArea.visible, false);
-
-            // Go back
-            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
-            var scopesList = findChild(dash, "scopesList");
-            var scopesListPageHeader = findChild(scopesList, "pageHeader");
-            var backButton = findChild(scopesListPageHeader, "innerPageHeader").leadingActionBar;
-            mouseClick(backButton);
-            tryCompare(bottomEdgeController, "progress", 0);
-        }
-
         function test_manage_dash_select_same_favorite() {
             open_manage_dash();
 
@@ -627,35 +609,6 @@
             tryCompare(dashContent, "x", 0);
         }
 
-        function test_cardIconStyle()
-        {
-            dash.setCurrentScope("clickscope");
-            var dashContent = findChild(dash, "dashContent");
-            tryCompare(dashContent.currentScope, "id", "clickscope");
-
-            scrollToCategory("dashCategorypredefined");
-            tryCompareFunction(function() {
-                    var tile = getCategoryDelegate("predefined", 2);
-                    var proportionalShape = findChildsByType(tile, "UCProportionalShape");
-                    return proportionalShape.length === 1;
-                },
-                true
-            );
-
-            dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
-            var dashContent = findChild(dash, "dashContent");
-            tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
-
-            scrollToCategory("dashCategory2");
-            tryCompareFunction(function() {
-                    var tile = getCategoryDelegate("2", 2);
-                    var proportionalShape = findChildsByType(tile, "UCProportionalShape");
-                    return proportionalShape.length === 1;
-                },
-                true
-            );
-        }
-
         function test_tempScopeItemXOnResize()
         {
             // Go to a temp scope

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2016-12-02 00:56:24 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2017-01-31 14:31:04 +0000
@@ -70,7 +70,7 @@
         function loadScopes() {
             scopeLoadedSpy.clear();
             scopesModel.load();
-            tryCompare(scopeLoadedSpy, "count", 28, 15000);
+            tryCompare(scopeLoadedSpy, "count", 27, 15000);
             tryCompare(scopesModel, "loaded", true);
             tryCompareFunction(function() {
                 var mockScope1Loader = findChild(shell, "scopeLoader0");
@@ -120,11 +120,11 @@
             scopesModel.clear();
             compare(dashContentList.count, 0, "DashContent should have 0 items after clearing");
             // pretend we're running after a model reset
-            dashContentList.currentIndex = 27;
+            dashContentList.currentIndex = 26;
 
             loadScopes();
 
-            compare(dashContentList.count, 28);
+            compare(dashContentList.count, 27);
             verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
         }
 

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-12-06 20:16:56 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2017-01-31 14:31:04 +0000
@@ -84,6 +84,7 @@
                 genericScopeView.scope = scopes.getScope(2);
                 genericScopeView.isCurrent = true;
                 shell.width = units.gu(120);
+                shell.height = units.gu(100);
                 genericScopeView.categoryView.positionAtBeginning();
                 waitForRendering(genericScopeView.categoryView);
             }
@@ -195,6 +196,8 @@
             }
 
             function test_expand_collapse() {
+                shell.height = units.gu(120);
+
                 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);
 
                 var category = findChild(genericScopeView, "dashCategory0")
@@ -531,6 +534,8 @@
             }
 
             function test_seeAllTwoCategoriesScenario2() {
+                shell.height = units.gu(120);
+
                 mockScope.setId("mockScope");
                 mockScope.setName("Mock Scope");
                 mockScope.isActive = true;
@@ -587,7 +592,6 @@
                 var innerHeader = findChild(header, "innerPageHeader");
                 verify(innerHeader, "Could not find the inner header");
 
-                expectFail("Apps", "Click scope should not have a favorite button");
                 var favoriteAction = findChild(innerHeader, "favorite_button");
                 verify(favoriteAction, "Could not find the favorite action.");
                 mouseClick(favoriteAction);
@@ -697,26 +701,6 @@
                 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
                 compare(shape.borderSource, undefined);
             }
-
-            function test_clickScopeSizing() {
-                genericScopeView.scope = scopes.getScopeFromAll("clickscope");
-                waitForRendering(genericScopeView);
-
-                var categoryListView = findChild(genericScopeView, "categoryListView");
-                waitForRendering(categoryListView);
-
-                var categorypredefined = findChild(categoryListView, "dashCategorypredefined");
-                waitForRendering(categorypredefined);
-
-                var cardTool = findChild(categorypredefined, "cardTool");
-
-                compare(cardTool.cardWidth, units.gu(11));
-                shell.width = units.gu(46);
-                waitForRendering(genericScopeView);
-                compare(cardTool.cardWidth, units.gu(10));
-
-                shell.width = units.gu(120)
-            }
         }
     }
 }