unity-scope-click

Merge lp://staging/unity-scope-click/devel into lp://staging/unity-scope-click

  1. devel
  2. Merge into trunk
Proposed by Alejandro J. Cura
Status: Merged
Approved by: dobey
Approved revision: 232
Merged at revision: 217
Proposed branch: lp://staging/unity-scope-click/devel
Merge into: lp://staging/unity-scope-click
Diff against target: 6601 lines (+3909/-1140)
61 files modified
.bzrignore (+0/-1)
autopilot/unityclickscope/test_click_scope.py (+60/-61)
data/CMakeLists.txt (+13/-4)
data/clickscope.ini.in.in (+7/-7)
debian/control (+2/-3)
po/CMakeLists.txt (+2/-1)
po/POTFILES.in (+2/-0)
po/ar.po (+92/-0)
po/ca.po (+90/-0)
po/de.po (+90/-0)
po/es.po (+92/-0)
po/eu.po (+92/-0)
po/fi.po (+92/-0)
po/gd.po (+94/-0)
po/gl.po (+90/-0)
po/he.po (+90/-0)
po/id.po (+90/-0)
po/it.po (+92/-0)
po/lv.po (+90/-0)
po/nb.po (+92/-0)
po/ru.po (+90/-0)
po/sl.po (+90/-0)
po/uk.po (+94/-0)
po/unity-scope-click.pot (+90/-0)
po/zh_CN.po (+90/-0)
scope/click/CMakeLists.txt (+3/-1)
scope/click/configuration.cpp (+124/-0)
scope/click/configuration.h (+62/-0)
scope/click/download-manager.cpp (+1/-1)
scope/click/index.cpp (+37/-206)
scope/click/index.h (+14/-101)
scope/click/interface.cpp (+72/-89)
scope/click/interface.h (+10/-15)
scope/click/package.cpp (+237/-0)
scope/click/package.h (+137/-0)
scope/click/preview.cpp (+232/-51)
scope/click/preview.h (+47/-13)
scope/click/qtbridge.cpp (+7/-28)
scope/click/qtbridge.h (+4/-132)
scope/click/query.cpp (+94/-202)
scope/click/query.h (+21/-2)
scope/click/reviews.cpp (+44/-2)
scope/click/reviews.h (+3/-1)
scope/click/scope.cpp (+24/-91)
scope/click/scope.h (+2/-2)
scope/click/scope_activation.cpp (+48/-0)
scope/click/scope_activation.h (+53/-0)
scope/click/webclient.cpp (+39/-25)
scope/click/webclient.h (+10/-4)
scope/tests/CMakeLists.txt (+2/-0)
scope/tests/applications/user/semi-broken.desktop (+1/-0)
scope/tests/fake_json.h (+29/-0)
scope/tests/integration/webclient_integration.cpp (+3/-10)
scope/tests/mock_webclient.h (+5/-10)
scope/tests/test_configuration.cpp (+174/-0)
scope/tests/test_data.h (+5/-0)
scope/tests/test_index.cpp (+97/-8)
scope/tests/test_interface.cpp (+148/-51)
scope/tests/test_query.cpp (+257/-0)
scope/tests/test_reviews.cpp (+70/-3)
scope/tests/test_webclient.cpp (+67/-15)
To merge this branch: bzr merge lp://staging/unity-scope-click/devel
Reviewer Review Type Date Requested Status
dobey (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+217604@code.staging.launchpad.net

Commit message

- Clean up query.cpp by using the unit tested search code.
- Updated the autopilot tests to work with the new scopes.
- Removed the dependency on url-dispatcher.
- Use direct activation of Open/Go to Accounts actions on the shell side by setting 'uri' attribute of preview actions.
- Moved ScopeActivation to separate file.
- Add support for getting search index URL from environment.
- Fix the naming of the environment variable for reviews base URL.
- Move the Package and PackageDetails classes and related code to separate files.
- Only show the Uninstall button for apps with _removable flag set to true.
- Move Configuration tests to their own file.
- Refactor QProcess usage in Interface to a separate method.
- Add tests for get_manifest_for_app and get_manifests.
- Add methods to get language in use (en_US) and its base (en).
- Remove unused code in the qtbridge.
- Add a backend method to submit a review to the server.
- Build the preview using the strategy pattern.
- Display the publisher in the header, not the first line of description.
- Check for valid .desktop files.
- Add initial support for submitting ratings and reviews of apps.
- Improvements to support for translations.
- Use some local data to present a preview when offline or for unknown apps.
- Create a valid string for the Accept-Language HTTP header.
- Add the Accept-Language header by default to all HTTP requests.

Description of the change

Merging several branches from the /devel tree to trunk

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:223
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/451/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/349
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/349/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/451/rebuild

review: Approve (continuous-integration)
lp://staging/unity-scope-click/devel updated
224. By Alejandro J. Cura

Check for valid .desktop files. Fixes: https://bugs.launchpad.net/bugs/1313878.

Approved by Rodney Dawes, PS Jenkins bot.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/452/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/350
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/350/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/452/rebuild

review: Approve (continuous-integration)
lp://staging/unity-scope-click/devel updated
225. By dobey

Display the publisher in the header, not the first line of description. Fixes: https://bugs.launchpad.net/bugs/1313843.

Approved by Alejandro J. Cura, PS Jenkins bot.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/453/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/351
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/351/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/453/rebuild

review: Approve (continuous-integration)
lp://staging/unity-scope-click/devel updated
226. By dobey

Enable translation of the clickscope.ini data file.
Add missing query.cpp to POTFILES.in. Fixes: https://bugs.launchpad.net/bugs/1314353.

Approved by Alejandro J. Cura, PS Jenkins bot.

227. By dobey

Don't build the pot file automatically.
Include the pot file in the tree.

Approved by Alejandro J. Cura, PS Jenkins bot.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/352
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/352/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/454/rebuild

review: Approve (continuous-integration)
lp://staging/unity-scope-click/devel updated
228. By dobey

Add the language to the review.
Add a test to ensure the language is correctly added to the review.
Handle LANGUAGE being unset, in get_language(), falling back to "C".
Add tests to verify LANGUAGE being unset.
Integrate the rating-input widget to the InstalledPreview.
Submit the review when the user presses "Send" on the widget.

Approved by PS Jenkins bot, Alejandro J. Cura, Pawel Stolowski.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/455/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/353
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/353/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/455/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/456/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/354
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/354/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/456/rebuild

review: Approve (continuous-integration)
lp://staging/unity-scope-click/devel updated
229. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/457/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/355
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/355/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/457/rebuild

review: Approve (continuous-integration)
lp://staging/unity-scope-click/devel updated
230. By Alejandro J. Cura

Restore ubuntu-download-manager client mocks.

Approved by PS Jenkins bot, Rodney Dawes.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/458/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/359/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/356/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/458/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/unity-scope-click/devel updated
231. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/459/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/360/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/357/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/459/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
dobey (dobey) wrote :

There seems to be an issue with performing a search by typing into the search entry at the top of the screen, where the spinner that shows up in the entry during the search, never goes away, despite the results having been pushed to the dash. This is related to the switch to using Index::search() in query.cpp. Attempting to add a call to searchReply->finished() when the search was finished, seems to cause a crash. It seems like the pointer is being held somewhere, but I'm not sure where.

review: Needs Fixing
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Here's a branch to fix the issue that dobey found: https://code.launchpad.net/~alecu/unity-scope-click/force-finished/+merge/217993

lp://staging/unity-scope-click/devel updated
232. By Alejandro J. Cura

Force calling .finished() when the last search result is pushed.

Approved by Rodney Dawes, PS Jenkins bot.

Revision history for this message
dobey (dobey) :
review: Approve
lp://staging/unity-scope-click/devel updated
233. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

234. By dobey

Use some local data to present a preview when offline or for unknown apps. Fixes: https://bugs.launchpad.net/bugs/1297436.

Approved by Pawel Stolowski, PS Jenkins bot.

235. By dobey

Create a valid string for the Accept-Language HTTP header.
Add the Accept-Language header by default to all HTTP requests. Fixes: https://bugs.launchpad.net/bugs/1314781.

Approved by Pawel Stolowski, PS Jenkins bot.

236. By dobey

Hide the rating widget until #1314117 is fixed.

Approved by PS Jenkins bot, Michal Hruby.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: