Merge lp:~dobey/unity-scope-click/merge-trunk into lp:unity-scope-click/devel

[dobey]

Synchronize devel branch with trunk.

[Alejandro J. Cura (alecu)]

Looks good, +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-01 15:04:19 +0000
+++ CMakeLists.txt	2015-04-14 19:49:39 +0000
@@ -22,7 +22,7 @@
 include(UseGSettings)
 find_package (PkgConfig REQUIRED)
 
-pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.0 libunity-api>=0.1.3)
+pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.7 libunity-api>=0.1.3)
 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 
 pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0)
@@ -48,7 +48,7 @@
 add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
 
 # Add our own subdirectories.
-add_subdirectory(autopilot)
+add_subdirectory(tests)
 add_subdirectory(bin)
 add_subdirectory(libclickscope)
 add_subdirectory(scope)

=== modified file 'data/clickscope.ini.in.in'
--- data/clickscope.ini.in.in	2014-08-19 15:56:29 +0000
+++ data/clickscope.ini.in.in	2015-04-14 19:49:39 +0000
@@ -7,5 +7,4 @@
 _SearchHint=Search apps
 
 [Appearance]
-PageHeader.Logo=@APPS_DATA_DIR@/ubuntu-logo.png
 LogoOverlayColor=#ffffffff

=== modified file 'data/departments.db'
Binary files data/departments.db	2014-08-18 14:54:00 +0000 and data/departments.db	2015-04-14 19:49:39 +0000 differ
=== modified file 'data/update_schema.sh'
--- data/update_schema.sh	2014-08-18 14:36:17 +0000
+++ data/update_schema.sh	2015-04-14 19:49:39 +0000
@@ -149,4 +149,177 @@
     UPDATE meta SET value='3' WHERE name='version';
     END TRANSACTION;
 _UPDATE_TO_VER3
+SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
+fi
+
+if [ "x$SCHEMA_VERSION" = "x3" ]
+then
+    sqlite3 "$DBFILE" << _UPDATE_TO_VER4
+    BEGIN TRANSACTION;
+
+    DELETE FROM "deptnames";
+    INSERT INTO "deptnames" VALUES('social-networking','en_US','Social Networking');
+    INSERT INTO "deptnames" VALUES('travel-local','en_US','Travel & Local');
+    INSERT INTO "deptnames" VALUES('reference','en_US','Reference');
+    INSERT INTO "deptnames" VALUES('food-drink','en_US','Food & Drink');
+    INSERT INTO "deptnames" VALUES('communication','en_US','Communication');
+    INSERT INTO "deptnames" VALUES('accessories','en_US','Utilities');
+    INSERT INTO "deptnames" VALUES('science-engineering','en_US','Science & Engineering');
+    INSERT INTO "deptnames" VALUES('personalisation','en_US','Personalisation');
+    INSERT INTO "deptnames" VALUES('education','en_US','Education');
+    INSERT INTO "deptnames" VALUES('productivity','en_US','Productivity');
+    INSERT INTO "deptnames" VALUES('universal-accessaccessibility','en_US','Universal Access/Accessibility');
+    INSERT INTO "deptnames" VALUES('entertainment','en_US','Entertainment');
+    INSERT INTO "deptnames" VALUES('sports','en_US','Sports');
+    INSERT INTO "deptnames" VALUES('health-fitness','en_US','Health & Fitness');
+    INSERT INTO "deptnames" VALUES('weather','en_US','Weather');
+    INSERT INTO "deptnames" VALUES('shopping','en_US','Shopping');
+    INSERT INTO "deptnames" VALUES('finance','en_US','Finance');
+    INSERT INTO "deptnames" VALUES('business','en_US','Business');
+    INSERT INTO "deptnames" VALUES('media-video','en_US','Media & Video');
+    INSERT INTO "deptnames" VALUES('music-audio','en_US','Music & Audio');
+    INSERT INTO "deptnames" VALUES('news-magazines','en_US','News & Magazines');
+    INSERT INTO "deptnames" VALUES('graphics','en_US','Graphics');
+    INSERT INTO "deptnames" VALUES('lifestyle','en_US','Lifestyle');
+    INSERT INTO "deptnames" VALUES('medical','en_US','Medical');
+    INSERT INTO "deptnames" VALUES('developer-tools','en_US','Developer Tools');
+    INSERT INTO "deptnames" VALUES('games','en_US','Games');
+    INSERT INTO "deptnames" VALUES('books-comics','en_US','Books & Comics');
+
+    INSERT INTO "deptnames" VALUES('accessories','ca_ES','Utilitats');
+    INSERT INTO "deptnames" VALUES('accessories','es_ES','Utilidades');
+    INSERT INTO "deptnames" VALUES('accessories','eu_ES','Tresnak');
+    INSERT INTO "deptnames" VALUES('accessories','gl_ES','Utilidades');
+    INSERT INTO "deptnames" VALUES('books-comics','ca_ES','Llibres i còmics');
+    INSERT INTO "deptnames" VALUES('books-comics','es_ES','Libros y cómics');
+    INSERT INTO "deptnames" VALUES('books-comics','eu_ES','Liburuak eta komikiak');
+    INSERT INTO "deptnames" VALUES('books-comics','gl_ES','Libros e cómics');
+    INSERT INTO "deptnames" VALUES('communication','ca_ES','Comunicació');
+    INSERT INTO "deptnames" VALUES('communication','es_ES','Comunicación');
+    INSERT INTO "deptnames" VALUES('communication','eu_ES','Komunikazioa');
+    INSERT INTO "deptnames" VALUES('communication','gl_ES','Comunicación');
+    INSERT INTO "deptnames" VALUES('developer-tools','ca_ES','Eines per a desenvolupadors');
+    INSERT INTO "deptnames" VALUES('developer-tools','es_ES','Herramientas para desarrolladores');
+    INSERT INTO "deptnames" VALUES('developer-tools','eu_ES','Garatzaileentzako tresnak');
+    INSERT INTO "deptnames" VALUES('developer-tools','gl_ES','Ferramentas de desenvolvemento');
+    INSERT INTO "deptnames" VALUES('education','ca_ES','Educació');
+    INSERT INTO "deptnames" VALUES('education','es_ES','Educación');
+    INSERT INTO "deptnames" VALUES('education','eu_ES','Hezkuntza');
+    INSERT INTO "deptnames" VALUES('education','gl_ES','Educación');
+    INSERT INTO "deptnames" VALUES('entertainment','ca_ES','Entreteniment');
+    INSERT INTO "deptnames" VALUES('entertainment','es_ES','Entretenimiento');
+    INSERT INTO "deptnames" VALUES('entertainment','eu_ES','Entretenimendua');
+    INSERT INTO "deptnames" VALUES('entertainment','gl_ES','Lecer');
+    INSERT INTO "deptnames" VALUES('finance','ca_ES','Finances');
+    INSERT INTO "deptnames" VALUES('finance','es_ES','Finanzas');
+    INSERT INTO "deptnames" VALUES('finance','eu_ES','Finantzak');
+    INSERT INTO "deptnames" VALUES('finance','gl_ES','Finanzas');
+    INSERT INTO "deptnames" VALUES('food-drink','ca_ES','Menjar i begudes');
+    INSERT INTO "deptnames" VALUES('food-drink','es_ES','Comida y bebida');
+    INSERT INTO "deptnames" VALUES('food-drink','eu_ES','Jana eta edaria');
+    INSERT INTO "deptnames" VALUES('food-drink','gl_ES','Comida & bebida');
+    INSERT INTO "deptnames" VALUES('games','ca_ES','Jocs');
+    INSERT INTO "deptnames" VALUES('games','es_ES','Juegos');
+    INSERT INTO "deptnames" VALUES('games','eu_ES','Jokoak');
+    INSERT INTO "deptnames" VALUES('games','gl_ES','Xogos');
+    INSERT INTO "deptnames" VALUES('graphics','ca_ES','Gràfics');
+    INSERT INTO "deptnames" VALUES('graphics','es_ES','Gráficos');
+    INSERT INTO "deptnames" VALUES('graphics','eu_ES','Grafikoak');
+    INSERT INTO "deptnames" VALUES('graphics','gl_ES','Gráficos');
+    INSERT INTO "deptnames" VALUES('lifestyle','ca_ES','Estil de vida');
+    INSERT INTO "deptnames" VALUES('lifestyle','es_ES','Estilo de vida');
+    INSERT INTO "deptnames" VALUES('lifestyle','eu_ES','Bizi-estiloa');
+    INSERT INTO "deptnames" VALUES('lifestyle','gl_ES','Estilo de vida');
+    INSERT INTO "deptnames" VALUES('media-video','ca_ES','Multimèdia i vídeo');
+    INSERT INTO "deptnames" VALUES('media-video','es_ES','Multimedia y vídeos');
+    INSERT INTO "deptnames" VALUES('media-video','eu_ES','Multimedia eta bideoak');
+    INSERT INTO "deptnames" VALUES('media-video','gl_ES','Multimedia e vídeo');
+    INSERT INTO "deptnames" VALUES('medical','ca_ES','Medicina');
+    INSERT INTO "deptnames" VALUES('medical','es_ES','Medicina');
+    INSERT INTO "deptnames" VALUES('medical','eu_ES','Osasuna');
+    INSERT INTO "deptnames" VALUES('medical','gl_ES','Medicina');
+    INSERT INTO "deptnames" VALUES('music-audio','ca_ES','Música i àudio');
+    INSERT INTO "deptnames" VALUES('music-audio','es_ES','Música y audio');
+    INSERT INTO "deptnames" VALUES('music-audio','eu_ES','Musika eta audioa');
+    INSERT INTO "deptnames" VALUES('music-audio','gl_ES','Música e son');
+    INSERT INTO "deptnames" VALUES('news-magazines','ca_ES','Notícies i revistes');
+    INSERT INTO "deptnames" VALUES('news-magazines','es_ES','Noticias y revistas');
+    INSERT INTO "deptnames" VALUES('news-magazines','eu_ES','Albisteak eta aldizkariak');
+    INSERT INTO "deptnames" VALUES('news-magazines','gl_ES','Novas e revistas');
+    INSERT INTO "deptnames" VALUES('productivity','ca_ES','Productivitat');
+    INSERT INTO "deptnames" VALUES('productivity','es_ES','Productividad');
+    INSERT INTO "deptnames" VALUES('productivity','eu_ES','Produktibitatea');
+    INSERT INTO "deptnames" VALUES('productivity','gl_ES','Produtividade');
+    INSERT INTO "deptnames" VALUES('reference','ca_ES','Referència');
+    INSERT INTO "deptnames" VALUES('reference','es_ES','Referencia');
+    INSERT INTO "deptnames" VALUES('reference','eu_ES','Erreferentzia');
+    INSERT INTO "deptnames" VALUES('reference','gl_ES','Referencia');
+    INSERT INTO "deptnames" VALUES('science-engineering','ca_ES','Ciència i enginyeria');
+    INSERT INTO "deptnames" VALUES('science-engineering','es_ES','Ciencia e ingeniería');
+    INSERT INTO "deptnames" VALUES('science-engineering','eu_ES','Zientzia eta ingeniaritza');
+    INSERT INTO "deptnames" VALUES('science-engineering','gl_ES','Ciencia e enxeñaría');
+    INSERT INTO "deptnames" VALUES('shopping','ca_ES','Compres');
+    INSERT INTO "deptnames" VALUES('shopping','es_ES','Tiendas');
+    INSERT INTO "deptnames" VALUES('shopping','eu_ES','Erosketak');
+    INSERT INTO "deptnames" VALUES('shopping','gl_ES','Compras');
+    INSERT INTO "deptnames" VALUES('social-networking','ca_ES','Xarxes socials');
+    INSERT INTO "deptnames" VALUES('social-networking','es_ES','Redes sociales');
+    INSERT INTO "deptnames" VALUES('social-networking','eu_ES','Sare sozialak');
+    INSERT INTO "deptnames" VALUES('social-networking','gl_ES','Redes sociais');
+    INSERT INTO "deptnames" VALUES('sports','ca_ES','Esports');
+    INSERT INTO "deptnames" VALUES('sports','es_ES','Deportes');
+    INSERT INTO "deptnames" VALUES('sports','eu_ES','Kirolak');
+    INSERT INTO "deptnames" VALUES('sports','gl_ES','Deportes');
+    INSERT INTO "deptnames" VALUES('travel-local','ca_ES','Viatges i regional');
+    INSERT INTO "deptnames" VALUES('travel-local','es_ES','Viajes y guías');
+    INSERT INTO "deptnames" VALUES('travel-local','eu_ES','Bidaiak eta gidak');
+    INSERT INTO "deptnames" VALUES('travel-local','gl_ES','Viaxes e local');
+    INSERT INTO "deptnames" VALUES('universal-accessaccessibility','ca_ES','Accés universal i accessibilitat');
+    INSERT INTO "deptnames" VALUES('universal-accessaccessibility','es_ES','Acceso universal/accesibilidad');
+    INSERT INTO "deptnames" VALUES('universal-accessaccessibility','eu_ES','Sarbide unibertsala/Erabilerraztasuna');
+    INSERT INTO "deptnames" VALUES('universal-accessaccessibility','gl_ES','Acceso universal/Accesibilidade');
+    INSERT INTO "deptnames" VALUES('weather','ca_ES','El temps');
+    INSERT INTO "deptnames" VALUES('weather','es_ES','Meteorología');
+    INSERT INTO "deptnames" VALUES('weather','eu_ES','Eguraldia');
+    INSERT INTO "deptnames" VALUES('weather','gl_ES','O Tempo');
+
+    DELETE FROM "pkgmap";
+    INSERT INTO "pkgmap" VALUES('com.canonical.cincodias','news-magazines');
+    INSERT INTO "pkgmap" VALUES('com.canonical.elpais','news-magazines');
+    INSERT INTO "pkgmap" VALUES('com.nokia.heremaps','travel-local');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon','shopping');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon-es','shopping');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon-int','shopping');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.dropping-letters','games');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.filemanager','accesories');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.shorts','news-magazines');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.sudoku','games');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.telegram','communication');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.terminal','accesories');
+    INSERT INTO "pkgmap" VALUES('com.zeptolab.cuttherope.free','games');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.weather','weather');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.clock','accessories');
+    INSERT INTO "pkgmap" VALUES('com.canonical.payui','accessories');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.music','music-audio');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-ebay','shopping');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-gmail','communication');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.ken-vandine.pathwind','games');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.gallery','accessories');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.camera','accessories');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.calculator','accessories');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.mzanetti.tagger','accessories');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-facebook','communication');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.reminders','accessories');
+    INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-twitter','communication');
+    INSERT INTO "pkgmap" VALUES('address-book-app.desktop','accessories');
+    INSERT INTO "pkgmap" VALUES('dialer-app.desktop','communication');
+    INSERT INTO "pkgmap" VALUES('mediaplayer-app.desktop','sound-video');
+    INSERT INTO "pkgmap" VALUES('messaging-app.desktop','communication');
+    INSERT INTO "pkgmap" VALUES('ubuntu-system-settings.desktop','accessories');
+    INSERT INTO "pkgmap" VALUES('webbrowser-app.desktop','communication');
+
+    UPDATE meta SET value='4' WHERE name='version';
+    END TRANSACTION;
+_UPDATE_TO_VER4
+SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
 fi

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-21 20:40:59 +0000
+++ debian/changelog	2015-04-14 19:49:39 +0000
@@ -1,3 +1,215 @@
+unity-scope-click (0.1.1+15.04.20150407-0ubuntu1) vivid; urgency=medium
+
+  * 
+
+ -- CI Train Bot <[e-mail]>  Tue, 07 Apr 2015 09:13:05 +0000
+
+unity-scope-click (0.1.1+15.04.20150326-0ubuntu1) vivid; urgency=medium
+
+  [ Alejandro J. Cura ]
+  * Fake webservices for the integration tests
+  * Fetch the "refundable_until" field from the /purchases endpoint, and
+    store it as a GMT timestamp
+  * Use table widget in previews (LP: #1407680)
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Pawel Stolowski ]
+  * Initial set of python integration tests using the scope harness
+
+ -- CI Train Bot <[e-mail]>  Thu, 26 Mar 2015 18:49:47 +0000
+
+unity-scope-click (0.1.1+15.04.20150310-0ubuntu1) vivid; urgency=medium
+
+  [ Rodney Dawes ]
+  * Update autopilot dependencies for the autopilot tests package. (LP:
+    #1429158)
+
+ -- CI Train Bot <[e-mail]>  Tue, 10 Mar 2015 19:01:19 +0000
+
+unity-scope-click (0.1.1+15.04.20150123-0ubuntu1) vivid; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Alejandro J. Cura ]
+  * Add Spanish translations to the preinstalled departments db (LP:
+    #1413272)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 23 Jan 2015 03:41:27 +0000
+
+unity-scope-click (0.1.1+15.04.20150120-0ubuntu1) vivid; urgency=low
+
+  [ Alejandro J. Cura ]
+  * Put the store version in the result, to be used if uninstalling just
+    after installing (LP: #1412541)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 20 Jan 2015 17:27:07 +0000
+
+unity-scope-click (0.1.1+15.04.20150114-0ubuntu1) vivid; urgency=low
+
+  [ Alejandro J. Cura ]
+  * Check Variant for null value (LP: #1357143)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 14 Jan 2015 19:27:00 +0000
+
+unity-scope-click (0.1.1+15.04.20141212.1-0ubuntu1) vivid; urgency=low
+
+  [ Pawel Stolowski ]
+  * Removed the restriction in get_children method that filtered empty
+    departments out. (LP: #1390191)
+
+  [ Leo Arias ]
+  * Updated the autopilot tests to get then back to green. (LP:
+    #1398933)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 12 Dec 2014 18:40:43 +0000
+
+unity-scope-click (0.1.1+15.04.20141212-0ubuntu1) vivid; urgency=low
+
+  [ Pawel Stolowski ]
+  * Report all departments in the Store scope so that Shell receives
+    also the siblings of current department and can properly render
+    departments menu when going to a specific department via 'Ubuntu
+    store' button of Apps scope. (LP: #1343242)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 12 Dec 2014 10:02:19 +0000
+
+unity-scope-click (0.1.1+15.04.20141118-0ubuntu1) vivid; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Alejandro J. Cura ]
+  * Enable purchases by default (LP: #1393410)
+  * Remove ubuntu logo from apps scope (LP: #1391498)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 18 Nov 2014 15:05:15 +0000
+
+unity-scope-click (0.1.1+15.04.20141030-0ubuntu1) vivid; urgency=low
+
+  [ Alejandro J. Cura ]
+  * Remove the background image used in the scope headers (LP: #1387216)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 30 Oct 2014 20:34:22 +0000
+
+unity-scope-click (0.1.1+14.10.20141022.1~rtm-0ubuntu1) 14.09; urgency=low
+
+  [ Alejandro J. Cura ]
+  * Fetch status from download manager serially (LP: #1381101)
+
+  [ Rodney Dawes ]
+  * Get the list of purchased apps from the server all at once. (LP:
+    #1376310)
+  * Use the locally translated title and description for application
+    previews. (LP: #1379366)
+  * Set attributes on the preview header for rating and purchase price.
+    (LP: #1282460)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 22 Oct 2014 19:32:52 +0000
+
+unity-scope-click (0.1.1+14.10.20141014-0ubuntu1) 14.09; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Sergio Schvezov ]
+  * Updating download manager mock
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 14 Oct 2014 17:01:09 +0000
+
+unity-scope-click (0.1.1+14.10.20141010-0ubuntu1) utopic; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Rodney Dawes ]
+  * Bump dependency on libunity-scopes-api for fixes to
+    OnlineAccountClient API. Use online accounts API to open login UI
+    directly. (LP: #1350093)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 10 Oct 2014 19:30:55 +0000
+
+unity-scope-click (0.1.1+14.10.20141007.1-0ubuntu1) 14.09; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Alejandro J. Cura ]
+  * Move app-of-the-week and editors-pick to top of results, moved
+    scopes above apps. (LP: #1359902)
+  * Use the new background image for the header (LP: #1378321)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 07 Oct 2014 13:38:11 +0000
+
+unity-scope-click (0.1.1+14.10.20141002-0ubuntu1) 14.09; urgency=low
+
+  [ Rodney Dawes ]
+  * Add support for multiple currencies based on GeoIP suggestion from
+    the server. (LP: #1375281)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 02 Oct 2014 19:21:19 +0000
+
+unity-scope-click (0.1.1+14.10.20140929-0ubuntu1) 14.09; urgency=low
+
+  [ Rodney Dawes ]
+  * Change the "Uninstall" button to "Confirm" in confirmation preview.
+    (LP: #1368252)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 29 Sep 2014 19:59:07 +0000
+
+unity-scope-click (0.1.1+14.10.20140925-0ubuntu1) 14.09; urgency=low
+
+  [ Rodney Dawes ]
+  * Invalidate the local token and show login error when token is
+    invalid. (LP: #1373493)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 25 Sep 2014 13:44:55 +0000
+
+unity-scope-click (0.1.1+14.10.20140915-0ubuntu1) utopic; urgency=low
+
+  [ Rodney Dawes ]
+  * Define a constant for the currency symbol to use for USD, and use
+    it. (LP: #1362716)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 15 Sep 2014 22:02:42 +0000
+
+unity-scope-click (0.1.1+14.10.20140903.1-0ubuntu1) utopic; urgency=medium
+
+  [ Alejandro J. Cura (alecu) ]
+  * New upstream release.
+    - Update apps-scope image with new one provided by design.
+    - Do not show the subtitle for scopes cards. Only show the first attributes
+      value (price) for scopes. (LP: #1362700)
+    - Always install the gsettings schema to the cmake install prefix.
+    - Depend on the native g++ package, so that cross-compiling will work.
+      (LP: #1362745)
+    - Split the price and rating attributes into separate lines when surfacing
+      results. (LP: #1362629)
+    - Refresh the store scope too on uninstall. (LP: #1328102)
+    - Updated translations.
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 03 Sep 2014 19:01:00 +0000
+
+unity-scope-click (0.1.1+14.10.20140827-0ubuntu1) utopic; urgency=medium
+
+  [ Alejandro J. Cura (alecu) ]
+  * New upstream release.
+    - Skip broken entries in click list. (LP: #1356837)
+    - Do not push preview widgets until all data is available. (LP: #1360384)
+    - Add the price and rating as attributes in search results. (LP: #1350561)
+    - Improved card style for categories with just scopes. (LP: #1359900)
+    - Updated translations.
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 27 Aug 2014 19:09:01 +0000
+
 unity-scope-click (0.1.1+14.10.20140821.1-0ubuntu1) utopic; urgency=medium
 
   [ Alejandro J. Cura (alecu) ]

=== modified file 'debian/control'
--- debian/control	2014-08-28 18:27:23 +0000
+++ debian/control	2015-04-14 19:49:39 +0000
@@ -17,7 +17,7 @@
                libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev,
                libunity-api-dev (>= 7.80.7),
-               libunity-scopes-dev (>= 0.6.0),
+               libunity-scopes-dev (>= 0.6.7~),
                libgsettings-qt-dev,
                pkg-config,
                python3-all:native,
@@ -76,13 +76,14 @@
 
 Package: unity-scope-click-autopilot
 Architecture: all
-Depends: libautopilot-qt (>= 1.4),
+Depends: autopilot-qt5 (>= 1.4+14.10.20140820),
          python3-autopilot,
          python3-dbus,
          python3-dbusmock,
          python3-fixtures,
          python3-testscenarios,
          python3-testtools,
+         qttestability-autopilot,
          ubuntu-ui-toolkit-autopilot,
          unity8-autopilot,
          ${misc:Depends},

=== modified file 'libclickscope/click/configuration.cpp'
--- libclickscope/click/configuration.cpp	2014-07-31 19:15:59 +0000
+++ libclickscope/click/configuration.cpp	2015-04-14 19:49:39 +0000
@@ -54,6 +54,18 @@
     "zh_TW",
 };
 
+/* NOTE: The list of currencies we need to handle mapping symbols of.
+ * Please keep this list in A-Z order.
+ */
+const std::map<const std::string, const std::string> Configuration::CURRENCY_MAP = {
+    { "CNY", "RMB"},
+    { "EUR", "€"},
+    { "GBP", "₤"},
+    { "HKD", "HK$"},
+    { "TWD", "TW$"},
+    { "USD", "US$"},
+};
+
 std::vector<std::string> Configuration::list_folder(const std::string& folder, const std::string& pattern)
 {
     std::vector<std::string> result;
@@ -115,6 +127,21 @@
     return std::string("1") == env_value;
 }
 
+std::string Configuration::get_currency(const std::string& fallback)
+{
+    const char* env_value = std::getenv(CURRENCY_ENVVAR);
+    if (env_value == NULL) {
+        if (CURRENCY_MAP.count(fallback) == 0) {
+            return CURRENCY_DEFAULT;
+        }
+        return fallback;
+    }
+    if (CURRENCY_MAP.count(env_value) == 0) {
+        return CURRENCY_DEFAULT;
+    }
+    return env_value;
+}
+
 std::string Configuration::get_language_base()
 {
     std::string language = get_language();

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2014-08-01 05:12:28 +0000
+++ libclickscope/click/configuration.h	2015-04-14 19:49:39 +0000
@@ -30,6 +30,7 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -45,12 +46,16 @@
     constexpr static const char* ARCH_ENVVAR {"U1_SEARCH_ARCH"};
     constexpr static const char* LANGUAGE_ENVVAR {"LANGUAGE"};
     constexpr static const char* PURCHASES_ENVVAR {"CLICK_STORE_ENABLE_PURCHASES"};
-    constexpr static const bool PURCHASES_DEFAULT = false;
+    constexpr static const bool PURCHASES_DEFAULT = true;
+    constexpr static const char* CURRENCY_ENVVAR {"U1_SEARCH_CURRENCY"};
+    constexpr static const char* CURRENCY_DEFAULT {"USD"};
+    static const std::map<const std::string, const std::string> CURRENCY_MAP;
     static const std::vector<const char*> FULL_LANG_CODES;
 
     virtual std::vector<std::string> get_available_frameworks();
     virtual std::string get_architecture();
     static bool get_purchases_enabled();
+    static std::string get_currency(const std::string& fallback = CURRENCY_DEFAULT);
 
     virtual std::string get_language_base();
     virtual std::string get_language();

=== modified file 'libclickscope/click/departments-db.cpp'
--- libclickscope/click/departments-db.cpp	2014-08-19 15:34:58 +0000
+++ libclickscope/click/departments-db.cpp	2015-04-14 19:49:39 +0000
@@ -156,7 +156,7 @@
     //
     // note: this will fail due to unique constraint, but that's fine; it's expected to succeed only when new database is created; in other
     // cases the version needs to be bumped in the update_schema.sh script.
-    query.exec("INSERT INTO meta (name, value) VALUES ('version', 3)");
+    query.exec("INSERT INTO meta (name, value) VALUES ('version', 4)");
 
     if (!db_.commit())
     {
@@ -221,12 +221,8 @@
     while (select_children_depts_->next())
     {
         auto const child_id = select_children_depts_->value(0).toString().toStdString();
-        // only return child department if it's not empty
-        if (!is_empty(child_id))
-        {
-            const DepartmentInfo inf(child_id, select_children_depts_->value(1).toBool());
-            depts.push_back(inf);
-        }
+        const DepartmentInfo inf(child_id, select_children_depts_->value(1).toBool());
+        depts.push_back(inf);
     }
 
     select_children_depts_->finish();

=== modified file 'libclickscope/click/download-manager.cpp'
--- libclickscope/click/download-manager.cpp	2014-08-22 17:59:09 +0000
+++ libclickscope/click/download-manager.cpp	2015-04-14 19:49:39 +0000
@@ -73,6 +73,11 @@
         credentialsService->getCredentials();
     }
 
+    void invalidateCredentialsFromService()
+    {
+        credentialsService->invalidateCredentials();
+    }
+
     QSharedPointer<click::network::AccessManager> nam;
     QSharedPointer<click::CredentialsService> credentialsService;
     QSharedPointer<udm::Manager> systemDownloadManager;
@@ -248,9 +253,19 @@
 
 void click::DownloadManager::handleNetworkError(QNetworkReply::NetworkError error)
 {
-    qDebug() << "error in network request for click token: " << error << impl->reply->errorString();
+    switch (error) {
+        case QNetworkReply::ContentAccessDenied:
+        case QNetworkReply::ContentOperationNotPermittedError:
+        case QNetworkReply::AuthenticationRequiredError:
+            impl->invalidateCredentialsFromService();
+            emit credentialsNotFound();
+            break;
+        default:
+            qDebug() << "error in network request for click token: " << error << impl->reply->errorString();
+            emit clickTokenFetchError(QString("Network Error"));
+            break;
+    }
     impl->reply.reset();
-    emit clickTokenFetchError(QString("Network Error"));
 }
 
 void click::DownloadManager::getAllDownloadsWithMetadata(const QString &key, const QString &value,

=== modified file 'libclickscope/click/highlights.cpp'
--- libclickscope/click/highlights.cpp	2014-08-21 21:15:13 +0000
+++ libclickscope/click/highlights.cpp	2015-04-14 19:49:39 +0000
@@ -85,7 +85,12 @@
             auto slug = item[Highlight::JsonKeys::slug].asString();
             auto pkg_node = item[Package::JsonKeys::embedded][Package::JsonKeys::ci_package];
             auto pkgs = package_list_from_json_node(pkg_node);
-            highlights.push_back(Highlight(slug, name, pkgs));
+            auto hl = Highlight(slug, name, pkgs);
+            if (slug == "app-of-the-week" || slug == "editors-pick") {
+                highlights.push_front(hl);
+            } else {
+                highlights.push_back(hl);
+            }
         }
     }
 
@@ -118,12 +123,13 @@
                 }
             }
 
+            if (scopes.size() > 0) {
+                highlights.push_back(Highlight("__all-scopes__", _("Scopes"), scopes, true));
+            }
+
             if (apps.size() > 0) {
                 highlights.push_back(Highlight("__all-apps__", _("Apps"), apps));
             }
-            if (scopes.size() > 0) {
-                highlights.push_back(Highlight("__all-scopes__", _("Scopes"), scopes, true));
-            }
         }
     }
 

=== modified file 'libclickscope/click/index.cpp'
--- libclickscope/click/index.cpp	2014-09-01 21:23:11 +0000
+++ libclickscope/click/index.cpp	2015-04-14 19:49:39 +0000
@@ -180,6 +180,13 @@
             Json::Reader reader;
             Json::Value root;
 
+            // Get the suggested currency from the store.
+            if (response->has_header(CURRENCY_HEADER)) {
+                m_suggested_currency = response->get_header(CURRENCY_HEADER);
+            } else {
+                m_suggested_currency = Configuration::CURRENCY_DEFAULT;
+            }
+
             click::DepartmentList depts;
             click::HighlightList highlights;
             if (reader.parse(reply.toUtf8().constData(), root)) {
@@ -218,6 +225,11 @@
     return click::web::Cancellable(response);
 }
 
+std::string Index::get_suggested_currency() const
+{
+    return m_suggested_currency;
+}
+
 std::string Index::get_base_url ()
 {
     const char *env_url = getenv(SEARCH_BASE_URL_ENVVAR.c_str());

=== modified file 'libclickscope/click/index.h'
--- libclickscope/click/index.h	2014-06-26 18:57:08 +0000
+++ libclickscope/click/index.h	2015-04-14 19:49:39 +0000
@@ -54,6 +54,7 @@
 const std::string QUERY_ARGNAME = "q";
 const std::string ARCHITECTURE = "architecture:";
 const std::string DETAILS_PATH = "api/v1/package/";
+const std::string CURRENCY_HEADER = "X-Suggested-Currency";
 
 class PackageManager
 {
@@ -67,11 +68,13 @@
 protected:
     QSharedPointer<web::Client> client;
     QSharedPointer<Configuration> configuration;
+    std::string m_suggested_currency;
     virtual std::string build_index_query(const std::string& query, const std::string& department);
     virtual std::map<std::string, std::string> build_headers();
 
 public:
     enum class Error {NoError, CredentialsError, NetworkError};
+    Index() {}
     Index(const QSharedPointer<click::web::Client>& client,
           const QSharedPointer<Configuration> configuration=QSharedPointer<Configuration>(new Configuration()));
     virtual std::pair<Packages, Packages> package_lists_from_json(const std::string& json);
@@ -81,6 +84,7 @@
     virtual click::web::Cancellable departments(const std::string& department_href, std::function<void(const DepartmentList&, const HighlightList&, Error, int)> callback);
     virtual ~Index();
 
+    virtual std::string get_suggested_currency() const;
     static std::string get_base_url ();
 };
 

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-08-26 14:57:03 +0000
+++ libclickscope/click/interface.cpp	2015-04-14 19:49:39 +0000
@@ -182,17 +182,16 @@
         QStringList id = app_id.split("_", QString::SkipEmptyParts);
         app.name = id[0].toUtf8().data();
         app.version = id[2].toUtf8().data();
-    } else {
-        if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_COMMENT)) {
-            app.description = get_translated_string(keyFile,
-                                                    DESKTOP_FILE_GROUP,
-                                                    DESKTOP_FILE_COMMENT,
-                                                    domain);
-        }
-        if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_SCREENSHOT)) {
-            app.main_screenshot = keyFile.get_string(DESKTOP_FILE_GROUP,
-                                                     DESKTOP_FILE_SCREENSHOT);
-        }
+    }
+    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_COMMENT)) {
+        app.description = get_translated_string(keyFile,
+                                                DESKTOP_FILE_GROUP,
+                                                DESKTOP_FILE_COMMENT,
+                                                domain);
+    }
+    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_SCREENSHOT)) {
+        app.main_screenshot = keyFile.get_string(DESKTOP_FILE_GROUP,
+                                                 DESKTOP_FILE_SCREENSHOT);
     }
     return app;
 }

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2014-08-22 19:53:38 +0000
+++ libclickscope/click/package.cpp	2015-04-14 19:49:39 +0000
@@ -81,11 +81,19 @@
     p.name = item[Package::JsonKeys::name].asString();
     p.title = item[Package::JsonKeys::title].asString();
     p.price = item[Package::JsonKeys::price].asDouble();
+    if (item.isMember(Package::JsonKeys::prices)) {
+        auto prices = item[Package::JsonKeys::prices];
+        auto currencies = prices.getMemberNames();
+        foreach (auto currency, currencies) {
+            p.prices[currency] = prices[currency].asDouble();
+        }
+    }
     p.icon_url = item[Package::JsonKeys::icon_url].asString();
     p.url = item[Package::JsonKeys::links][Package::JsonKeys::self][Package::JsonKeys::href].asString();
     p.content = item[Package::JsonKeys::content].asString();
     p.publisher = item[Package::JsonKeys::publisher].asString();
     p.rating = item[Package::JsonKeys::rating].asDouble();
+    p.version = item[Package::JsonKeys::version].asString();
     return p;
 }
 
@@ -133,6 +141,13 @@
         details.package.title = root[Package::JsonKeys::title].asString();
         details.package.icon_url = root[Package::JsonKeys::icon_url].asString();
         details.package.price = root[Package::JsonKeys::price].asDouble();
+        if (root.isMember(Package::JsonKeys::prices)) {
+            auto prices = root[Package::JsonKeys::prices];
+            auto currencies = prices.getMemberNames();
+            foreach (auto currency, currencies) {
+                details.package.prices[currency] = prices[currency].asDouble();
+            }
+        }
         details.description = root[JsonKeys::description].asString();
         details.download_url = root[JsonKeys::download_url].asString();
         details.license = root[JsonKeys::license].asString();

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2014-08-22 19:53:38 +0000
+++ libclickscope/click/package.h	2015-04-14 19:49:39 +0000
@@ -63,6 +63,10 @@
         constexpr static const char* content{"content"};
         constexpr static const char* publisher{"publisher"};
         constexpr static const char* rating{"ratings_average"};
+        constexpr static const char* version{"version"};
+
+        // NOTE: The "price" field is deprecated in favor of "prices"
+        constexpr static const char* prices{"prices"};
     };
 
     Package() = default;
@@ -102,6 +106,7 @@
     double rating;
     void matches (std::string query, std::function<bool> callback);
     std::string content;
+    std::map<std::string, double> prices;
 
     struct hash_name {
     public :

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-08-26 15:16:25 +0000
+++ libclickscope/click/preview.cpp	2015-04-14 19:49:39 +0000
@@ -184,7 +184,9 @@
 }
 
 PreviewStrategy::PreviewStrategy(const unity::scopes::Result& result)
-    : result(result)
+    : result(result),
+      oa_client("ubuntuone", "ubuntuone", "ubuntuone",
+                scopes::OnlineAccountClient::MainLoopSelect::CreateInternalMainLoop)
 {
 }
 
@@ -193,7 +195,9 @@
     result(result),
     client(client),
     index(new click::Index(client)),
-    reviews(new click::Reviews(client))
+    reviews(new click::Reviews(client)),
+    oa_client("ubuntuone", "ubuntuone", "ubuntuone",
+              scopes::OnlineAccountClient::MainLoopSelect::CreateInternalMainLoop)
 {
 }
 
@@ -218,28 +222,32 @@
     submit_operation.cancel();
 }
 
-// TODO: replace this big string with a TABLE widget
-std::string PreviewStrategy::build_other_metadata(const PackageDetails &details)
+scopes::PreviewWidget PreviewStrategy::build_other_metadata(const PackageDetails &details)
 {
-    std::stringstream b;
-    b << _("Publisher/Creator") << ": " << details.publisher << std::endl;
-    b << _("Seller") << ": " << details.company_name << std::endl;
-    b << _("Website") << ": " << details.website << std::endl;
-    b << _("Contact") << ": " << details.support_url << std::endl;
-    b << _("License") << ": " << details.license << std::endl;
-    return b.str();
+    scopes::PreviewWidget widget("other_metadata", "table");
+    scopes::VariantArray values {
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("Publisher/Creator")}, scopes::Variant{details.publisher}}},
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("Seller")}, scopes::Variant{details.company_name}}},
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("Website")}, scopes::Variant{details.website}}},
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("Contact")}, scopes::Variant{details.support_url}}},
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("License")}, scopes::Variant{details.license}}},
+    };
+    widget.add_attribute_value("values", scopes::Variant(values));
+    return widget;
 }
 
-// TODO: replace this big string with a TABLE widget
-std::string PreviewStrategy::build_updates_table(const PackageDetails& details)
+scopes::PreviewWidget PreviewStrategy::build_updates_table(const PackageDetails& details)
 {
-    std::stringstream b;
-    b << _("Version number") << ": " << details.version << std::endl;
-    b << _("Last updated") << ": " << details.last_updated.formatted() << std::endl;
-    b << _("First released") << ": " << details.date_published.formatted() << std::endl;
-    b << _("Size") << ": " <<
-         click::Formatter::human_readable_filesize(details.binary_filesize) << std::endl;
-    return b.str();
+    scopes::PreviewWidget widget("updates_table", "table");
+    widget.add_attribute_value("title", scopes::Variant{_("Updates")});
+    scopes::VariantArray values {
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("Version number")}, scopes::Variant{details.version}}},
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("Last updated")}, scopes::Variant{details.last_updated.formatted()}}},
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("First released")}, scopes::Variant{details.date_published.formatted()}}},
+        scopes::Variant{scopes::VariantArray{scopes::Variant{_("Size")}, scopes::Variant{click::Formatter::human_readable_filesize(details.binary_filesize)}}},
+    };
+    widget.add_attribute_value("values", scopes::Variant(values));
+    return widget;
 }
 
 std::string PreviewStrategy::build_whats_new(const PackageDetails& details)
@@ -250,6 +258,22 @@
     return b.str();
 }
 
+void PreviewStrategy::run_under_qt(const std::function<void ()> &task)
+{
+    qt::core::world::enter_with_task([task]() {
+        task();
+    });
+}
+
+std::string get_string_maybe_null(scopes::Variant variant)
+{
+    if (variant.is_null()) {
+        return "";
+    } else {
+        return variant.get_string();
+    }
+}
+
 // TODO: error handling - once get_details provides errors, we can
 // return them from populateDetails and check them in the calling code
 // to decide whether to show error widgets. see bug LP: #1289541
@@ -258,15 +282,15 @@
                                                     click::Reviews::Error)> reviews_callback)
 {
 
-    std::string app_name = result["name"].get_string();
+    std::string app_name = get_string_maybe_null(result["name"]);
 
     if (app_name.empty()) {
         click::PackageDetails details;
         qDebug() << "in populateDetails(), app_name is empty";
         details.package.title = result.title();
         details.package.icon_url = result.art();
-        details.description = result["description"].get_string();
-        details.main_screenshot_url = result["main_screenshot"].get_string();
+        details.description = get_string_maybe_null(result["description"]);
+        details.main_screenshot_url = get_string_maybe_null(result["main_screenshot"]);
         details_callback(details);
         reviews_callback(click::ReviewList(), click::Reviews::Error::NoError);
     } else {
@@ -274,7 +298,7 @@
         // I think this should not be required when we switch the click::Index over
         // to using the Qt bridge. With that, the qt dependency becomes an implementation detail
         // and code using it does not need to worry about threading/event loop topics.
-        qt::core::world::enter_with_task([this, details_callback, reviews_callback, app_name]()
+        run_under_qt([this, details_callback, reviews_callback, app_name]()
             {
                 index_operation = index->get_details(app_name, [this, app_name, details_callback, reviews_callback](PackageDetails details, click::Index::Error error){
                     if(error == click::Index::Error::NoError) {
@@ -285,8 +309,8 @@
                         click::PackageDetails details;
                         details.package.title = result.title();
                         details.package.icon_url = result.art();
-                        details.description = result["description"].get_string();
-                        details.main_screenshot_url = result["main_screenshot"].get_string();
+                        details.description = get_string_maybe_null(result["description"]);
+                        details.main_screenshot_url = get_string_maybe_null(result["main_screenshot"]);
                         details_callback(details);
                     }
                     reviews_operation = reviews->fetch_reviews(app_name,
@@ -327,16 +351,53 @@
     scopes::PreviewWidgetList widgets;
 
     scopes::PreviewWidget header("hdr", "header");
-    header.add_attribute_value("title", scopes::Variant(details.package.title));
+    header.add_attribute_value("title", scopes::Variant(result.title()));
     if (!details.publisher.empty())
     {
         header.add_attribute_value("subtitle", scopes::Variant(details.publisher));
     }
     if (!details.package.icon_url.empty())
+    {
         header.add_attribute_value("mascot", scopes::Variant(details.package.icon_url));
+    }
+
+    if (result.contains("price_area") && result.contains("rating"))
+    {
+        // Add the price and rating as attributes.
+        bool purchased = result["purchased"].get_bool();
+        std::string price_area{""};
+
+        if (details.package.price == 0.00f)
+        {
+            price_area = _("FREE");
+        }
+        else if (purchased)
+        {
+            price_area = _("✔ PURCHASED");
+        }
+        else
+        {
+            price_area =  result["price_area"].get_string();
+        }
+        scopes::VariantBuilder builder;
+        builder.add_tuple({
+                {"value", scopes::Variant(price_area)},
+            });
+        builder.add_tuple({
+                {"value", scopes::Variant("")},
+            });
+        builder.add_tuple({
+                {"value", result["rating"]},
+            });
+        builder.add_tuple({
+                {"value", scopes::Variant("")},
+            });
+        header.add_attribute_value("attributes", builder.end());
+    }
+
     widgets.push_back(header);
 
-    qDebug() << "Pushed widgets for package:" << QString::fromStdString(details.package.title);
+    qDebug() << "Pushed widgets for package:" << QString::fromStdString(details.package.name);
     return widgets;
 }
 
@@ -347,20 +408,21 @@
     {
         scopes::PreviewWidget summary("summary", "text");
         summary.add_attribute_value("title", scopes::Variant(_("Info")));
-        summary.add_attribute_value("text", scopes::Variant(details.description));
+        if (result.contains("description") && !result["description"].get_string().empty())
+        {
+            summary.add_attribute_value("text", scopes::Variant(result["description"].get_string()));
+        }
+        else
+        {
+            summary.add_attribute_value("text", scopes::Variant(details.description));
+        }
         widgets.push_back(summary);
     }
 
     if (!details.download_url.empty())
     {
-        scopes::PreviewWidget other_metadata("other_metadata", "text");
-        other_metadata.add_attribute_value("text", scopes::Variant(build_other_metadata(details)));
-        widgets.push_back(other_metadata);
-
-        scopes::PreviewWidget updates("updates", "text");
-        updates.add_attribute_value("title", scopes::Variant(_("Updates")));
-        updates.add_attribute_value("text", scopes::Variant(build_updates_table(details)));
-        widgets.push_back(updates);
+        widgets.push_back(build_other_metadata(details));
+        widgets.push_back(build_updates_table(details));
 
         scopes::PreviewWidget whats_new("whats_new", "text");
         whats_new.add_attribute_value("title", scopes::Variant(_("What's new")));
@@ -404,13 +466,29 @@
                         scopes::Variant(_("Close")));
 }
 
-scopes::PreviewWidgetList PreviewStrategy::loginErrorWidgets()
+scopes::PreviewWidgetList PreviewStrategy::loginErrorWidgets(const PackageDetails& details)
 {
-    return errorWidgets(scopes::Variant(_("Login Error")),
-                        scopes::Variant(_("Please log in to your Ubuntu One account.")),
-                        scopes::Variant(click::Preview::Actions::OPEN_ACCOUNTS),
-                        scopes::Variant(_("Go to Accounts")),
-                        scopes::Variant("settings:///system/online-accounts"));
+    auto widgets = errorWidgets(scopes::Variant(_("Login Error")),
+                                scopes::Variant(_("Please log in to your Ubuntu One account.")),
+                                scopes::Variant(click::Preview::Actions::INSTALL_CLICK),
+                                scopes::Variant(_("Go to Accounts")));
+    auto buttons = widgets.back();
+    widgets.pop_back();
+
+    scopes::VariantBuilder builder;
+    builder.add_tuple(
+        {
+            {"id", scopes::Variant(click::Preview::Actions::INSTALL_CLICK)},
+            {"label", scopes::Variant(_("Go to Accounts"))},
+            {"download_url", scopes::Variant(details.download_url)},
+            {"download_sha512", scopes::Variant(details.download_sha512)},
+        });
+    buttons.add_attribute_value("actions", builder.end());
+    oa_client.register_account_login_item(buttons,
+                                          scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
+                                          scopes::OnlineAccountClient::PostLoginAction::DoNothing);
+    widgets.push_back(buttons);
+    return widgets;
 }
 
 scopes::PreviewWidgetList PreviewStrategy::errorWidgets(const scopes::Variant& title,
@@ -497,30 +575,36 @@
     downloader->startDownload(download_url, download_sha512, result["name"].get_string(),
             [this, reply] (std::pair<std::string, click::InstallError> rc){
               // NOTE: details not needed by fooErrorWidgets, so no need to populateDetails():
+              bool login_error = false;
               switch (rc.second)
               {
-              case InstallError::CredentialsError:
-                  qWarning() << "InstallingPreview got error in getting credentials during startDownload";
-                  reply->push(loginErrorWidgets());
-                  return;
               case InstallError::DownloadInstallError:
                   qWarning() << "Error received from UDM during startDownload:" << rc.first.c_str();
                   reply->push(downloadErrorWidgets());
                   return;
+              case InstallError::CredentialsError:
+                  qWarning() << "InstallingPreview got error in getting credentials during startDownload";
+                  login_error = true;
               default:
                   std::string object_path = rc.first;
                   qDebug() << "Successfully created UDM Download.";
-                  populateDetails([this, reply, object_path](const PackageDetails &details) {
+                  populateDetails([this, reply, object_path, login_error](const PackageDetails &details) {
                           store_department(details);
-                          pushPackagePreviewWidgets(reply, details, progressBarWidget(object_path));
-                          startLauncherAnimation(details);
+                          if (login_error) {
+                              reply->push(loginErrorWidgets(details));
+                          } else {
+                              pushPackagePreviewWidgets(reply, details, progressBarWidget(object_path));
+                              startLauncherAnimation(details);
+                          }
                       },
-                      [this, reply](const ReviewList& reviewlist,
+                      [this, reply, login_error](const ReviewList& reviewlist,
                                     click::Reviews::Error error) {
-                          if (error == click::Reviews::Error::NoError) {
-                              reply->push(reviewsWidgets(reviewlist));
-                          } else {
-                              qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
+                          if (!login_error) {
+                              if (error == click::Reviews::Error::NoError) {
+                                  reply->push(reviewsWidgets(reviewlist));
+                              } else {
+                                  qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
+                              }
                           }
                           reply->finished();
                       });
@@ -800,7 +884,7 @@
     });
     builder.add_tuple({
        {"id", scopes::Variant(click::Preview::Actions::CONFIRM_UNINSTALL)},
-       {"label", scopes::Variant(_("Uninstall"))}
+       {"label", scopes::Variant(_("Confirm"))}
     });
     buttons.add_attribute_value("actions", builder.end());
     widgets.push_back(buttons);
@@ -836,45 +920,48 @@
     populateDetails([this, reply](const PackageDetails &details){
             store_department(details);
             found_details = details;
+        },
+        [this, reply](const ReviewList& reviewlist,
+                      click::Reviews::Error reviewserror) {
             std::string app_name = result["name"].get_string();
             get_downloader(nam)->get_download_progress(app_name,
-                                              [this, reply](std::string object_path){
+                                              [this, reply, reviewlist, reviewserror](std::string object_path){
                 found_object_path = object_path;
+                scopes::PreviewWidgetList button_widgets;
+                if(found_object_path.empty()) {
+                    button_widgets = uninstalledActionButtonWidgets(found_details);
+                } else {
+                    button_widgets = progressBarWidget(found_object_path);
+                }
+                pushPackagePreviewWidgets(reply, found_details, button_widgets);
+                if (reviewserror == click::Reviews::Error::NoError) {
+                    reply->push(reviewsWidgets(reviewlist));
+                } else {
+                    qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
+                }
+                reply->finished();
+                qDebug() << "---------- Finished reply for:" << result["name"].get_string().c_str();
             });
-        },
-        [this, reply](const ReviewList& reviewlist,
-                      click::Reviews::Error error) {
-            scopes::PreviewWidgetList button_widgets;
-            if(found_object_path.empty()) {
-                button_widgets = uninstalledActionButtonWidgets(found_details);
-            } else {
-                button_widgets = progressBarWidget(found_object_path);
-            }
-            pushPackagePreviewWidgets(reply, found_details, button_widgets);
-            if (error == click::Reviews::Error::NoError) {
-                reply->push(reviewsWidgets(reviewlist));
-            } else {
-                qDebug() << "There was an error getting reviews for:" << result["name"].get_string().c_str();
-            }
-            reply->finished();
-            qDebug() << "---------- Finished reply for:" << result["name"].get_string().c_str();
         });
 }
 
 scopes::PreviewWidgetList UninstalledPreview::uninstalledActionButtonWidgets(const PackageDetails &details)
 {
     scopes::PreviewWidgetList widgets;
-    if (details.package.price > double(0.00)
+    auto price = result["price"].get_double();
+    
+    if (price > double(0.00)
         && result["purchased"].get_bool() == false) {
         scopes::PreviewWidget payments("purchase", "payments");
         scopes::VariantMap tuple;
-        tuple["currency"] = "$";
-        qDebug() << "Price is" << details.package.price;
-        tuple["price"] = scopes::Variant(details.package.price);
+        tuple["currency"] = result["currency_symbol"].get_string();
+        tuple["price"] = scopes::Variant(price);
         tuple["store_item_id"] = details.package.name;
         tuple["download_url"] = details.download_url;
         tuple["download_sha512"] = details.download_sha512;
         payments.add_attribute_value("source", scopes::Variant(tuple));
+        // NOTE: No need to connect payments button to online-accounts API
+        // here, as pay-ui will take care of any login needs.
         widgets.push_back(payments);
     } else {
         scopes::PreviewWidget buttons("buttons", "actions");
@@ -887,6 +974,9 @@
                 {"download_sha512", scopes::Variant(details.download_sha512)},
             });
         buttons.add_attribute_value("actions", builder.end());
+        oa_client.register_account_login_item(buttons,
+                                              scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
+                                              scopes::OnlineAccountClient::PostLoginAction::DoNothing);
         widgets.push_back(buttons);
     }
 

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-08-26 14:21:42 +0000
+++ libclickscope/click/preview.h	2015-04-14 19:49:39 +0000
@@ -38,6 +38,7 @@
 #include <click/network_access_manager.h>
 
 #include <unity/scopes/ActionMetadata.h>
+#include <unity/scopes/OnlineAccountClient.h>
 #include <unity/scopes/PreviewQueryBase.h>
 #include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/Result.h>
@@ -136,7 +137,7 @@
     virtual scopes::PreviewWidgetList progressBarWidget(const std::string& object_path);
     virtual scopes::PreviewWidgetList reviewsWidgets(const click::ReviewList &reviewlist);
     virtual scopes::PreviewWidgetList downloadErrorWidgets();
-    virtual scopes::PreviewWidgetList loginErrorWidgets();
+    virtual scopes::PreviewWidgetList loginErrorWidgets(const PackageDetails& details);
     virtual scopes::PreviewWidgetList errorWidgets(const scopes::Variant& title,
                                                    const scopes::Variant& subtitle,
                                                    const scopes::Variant& action_id,
@@ -145,9 +146,10 @@
     virtual void pushPackagePreviewWidgets(const unity::scopes::PreviewReplyProxy &reply,
                                            const PackageDetails& details,
                                            const scopes::PreviewWidgetList& button_area_widgets);
-    virtual std::string build_other_metadata(const PackageDetails& details);
-    virtual std::string build_updates_table(const PackageDetails& details);
+    virtual scopes::PreviewWidget build_other_metadata(const PackageDetails& details);
+    virtual scopes::PreviewWidget build_updates_table(const PackageDetails& details);
     virtual std::string build_whats_new(const PackageDetails& details);
+    virtual void run_under_qt(const std::function<void ()> &task);
 
     scopes::Result result;
     QSharedPointer<click::web::Client> client;
@@ -156,6 +158,7 @@
     QSharedPointer<click::Reviews> reviews;
     click::web::Cancellable reviews_operation;
     click::web::Cancellable submit_operation;
+    scopes::OnlineAccountClient oa_client;
 };
 
 class DownloadErrorPreview : public PreviewStrategy

=== modified file 'libclickscope/click/reviews.h'
--- libclickscope/click/reviews.h	2014-05-26 14:02:45 +0000
+++ libclickscope/click/reviews.h	2015-04-14 19:49:39 +0000
@@ -72,10 +72,11 @@
     QSharedPointer<web::Client> client;
 public:
     enum class Error {NoError, CredentialsError, NetworkError};
+    Reviews() {}
     Reviews(const QSharedPointer<click::web::Client>& client);
     virtual ~Reviews();
 
-    click::web::Cancellable fetch_reviews (const std::string& package_name,
+    virtual click::web::Cancellable fetch_reviews (const std::string& package_name,
                                            std::function<void(ReviewList, Error)> callback);
     click::web::Cancellable submit_review (const Review& review,
                                            std::function<void(Error)> callback);

=== modified file 'libclickscope/click/webclient.cpp'
--- libclickscope/click/webclient.cpp	2014-08-26 15:16:25 +0000
+++ libclickscope/click/webclient.cpp	2015-04-14 19:49:39 +0000
@@ -131,9 +131,10 @@
                        doConnect();
                    });
         sc.connect(impl->sso.data(), &click::CredentialsService::credentialsNotFound,
-                   [this]() {
-                       // TODO: Need to handle and propagate error conditons.
+                   [=]() {
                        impl->sso.clear();
+                       qWarning() << "Signing reuested but no credentials found. Using unsigned URL.";
+                       doConnect();
                    });
         // TODO: Need to handle error signal once in CredentialsService.
         impl->sso->getCredentials();
@@ -169,6 +170,16 @@
                 [this](QNetworkReply::NetworkError err){errorHandler(err);});
 }
 
+bool click::web::Response::has_header(const std::string& header) const
+{
+    return reply->hasRawHeader(header.c_str());
+}
+
+std::string click::web::Response::get_header(const std::string& header) const
+{
+    return reply->rawHeader(header.c_str()).toUtf8().data();
+}
+
 void click::web::Response::replyFinished()
 {
     auto response = reply->readAll();

=== modified file 'libclickscope/click/webclient.h'
--- libclickscope/click/webclient.h	2014-06-17 13:56:26 +0000
+++ libclickscope/click/webclient.h	2015-04-14 19:49:39 +0000
@@ -78,6 +78,9 @@
     virtual void abort();
     virtual ~Response();
 
+    virtual bool has_header(const std::string& header) const;
+    virtual std::string get_header(const std::string& header) const;
+
 public slots:
     void replyFinished();
     void errorHandler(QNetworkReply::NetworkError network_error);

=== modified file 'libclickscope/tests/fake_json.cpp'
--- libclickscope/tests/fake_json.cpp	2014-08-20 20:45:48 +0000
+++ libclickscope/tests/fake_json.cpp	2015-04-14 19:49:39 +0000
@@ -56,9 +56,15 @@
                 {
                     "name": "org.example.awesomelauncher",
                     "title": "Awesome Launcher",
+                    "version": "0.83b",
                     "description": "This is an awesome launcher.",
                     "price": 1.99,
                     "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
+                    "prices": {
+                        "USD": 1.99,
+                        "EUR": 1.69,
+                        "GBP": 1.29
+                    },
                     "_links": {
                         "self": {
                             "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
@@ -216,6 +222,11 @@
 
         "framework": "None",
         "price": 1.99,
+        "prices": {
+            "USD": 1.99,
+            "EUR": 1.69,
+            "GBP": 1.29
+        },
         "license_key_path": "",
         "click_version": "0.1",
         "icon_urls": {
@@ -721,6 +732,150 @@
                               }
                           },
                           "icon": "http://example.org/media/org.example.awesomelauncher/icons/icon16.png"
+                      }
+                      ]
+                  },
+                  "_links": {
+                      "self": {
+                          "href": "https://search.apps.staging.ubuntu.com/api/v1/highlights/new-releases"
+                      }
+                  },
+                  "name": "Editor's Pick",
+                  "slug": "editors-pick"
+              }
+            ]
+          }, "has_children": true,
+              "_links": {
+                  "curies": [
+                  {
+                      "href": "https://search.apps.staging.ubuntu.com/docs/v1/relations.html{#rel}",
+                      "name": "clickindex", "templated": true
+                  }
+                  ],
+                      "self": {
+                          "href": "https://search.apps.staging.ubuntu.com/api/v1/departments/fake-department-with-subdepartments"
+                      },
+                      "collection": {
+                          "href": "https://search.apps.staging.ubuntu.com/api/v1/departments"
+                      }
+              },
+              "name": "Fake Department With Subdepartments",
+              "slug": "fake-department-with-subdepartments"
+    })";
+
+const std::string FAKE_JSON_STORE_HOME = R"(
+      {
+          "_embedded": {
+                "clickindex:package": [
+                {
+                    "publisher": "Awesome Widget Company",
+                    "name": "org.example.awesomelauncher",
+                    "title": "Awesome Launcher",
+                    "price": 1.99,
+                    "_links": {
+                        "self": {
+                            "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                        }
+                    },
+                    "icon": "http://example.org/media/org.example.awesomelauncher/icons/icon16.png"
+                },
+                {
+                    "publisher": "Awesome Widget Company",
+                    "name": "org.example.awesomewidget",
+                    "title": "Awesome Widget",
+                    "price": 1.99,
+                    "_links": {
+                        "self": {
+                            "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                        }
+                    },
+                    "icon": "http://example.org/media/org.example.awesomelauncher/icons/icon16.png"
+                },
+                {
+                    "publisher": "Awesome Widget Company",
+                    "name": "org.example.awesomescope",
+                    "title": "Awesome Scope",
+                    "price": 1.99,
+                    "content": "scope",
+                    "_links": {
+                        "self": {
+                            "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomescope"
+                        }
+                    },
+                    "icon": "http://example.org/media/org.example.awesomescope/icons/icon16.png"
+                },
+                {
+                    "publisher": "Awesome Widget Company",
+                    "name": "org.example.awesomescope2",
+                    "title": "Awesome Scope 2.0",
+                    "price": 1.99,
+                    "content": "scope",
+                    "_links": {
+                        "self": {
+                            "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomescope2"
+                        }
+                    },
+                    "icon": "http://example.org/media/org.example.awesomescope2/icons/icon16.png"
+                }
+                ],
+
+              "clickindex:department": [
+                {
+                    "has_children": false,
+                    "_links": {
+                        "self": {
+                            "href": "https://search.apps.staging.ubuntu.com/api/v1/departments/fake-subdepartment"}
+                    },
+                    "name": "Fake Subdepartment", "slug": "fake-subdepartment"}
+              ],
+              "clickindex:highlight": [
+              {
+                  "_embedded": {
+                      "clickindex:package": [
+                       {
+                            "publisher": "Awesome Widget Company",
+                            "name": "org.example.awesomelauncher",
+                            "title": "Awesome Launcher",
+                            "price": 1.99,
+                            "_links": {
+                                "self": {
+                                    "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomelauncher"}
+                             },
+                             "icon": "http://example.org/media/org.example.awesomelauncher/icons/icon16.png"
+                        },
+                      {
+                          "publisher": "Awesome Widget Company",
+                          "name": "org.example.awesomewidget",
+                          "title": "Awesome Widget", "price": 1.99,
+                          "_links": {
+                              "self": {
+                                  "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomewidget"
+                              }
+                           },
+                          "icon": "http://example.org/media/org.example.awesomewidget/icons/icon16.png"}
+                    ]
+                  },
+                  "_links": {
+                      "self": {
+                          "href": "https://search.apps.staging.ubuntu.com/api/v1/highlights/top-apps"
+                      }
+                  },
+                  "name": "Top Apps", "slug": "top-apps"
+              },
+              {
+                  "_embedded": {
+                      "clickindex:package": [
+                      {
+                          "publisher": "Awesome Widget Company",
+                          "name": "org.example.awesomelauncher",
+                          "title": "Awesome Launcher",
+                          "price": 1.99,
+                          "_links": {
+                              "self": {
+                                  "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                              }
+                          },
+                          "icon": "http://example.org/media/org.example.awesomelauncher/icons/icon16.png"
                       },
                       {
                           "publisher": "Awesome Widget Company",
@@ -738,11 +893,36 @@
                   },
                   "_links": {
                       "self": {
+                          "href": "https://search.apps.staging.ubuntu.com/api/v1/highlights/most-purchased"
+                      }
+                  },
+                  "name": "Most Purchased",
+                  "slug": "most-purchased"
+              },
+              {
+                  "_embedded": {
+                      "clickindex:package": [
+                      {
+                          "publisher": "Awesome Widget Company",
+                          "name": "org.example.awesomelauncher",
+                          "title": "Awesome Launcher",
+                          "price": 1.99,
+                          "_links": {
+                              "self": {
+                                  "href": "https://search.apps.staging.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                              }
+                          },
+                          "icon": "http://example.org/media/org.example.awesomelauncher/icons/icon16.png"
+                      }
+                      ]
+                  },
+                  "_links": {
+                      "self": {
                           "href": "https://search.apps.staging.ubuntu.com/api/v1/highlights/new-releases"
                       }
                   },
-                  "name": "New Releases",
-                  "slug": "new-releases"
+                  "name": "App of the Week",
+                  "slug": "app-of-the-week"
               }
             ]
           }, "has_children": true,

=== modified file 'libclickscope/tests/fake_json.h'
--- libclickscope/tests/fake_json.h	2014-08-20 20:45:48 +0000
+++ libclickscope/tests/fake_json.h	2015-04-14 19:49:39 +0000
@@ -44,6 +44,7 @@
 extern const std::string FAKE_JSON_BROKEN_BOOTSTRAP;
 extern const std::string FAKE_JSON_DEPARTMENTS_ONLY;
 extern const std::string FAKE_JSON_DEPARTMENT_WITH_APPS;
+extern const std::string FAKE_JSON_STORE_HOME;
 extern const std::string FAKE_JSON_BROKEN_DEPARTMENTS;
 extern const std::string FAKE_JSON_MANIFEST_REMOVABLE;
 extern const std::string FAKE_JSON_MANIFEST_NONREMOVABLE;

=== modified file 'libclickscope/tests/mock_ubuntu_download_manager.h'
--- libclickscope/tests/mock_ubuntu_download_manager.h	2014-07-07 15:09:18 +0000
+++ libclickscope/tests/mock_ubuntu_download_manager.h	2015-04-14 19:49:39 +0000
@@ -60,9 +60,14 @@
 
     MOCK_METHOD1(setDestinationDir, void(const QString& path));
     MOCK_METHOD0(metadata, QVariantMap());
+    MOCK_METHOD1(setMetadata, void(QVariantMap));
     MOCK_METHOD0(progress, qulonglong());
     MOCK_METHOD0(totalSize, qulonglong());
 
+    MOCK_CONST_METHOD0(clickPackage, QString());
+    MOCK_CONST_METHOD0(title, QString());
+    MOCK_CONST_METHOD0(showInIndicator, bool());
+
     MOCK_CONST_METHOD0(isError, bool());
     MOCK_CONST_METHOD0(error, Error*());
     MOCK_METHOD0(headers, QMap<QString, QString>());

=== modified file 'libclickscope/tests/mock_webclient.h'
--- libclickscope/tests/mock_webclient.h	2014-06-03 13:14:02 +0000
+++ libclickscope/tests/mock_webclient.h	2015-04-14 19:49:39 +0000
@@ -99,6 +99,9 @@
         const click::web::CallParams& params=click::web::CallParams()) override {
         return callImpl(iri, method, sign, headers, data, params);
     }
+
+    MOCK_METHOD1(has_header, bool(const std::string& header));
+    MOCK_METHOD1(get_header, std::string(const std::string&header));
 };
 
 }

=== modified file 'libclickscope/tests/test_bootstrap.cpp'
--- libclickscope/tests/test_bootstrap.cpp	2014-08-21 21:15:13 +0000
+++ libclickscope/tests/test_bootstrap.cpp	2015-04-14 19:49:39 +0000
@@ -182,25 +182,59 @@
         auto highlights = click::Highlight::from_json_root_node(root);
         EXPECT_EQ(5u, highlights.size());
         auto it = highlights.begin();
-        EXPECT_EQ("Top Apps", it->name());
-        EXPECT_EQ(2u, it->packages().size());
-        EXPECT_EQ(false, it->contains_scopes());
-        ++it;
-        EXPECT_EQ("Most Purchased", it->name());
-        EXPECT_EQ(2u, it->packages().size());
-        EXPECT_EQ(false, it->contains_scopes());
-        ++it;
-        EXPECT_EQ("New Releases", it->name());
-        EXPECT_EQ(2u, it->packages().size());
-        EXPECT_EQ(false, it->contains_scopes());
-        ++it;
-        EXPECT_EQ("Apps", it->name());
-        EXPECT_EQ(2u, it->packages().size());
-        EXPECT_EQ(false, it->contains_scopes());
-        ++it;
-        EXPECT_EQ("Scopes", it->name());
-        EXPECT_EQ(2u, it->packages().size());
-        EXPECT_EQ(true, it->contains_scopes());
+        EXPECT_EQ("Editor's Pick", it->name());
+        EXPECT_EQ(1u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Top Apps", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Most Purchased", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Scopes", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(true, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Apps", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
+    }
+
+}
+
+TEST_F(BootstrapTest, testStoreHomeAppOfTheWeek)
+{
+    Json::Reader reader;
+    Json::Value root;
+
+    EXPECT_TRUE(reader.parse(FAKE_JSON_STORE_HOME, root));
+
+    {
+        auto highlights = click::Highlight::from_json_root_node(root);
+        EXPECT_EQ(5u, highlights.size());
+        auto it = highlights.begin();
+        EXPECT_EQ("App of the Week", it->name());
+        EXPECT_EQ(1u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Top Apps", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Most Purchased", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Scopes", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(true, it->contains_scopes());
+        ++it;
+        EXPECT_EQ("Apps", it->name());
+        EXPECT_EQ(2u, it->packages().size());
+        EXPECT_EQ(false, it->contains_scopes());
     }
 
 }

=== modified file 'libclickscope/tests/test_configuration.cpp'
--- libclickscope/tests/test_configuration.cpp	2014-07-31 19:15:59 +0000
+++ libclickscope/tests/test_configuration.cpp	2015-04-14 19:49:39 +0000
@@ -242,5 +242,37 @@
 TEST(Configuration, getPurchasesEnabledDefault)
 {
     ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
-    ASSERT_EQ(false, Configuration().get_purchases_enabled());
+    ASSERT_EQ(true, Configuration().get_purchases_enabled());
+}
+
+TEST(Configuration, getCurrencyDefault)
+{
+    ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
+    EXPECT_EQ("USD", Configuration().get_currency());
+}
+
+TEST(Configuration, getCurrencyFallback)
+{
+    ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
+    EXPECT_EQ("HKD", Configuration().get_currency("HKD"));
+}
+
+TEST(Configuration, getCurrencyFallbackUnknown)
+{
+    ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
+    EXPECT_EQ("USD", Configuration().get_currency("not_valid"));
+}
+
+TEST(Configuration, getCurrencyOverride)
+{
+    ASSERT_EQ(setenv(Configuration::CURRENCY_ENVVAR, "TWD", 1), 0);
+    EXPECT_EQ("TWD", Configuration().get_currency());
+    ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
+}
+
+TEST(Configuration, getCurrencyOverrideUnknown)
+{
+    ASSERT_EQ(setenv(Configuration::CURRENCY_ENVVAR, "not_valid", 1), 0);
+    EXPECT_EQ("USD", Configuration().get_currency());
+    ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
 }

=== modified file 'libclickscope/tests/test_departments-db.cpp'
--- libclickscope/tests/test_departments-db.cpp	2014-08-07 15:34:47 +0000
+++ libclickscope/tests/test_departments-db.cpp	2015-04-14 19:49:39 +0000
@@ -188,10 +188,10 @@
     }
     {
         auto depts = db->get_children_departments("games");
-        EXPECT_EQ(2u, depts.size());
+        EXPECT_EQ(3u, depts.size());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("rpg", false)) != depts.end());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("fps", false)) != depts.end());
-        EXPECT_FALSE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
+        EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
     }
 }
 

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2014-08-18 21:36:01 +0000
+++ libclickscope/tests/test_interface.cpp	2015-04-14 19:49:39 +0000
@@ -55,11 +55,11 @@
 static const std::vector<click::Application> non_desktop_applications =
 {
     {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0,
-        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", "", ""},
+        "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "An awesome Stock Ticker application with all the features you could imagine", "", ""},
     {"", "Weather", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.weather/./weather64.png", "application:///com.ubuntu.weather_weather_1.0.168.desktop", "", "", ""},
     {"com.ubuntu.developer.webapps.webapp-twitter", "Twitter", 0.0,
         "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-twitter/./twitter.png", "application:///com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop", "", "", ""},
-    {"com.ubuntu.music", "Music", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music/images/music.png", "application:///com.ubuntu.music_music_1.1.329.desktop", "", "", ""},
+    {"com.ubuntu.music", "Music", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music/images/music.png", "application:///com.ubuntu.music_music_1.1.329.desktop", "Ubuntu Touch Music Player", "", ""},
     {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", "", ""},
     {"com.ubuntu.dropping-letters", "Dropping Letters", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.dropping-letters/dropping-letters.png", "application:///com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43.desktop", "", "", ""},
     {"com.ubuntu.developer.webapps.webapp-gmail", "Gmail", 0.0,
@@ -72,7 +72,7 @@
     {"com.ubuntu.shorts", "Shorts", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.shorts/./rssreader64.png", "application:///com.ubuntu.shorts_shorts_0.2.162.desktop", "", "", ""},
     {"com.ubuntu.filemanager", "File Manager", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.filemanager/./filemanager64.png", "application:///com.ubuntu.filemanager_filemanager_0.1.1.97.desktop", "", "", ""},
     {"com.ubuntu.calculator", "Calculator", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/./calculator64.png", "application:///com.ubuntu.calculator_calculator_0.1.3.206.desktop", "", "", ""},
-    {"com.ubuntu.sudoku", "Sudoku", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku/SudokuGameIcon.png", "application:///com.ubuntu.sudoku_sudoku_1.0.142.desktop", "", "", ""},
+    {"com.ubuntu.sudoku", "Sudoku", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku/SudokuGameIcon.png", "application:///com.ubuntu.sudoku_sudoku_1.0.142.desktop", "Sudoku Game for Ubuntu Touch", "", ""},
     {"com.ubuntu.developer.webapps.webapp-ebay", "eBay", 0.0,
         "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ebay/./ebay.png", "application:///com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8.desktop", "", "", ""},
     {"com.ubuntu.developer.webapps.webapp-facebook", "Facebook", 0.0,
@@ -250,7 +250,7 @@
     const std::vector<click::Application> expected_results = {
         {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", "", ""},
         {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0,
-            "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", "", ""},
+            "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "An awesome Stock Ticker application with all the features you could imagine", "", ""},
     };
     EXPECT_EQ(expected_results, results);
 }

=== modified file 'libclickscope/tests/test_package.cpp'
--- libclickscope/tests/test_package.cpp	2014-08-05 19:00:03 +0000
+++ libclickscope/tests/test_package.cpp	2015-04-14 19:49:39 +0000
@@ -84,3 +84,30 @@
     ASSERT_EQ(1, pl.size());
 }
 
+TEST_F(PackageTest, testPackageParsesMultiplePrices)
+{
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_ONE, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages pl = package_list_from_json_node(ci_package);
+    ASSERT_EQ(3, pl[0].prices.size());
+}
+
+TEST_F(PackageTest, testPackageParsesVersion)
+{
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_ONE, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages pl = package_list_from_json_node(ci_package);
+    ASSERT_EQ("0.83b", pl[0].version);
+}
+
+TEST_F(PackageTest, testPackageDetailsParsesMultiplePrices)
+{
+    auto details = PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS);
+    ASSERT_EQ(3, details.package.prices.size());
+}

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2014-08-25 19:21:32 +0000
+++ libclickscope/tests/test_preview.cpp	2015-04-14 19:49:39 +0000
@@ -33,6 +33,9 @@
 #include <gtest/gtest.h>
 #include <click/preview.h>
 #include <fake_json.h>
+#include <click/index.h>
+#include <click/reviews.h>
+#include <boost/locale/time_zone.hpp>
 
 using namespace ::testing;
 using namespace unity::scopes;
@@ -46,23 +49,57 @@
 
 };
 
+class FakeIndex : public click::Index
+{
+public:
+    FakeIndex() {
+
+    }
+    click::web::Cancellable get_details(const std::string& /*package_name*/, std::function<void(click::PackageDetails, Error)> callback) override {
+        callback(click::PackageDetails(), Error::NetworkError);
+        return click::web::Cancellable();
+    }
+
+};
+
+class FakeReviews : public click::Reviews
+{
+public:
+    FakeReviews() {
+
+    }
+
+    click::web::Cancellable fetch_reviews(const std::string &/*package_name*/, std::function<void (click::ReviewList, Error)> callback) override {
+        callback(click::ReviewList(), Error::NoError);
+        return click::web::Cancellable();
+    }
+};
+
 class FakePreview : public click::PreviewStrategy
 {
 public:
     FakePreview(Result& result) : click::PreviewStrategy::PreviewStrategy(result)
     {
-
+        index.reset(new FakeIndex());
+        reviews.reset(new FakeReviews());
     }
 
     void run(const PreviewReplyProxy &/*reply*/)
     {
 
     }
+
+    void run_under_qt(const std::function<void()> &task) {
+        // when testing, do not actually run under qt
+        task();
+    }
+
     using click::PreviewStrategy::screenshotsWidgets;
     using click::PreviewStrategy::descriptionWidgets;
     using click::PreviewStrategy::build_other_metadata;
     using click::PreviewStrategy::build_updates_table;
     using click::PreviewStrategy::build_whats_new;
+    using click::PreviewStrategy::populateDetails;
 };
 
 class PreviewsBaseTest : public Test
@@ -103,6 +140,19 @@
     ASSERT_EQ(sources[2].get_string(), "sshot3");
 }
 
+TEST_F(PreviewStrategyTest, testEmptyResults)
+{
+    FakeResult result{vm};
+    result["name"] = "fake name";
+    FakePreview preview{result};
+    preview.populateDetails(
+                [](const click::PackageDetails &){
+                },
+                [](const click::ReviewList&, click::Reviews::Error){
+                });
+
+}
+
 class PreviewStrategyDescriptionTest : public PreviewStrategyTest
 {
 public:
@@ -121,20 +171,38 @@
         auto attributes = widget->attribute_values();
         ASSERT_EQ(expected_value, attributes[attribute_name].get_string());
     }
+    void assertWidgetNestedVariantArray(int n, int x, std::string expected_title, std::string expected_value)
+    {
+        auto widget = std::next(widgets.begin(), n);
+        auto attributes = widget->attribute_values();
+        auto found_title = attributes["values"].get_array()[x].get_array()[0].get_string();
+        ASSERT_EQ(found_title, expected_title);
+        auto found_value = attributes["values"].get_array()[x].get_array()[1].get_string();
+        ASSERT_EQ(found_value, expected_value);
+    }
 };
 
 TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsFull)
 {
+    boost::locale::time_zone::global("UTC");
     details = click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS);
     widgets = preview.descriptionWidgets(details);
 
     assertWidgetAttribute(0, "title", "Info");
     assertWidgetAttribute(0, "text", details.description);
 
-    assertWidgetAttribute(1, "text", preview.build_other_metadata(details));
+    assertWidgetNestedVariantArray(1, 0, "Publisher/Creator", "Fake Publisher");
+    assertWidgetNestedVariantArray(1, 1, "Seller", "Fake Company");
+    assertWidgetNestedVariantArray(1, 2, "Website", "http://example.com");
+    assertWidgetNestedVariantArray(1, 3, "Contact", "http://example.com/support");
+    assertWidgetNestedVariantArray(1, 4, "License", "Proprietary");
 
     assertWidgetAttribute(2, "title", "Updates");
-    assertWidgetAttribute(2, "text", preview.build_updates_table(details));
+    assertWidgetNestedVariantArray(2, 0, "Version number", "0.2");
+
+    assertWidgetNestedVariantArray(2, 1, "Last updated", "Jul 3, 2014");
+    assertWidgetNestedVariantArray(2, 2, "First released", "Nov 4, 2013");
+    assertWidgetNestedVariantArray(2, 3, "Size", "173.4 KiB");
 
     assertWidgetAttribute(3, "title", "What's new");
     assertWidgetAttribute(3, "text", preview.build_whats_new(details));
@@ -244,6 +312,7 @@
 
 class FakeDownloader : public click::Downloader {
     std::string object_path;
+    std::function<void (std::string)> callback;
 public:
     FakeDownloader(const std::string& object_path, const QSharedPointer<click::network::AccessManager>& networkAccessManager)
         : click::Downloader(networkAccessManager), object_path(object_path)
@@ -252,6 +321,11 @@
     }
     void get_download_progress(std::string /*package_name*/, const std::function<void (std::string)> &callback)
     {
+        this->callback = callback;
+    }
+
+    void activate_callback()
+    {
         callback(object_path);
     }
 };
@@ -259,19 +333,21 @@
 class FakeUninstalledPreview : public click::UninstalledPreview {
     std::string object_path;
 public:
+    std::unique_ptr<FakeDownloader> fake_downloader;
     FakeUninstalledPreview(const std::string& object_path,
                            const unity::scopes::Result& result,
                            const QSharedPointer<click::web::Client>& client,
                            const std::shared_ptr<click::DepartmentsDb>& depts,
                            const QSharedPointer<click::network::AccessManager>& nam)
-        : click::UninstalledPreview(result, client, depts, nam), object_path(object_path)
+        : click::UninstalledPreview(result, client, depts, nam), object_path(object_path),
+          fake_downloader(new FakeDownloader(object_path, nam))
     {
 
     }
 
-    virtual click::Downloader* get_downloader(const QSharedPointer<click::network::AccessManager> &nam)
+    virtual click::Downloader* get_downloader(const QSharedPointer<click::network::AccessManager> &/*nam*/)
     {
-        return new FakeDownloader(object_path, nam);
+        return fake_downloader.get();
     }
 
     void populateDetails(std::function<void (const click::PackageDetails &)> details_callback,
@@ -294,6 +370,7 @@
             .Times(1)
             .WillOnce(Return(response));
     preview.run(replyptr);
+    preview.fake_downloader->activate_callback();
 }
 
 TEST_F(UninstalledPreviewTest, testNoDownloadProgress) {
@@ -306,4 +383,5 @@
             .Times(1)
             .WillOnce(Return(response));
     preview.run(replyptr);
+    preview.fake_downloader->activate_callback();
 }

=== modified file 'libclickscope/tests/test_webclient.cpp'
--- libclickscope/tests/test_webclient.cpp	2014-08-11 15:38:12 +0000
+++ libclickscope/tests/test_webclient.cpp	2015-04-14 19:49:39 +0000
@@ -45,10 +45,10 @@
     return arg.url().toString() == refUrl;
 }
 
-MATCHER_P(IsValidOAuthHeader, refOAuth, "")
+MATCHER_P(IsValidOAuthHeader, valid, "")
 {
-    return arg.hasRawHeader(click::web::AUTHORIZATION_HEADER.c_str()) && arg.rawHeader(click::web::AUTHORIZATION_HEADER.c_str())
-        .startsWith("OAuth ");
+    return (arg.hasRawHeader(click::web::AUTHORIZATION_HEADER.c_str()) &&
+            arg.rawHeader(click::web::AUTHORIZATION_HEADER.c_str()).startsWith("OAuth ")) == valid;
 }
 
 MATCHER_P(IsCorrectAcceptLanguageHeader, refAcceptLanguages, "")
@@ -226,7 +226,7 @@
                                        "consumer_key", "consumer_secret");
                 sso.credentialsFound(token);
             }));
-    EXPECT_CALL(nam, sendCustomRequest(IsValidOAuthHeader(""), _, _))
+    EXPECT_CALL(nam, sendCustomRequest(IsValidOAuthHeader(true), _, _))
             .Times(1)
             .WillOnce(Return(replyPtr));
 
@@ -264,13 +264,19 @@
 {
     using namespace ::testing;
 
+    auto reply = new NiceMock<MockNetworkReply>();
+    ON_CALL(*reply, readAll()).WillByDefault(Return("HOLA"));
+    QSharedPointer<click::network::Reply> replyPtr(reply);
+
     click::web::Client wc(namPtr);
     wc.setCredentialsService(ssoPtr);
 
     EXPECT_CALL(sso, getCredentials()).WillOnce(Invoke([&]() {
                 sso.credentialsNotFound();
             }));
-    EXPECT_CALL(nam, sendCustomRequest(_, _, _)).Times(0);
+    EXPECT_CALL(nam, sendCustomRequest(IsValidOAuthHeader(false), _, _))
+        .Times(1)
+        .WillOnce(Return(replyPtr));
 
     auto wr = wc.call(FAKE_SERVER + FAKE_PATH,
                       "HEAD", true);

=== modified file 'po/unity-scope-click.pot'
--- po/unity-scope-click.pot	2014-08-19 21:20:18 +0000
+++ po/unity-scope-click.pot	2015-04-14 19:49:39 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-19 17:19-0400\n"
+"POT-Creation-Date: 2014-09-25 12:59-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -31,7 +31,7 @@
 msgid "Search store"
 msgstr ""
 
-#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:122
 #: ../scope/clickapps/apps-query.cpp:159
 msgid "Apps"
 msgstr ""
@@ -44,120 +44,123 @@
 msgid "Search apps"
 msgstr ""
 
-#: ../libclickscope/click/highlights.cpp:119
+#: ../libclickscope/click/highlights.cpp:125
 msgid "Scopes"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:58
-msgid "Info"
-msgstr ""
-
-#: ../libclickscope/click/preview.cpp:59
-msgid "Updates"
-msgstr ""
-
-#: ../libclickscope/click/preview.cpp:60
-msgid "What's new"
-msgstr ""
-
-#: ../libclickscope/click/preview.cpp:229
+#: ../libclickscope/click/preview.cpp:225
 msgid "Publisher/Creator"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:230
+#: ../libclickscope/click/preview.cpp:226
 msgid "Seller"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:231
+#: ../libclickscope/click/preview.cpp:227
 msgid "Website"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:232
+#: ../libclickscope/click/preview.cpp:228
 msgid "Contact"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:233
+#: ../libclickscope/click/preview.cpp:229
 msgid "License"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:241
+#: ../libclickscope/click/preview.cpp:237
 msgid "Version number"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:242
+#: ../libclickscope/click/preview.cpp:238
 msgid "Last updated"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:243
+#: ../libclickscope/click/preview.cpp:239
 msgid "First released"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:244
+#: ../libclickscope/click/preview.cpp:240
 msgid "Size"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:252
+#: ../libclickscope/click/preview.cpp:248
 msgid "Version"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:383
+#: ../libclickscope/click/preview.cpp:349
+msgid "Info"
+msgstr ""
+
+#: ../libclickscope/click/preview.cpp:361
+msgid "Updates"
+msgstr ""
+
+#: ../libclickscope/click/preview.cpp:366
+msgid "What's new"
+msgstr ""
+
+#: ../libclickscope/click/preview.cpp:382
 msgid "Reviews"
 msgstr ""
 
+#: ../libclickscope/click/preview.cpp:401
+msgid "Download Error"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:402
-msgid "Download Error"
-msgstr ""
-
-#: ../libclickscope/click/preview.cpp:403
 msgid "Download or install failed. Please try again."
 msgstr ""
 
 #. TODO see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:405
+#: ../libclickscope/click/preview.cpp:404
 msgid "Close"
 msgstr ""
 
+#: ../libclickscope/click/preview.cpp:409
+msgid "Login Error"
+msgstr ""
+
 #: ../libclickscope/click/preview.cpp:410
-msgid "Login Error"
-msgstr ""
-
-#: ../libclickscope/click/preview.cpp:411
 msgid "Please log in to your Ubuntu One account."
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:413
+#: ../libclickscope/click/preview.cpp:412
 msgid "Go to Accounts"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:646
+#: ../libclickscope/click/preview.cpp:645
 msgid "Open"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:649
-#: ../libclickscope/click/preview.cpp:733
+#: ../libclickscope/click/preview.cpp:648
+#: ../libclickscope/click/preview.cpp:732
 msgid "Search"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:667
-#: ../libclickscope/click/preview.cpp:804
+#: ../libclickscope/click/preview.cpp:666
 msgid "Uninstall"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:788
+#: ../libclickscope/click/preview.cpp:787
 msgid "Confirmation"
 msgstr ""
 
 #. TRANSLATORS: Do NOT translate ${title} here.
-#: ../libclickscope/click/preview.cpp:791
+#: ../libclickscope/click/preview.cpp:790
 msgid "Uninstall ${title}?"
 msgstr ""
 
 #. TODO: see bug LP: #1289434
-#: ../libclickscope/click/preview.cpp:800
+#: ../libclickscope/click/preview.cpp:799
 msgid "Cancel"
 msgstr ""
 
-#: ../libclickscope/click/preview.cpp:866
+#: ../libclickscope/click/preview.cpp:803
+msgid "Confirm"
+msgstr ""
+
+#: ../libclickscope/click/preview.cpp:885
 msgid "Install"
 msgstr ""
 
@@ -181,35 +184,35 @@
 msgstr ""
 
 #: ../scope/clickapps/apps-query.cpp:315
-#: ../scope/clickstore/store-query.cpp:244
-#: ../scope/clickstore/store-query.cpp:255
-#: ../scope/clickstore/store-query.cpp:467
+#: ../scope/clickstore/store-query.cpp:269
+#: ../scope/clickstore/store-query.cpp:280
+#: ../scope/clickstore/store-query.cpp:517
 msgid "All"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:297
+#: ../scope/clickstore/store-query.cpp:311
+msgid "FREE"
+msgstr ""
+
+#: ../scope/clickstore/store-query.cpp:329
 msgid "✔ INSTALLED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:302
+#: ../scope/clickstore/store-query.cpp:334
 msgid "✔ PURCHASED"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:310
-msgid "FREE"
-msgstr ""
-
-#: ../scope/clickstore/store-query.cpp:427
+#: ../scope/clickstore/store-query.cpp:477
 msgid "Available"
 msgstr ""
 
-#: ../scope/clickstore/store-query.cpp:433
+#: ../scope/clickstore/store-query.cpp:483
 #, c-format
 msgid "%u result in Ubuntu Store"
 msgid_plural "%u results in Ubuntu Store"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../scope/clickstore/store-query.cpp:443
+#: ../scope/clickstore/store-query.cpp:493
 msgid "Recommended"
 msgstr ""

=== modified file 'scope/clickstore/pay.cpp'
--- scope/clickstore/pay.cpp	2014-07-17 15:35:17 +0000
+++ scope/clickstore/pay.cpp	2015-04-14 19:49:39 +0000
@@ -31,11 +31,16 @@
 
 #include <future>
 
+#include <json/reader.h>
+#include <json/value.h>
+
 #include <glib.h>
 #include <libpay/pay-package.h>
 
 #include <QDebug>
 
+namespace json = Json;
+
 struct pay::Package::Private
 {
     Private()
@@ -76,8 +81,13 @@
 
 namespace pay {
 
-Package::Package() :
-    impl(new Private())
+bool operator==(const Purchase& lhs, const Purchase& rhs) {
+    return lhs.name == rhs.name && lhs.refundable_until == rhs.refundable_until;
+}
+
+Package::Package(const QSharedPointer<click::web::Client>& client) :
+    impl(new Private()),
+    client(client)
 {
 }
 
@@ -125,6 +135,64 @@
     return false;
 }
 
+time_t parse_timestamp(json::Value v)
+{
+    if (v.isNull()) {
+        return 0;
+    }
+
+    QDateTime when = QDateTime::fromString(QString::fromStdString(v.asString()), Qt::ISODate);
+    when.setTimeSpec(Qt::OffsetFromUTC);
+
+    return when.toTime_t();
+}
+
+
+click::web::Cancellable Package::get_purchases(std::function<void(const PurchaseSet&)> callback)
+{
+    QSharedPointer<click::CredentialsService> sso(new click::CredentialsService());
+    client->setCredentialsService(sso);
+
+    QSharedPointer<click::web::Response> response = client->call
+        (get_base_url() + pay::API_ROOT + pay::PURCHASES_API_PATH, "GET", true);
+
+    QObject::connect(response.data(), &click::web::Response::finished,
+                     [=](QString reply) {
+                         PurchaseSet purchases;
+                         json::Reader reader;
+                         json::Value root;
+
+                         if (reader.parse(reply.toUtf8().constData(), root)) {
+                             for (uint i = 0; i < root.size(); i++) {
+                                 const json::Value item = root[i];
+                                 if (item[JsonKeys::state].asString() == PURCHASE_STATE_COMPLETE) {
+                                     auto package_name = item[JsonKeys::package_name].asString();
+                                     auto refundable_until_value = item[JsonKeys::refundable_until];
+                                     Purchase p(package_name, parse_timestamp(refundable_until_value));
+                                     purchases.insert(p);
+                                 }
+                             }
+                         }
+                         callback(purchases);
+                     });
+    QObject::connect(response.data(), &click::web::Response::error,
+                     [=](QString) {
+                         qWarning() << "Network error getting purchases.";
+                         callback(PurchaseSet());
+                     });
+
+    return click::web::Cancellable(response);
+}
+
+std::string Package::get_base_url()
+{
+    const char *env_url = getenv(pay::BASE_URL_ENVVAR);
+    if (env_url != NULL) {
+        return env_url;
+    }
+    return pay::BASE_URL;
+}
+
 void Package::setup_pay_service()
 {
     impl->pay_package = pay_package_new(Package::NAME);

=== modified file 'scope/clickstore/pay.h'
--- scope/clickstore/pay.h	2014-07-17 15:35:17 +0000
+++ scope/clickstore/pay.h	2015-04-14 19:49:39 +0000
@@ -30,34 +30,86 @@
 #ifndef _PAY_H_
 #define _PAY_H_
 
+#include <click/webclient.h>
+
+#include <ctime>
 #include <map>
 #include <memory>
+#include <unordered_set>
 
 
 namespace pay
 {
+    struct Purchase
+    {
+        std::string name;
+        time_t refundable_until;
+
+        Purchase() = default;
+        Purchase(const std::string &name) : name(name), refundable_until(0)
+        {
+        }
+
+        Purchase(const std::string& name, time_t refundable_until) :
+            name(name), refundable_until(refundable_until)
+        {
+        }
+
+        struct hash_name {
+        public :
+            size_t operator()(const Purchase &purchase ) const
+            {
+                return std::hash<std::string>()(purchase.name);
+            }
+        };
+
+    };
+
+    bool operator==(const Purchase& lhs, const Purchase& rhs);
+
+    typedef std::unordered_set<Purchase, Purchase::hash_name> PurchaseSet;
+
+    typedef std::function<void(const std::string& item_id,
+                               bool status)> StatusFunction;
+
+    constexpr static const char* BASE_URL_ENVVAR{"PAY_BASE_URL"};
+    constexpr static const char* BASE_URL{"https://software-center.ubuntu.com"};
+    constexpr static const char* API_ROOT{"/api/2.0/click/"};
+    constexpr static const char* PURCHASES_API_PATH{"purchases/"};
+    constexpr static const char* PURCHASE_STATE_COMPLETE{"Complete"};
+
+    struct JsonKeys
+    {
+        JsonKeys() = delete;
+
+        constexpr static const char* package_name{"package_name"};
+        constexpr static const char* refundable_until{"refundable_until"};
+        constexpr static const char* state{"state"};
+    };
+
     class Package
     {
     public:
-        typedef std::function<void(const std::string& item_id,
-                                   bool status)> StatusFunction;
-
         constexpr static const char* NAME{"click-scope"};
 
-        Package();
+        Package() = default;
+        Package(const QSharedPointer<click::web::Client>& client);
         virtual ~Package();
 
         virtual bool verify(const std::string& pkg_name);
+        virtual click::web::Cancellable get_purchases(std::function<void(const PurchaseSet& purchased_apps)> callback);
+
+        static std::string get_base_url();
 
     protected:
         virtual void setup_pay_service();
         virtual void pay_package_verify(const std::string& pkg_name);
 
-    private:
         struct Private;
         std::shared_ptr<pay::Package::Private> impl;
 
         bool running = false;
+        QSharedPointer<click::web::Client> client;
     public:
         std::map<std::string, StatusFunction> callbacks;
     };

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-08-28 19:35:41 +0000
+++ scope/clickstore/store-query.cpp	2015-04-14 19:49:39 +0000
@@ -163,6 +163,7 @@
     click::HighlightList& highlights;
     scopes::SearchMetadata meta;
     click::web::Cancellable search_operation;
+    click::web::Cancellable purchases_operation;
     pay::Package& pay_package;
 };
 
@@ -223,62 +224,40 @@
     });
 }
 
-//
-// creates department menu with narrowed-down list of subdepartments of current department, as
-// returned by server call
-void click::Query::populate_departments(const click::DepartmentList& subdepts, const std::string& current_dep_id, unity::scopes::Department::SPtr &root)
+unity::scopes::Department::SPtr click::Query::fromClickDepartment(const click::Department::SCPtr click_dept, const std::string& current_dept_id, const click::DepartmentList& subdepts)
 {
+    const std::locale loc("");
+    unity::scopes::Department::SPtr dep = unity::scopes::Department::create(click_dept->id(), query(), click_dept->name());
+    if (click_dept->has_children_flag())
+    {
+        dep->set_has_subdepartments();
+    }
     unity::scopes::DepartmentList departments;
 
-    // create a list of subdepartments of current department
-    foreach (auto d, subdepts)
+    // subdepts is a list of subdepartments of current department fetched from the Store for current search; if we encountered current department in the tree,
+    // insert the list from the server rather than the one from internal cache.
+    for (auto click_subdep: (click_dept->id() == current_dept_id ? subdepts : click_dept->sub_departments()))
     {
-        unity::scopes::Department::SPtr department = unity::scopes::Department::create(d->id(), query(), d->name());
-        if (d->has_children_flag())
-        {
-            department->set_has_subdepartments();
-        }
-        departments.push_back(department);
+        departments.push_back(fromClickDepartment(click_subdep, current_dept_id, subdepts));
     }
-
-    const std::locale loc("");
     departments.sort([&loc](const unity::scopes::Department::SCPtr &d1, const unity::scopes::Department::SCPtr &d2) -> bool {
             return loc(d1->label(), d2->label()) > 0;
-            });
-
-    if (current_dep_id != "")
-    {
-        auto curr_dpt = impl->department_lookup.get_department_info(current_dep_id);
-        if (curr_dpt != nullptr)
-        {
-            unity::scopes::Department::SPtr current = unity::scopes::Department::create(current_dep_id, query(), curr_dpt->name());
-            if (departments.size() > 0) // this may be a leaf department
-            {
-                current->set_subdepartments(departments);
-            }
-
-            auto parent_info = impl->department_lookup.get_parent(current_dep_id);
-            if (parent_info != nullptr)
-            {
-                root = unity::scopes::Department::create(parent_info->id(), query(), parent_info->name());
-                root->set_subdepartments({current});
-                return;
-            }
-            else
-            {
-                root = unity::scopes::Department::create("", query(), _("All"));
-                root->set_subdepartments({current});
-                return;
-            }
-        }
-        else
-        {
-            qWarning() << "Unknown department:" << QString::fromStdString(current_dep_id);
-        }
-    }
-
-    root = unity::scopes::Department::create("", query(), _("All"));
-    root->set_subdepartments(departments);
+    });
+    dep->set_subdepartments(departments);
+
+    return dep;
+}
+
+//
+// creates department menu with narrowed-down list of subdepartments of current department, as
+// returned by server call
+unity::scopes::Department::SPtr click::Query::populate_departments(const click::DepartmentList& subdepts, const std::string& current_dep_id)
+{
+    // Return complete departments tree (starting from 'All') every time, rather than only parent - current - children; this is the only
+    // way we can display siblings corrctly when navigating from Apps scope straight into a subdepartment of Store - see LP #1343242.
+    // For currently visible department include its subdepartments as returned for current search by the server (subdepts) -
+    // all others are constructed from the department lookup.
+    return fromClickDepartment(impl->department_lookup.get_department_info(""), current_dep_id, subdepts);
 }
 
 // recursively store all departments in the departments database
@@ -315,13 +294,26 @@
         std::string rating{ss.str()};
 
         bool purchased = false;
-        if (pkg.price > 0.00f) {
+        double cur_price{0.00};
+        auto suggested = impl->index.get_suggested_currency();
+        std::string currency = Configuration::get_currency(suggested);
+        if (pkg.prices.count(currency) == 1) {
+            cur_price = pkg.prices.at(currency);
+        } else {
+            // NOTE: This is decprecated. Here for compatibility.
+            currency = Configuration::CURRENCY_DEFAULT;
+            cur_price = pkg.price;
+        }
+        res["price"] = scopes::Variant(cur_price);
+        res[click::Query::ResultKeys::VERSION] = pkg.version;
+
+        if (cur_price > 0.00f) {
             if (!Configuration::get_purchases_enabled()) {
                 // Don't show priced apps if flag not set
                 return;
             }
             // Check if the priced app was already purchased.
-            purchased = impl->pay_package.verify(pkg.name);
+            purchased = purchased_apps.count({pkg.name}) != 0;
         }
         if (installed != installedPackages.end()) {
             res[click::Query::ResultKeys::INSTALLED] = true;
@@ -335,12 +327,18 @@
         } else {
             res[click::Query::ResultKeys::INSTALLED] = false;
             res[click::Query::ResultKeys::PURCHASED] = false;
-            if (pkg.price > 0.00f) {
+            if (cur_price > 0.00f) {
                 QLocale locale;
-                price = locale.toCurrencyString(pkg.price, "$").toUtf8().data();
+                auto symbol = Configuration::CURRENCY_MAP.at(currency);
+                price = locale.toCurrencyString(cur_price,
+                                                symbol.c_str()).toUtf8().data();
+                res["currency_symbol"] = symbol;
             }
         }
 
+        res["price_area"] = price;
+        res["rating"] = rating;
+
         // Add the price and rating as attributes.
         scopes::VariantBuilder builder;
         builder.add_tuple({
@@ -359,7 +357,7 @@
 
         this->push_result(searchReply, res);
     } catch(const std::exception& e){
-        qDebug() << "PackageDetails::loadJson: Exception thrown while decoding JSON: " << e.what() ;
+        qCritical() << "push_package: Exception: " << e.what() ;
     } catch(...){
         qDebug() << "no reason to catch";
     }
@@ -427,9 +425,8 @@
 
     if (query().department_id() == "") // top-level departments
     {
-        unity::scopes::Department::SPtr root;
         auto subdepts = curdep->sub_departments();
-        populate_departments(subdepts, query().department_id(), root);
+        auto root = populate_departments(subdepts, query().department_id());
         push_departments(searchReply, root);
 
         qDebug() << "pushing cached highlights";
@@ -445,8 +442,7 @@
                     if (error == click::Index::Error::NoError)
                     {
                         qDebug() << "departments call completed";
-                        unity::scopes::Department::SPtr root;
-                        populate_departments(depts, query().department_id(), root);
+                        auto root = populate_departments(depts, query().department_id());
                         push_departments(searchReply, root);
                         push_highlights(searchReply, highlights, locallyInstalledApps);
                     }
@@ -589,6 +585,17 @@
     if (q.empty()) {
         categoryTemplate = CATEGORY_APPS_DISPLAY;
     }
+    if (Configuration::get_purchases_enabled()) {
+        std::promise<pay::PurchaseSet> purchased_promise;
+        std::future<pay::PurchaseSet> purchased_future = purchased_promise.get_future();
+        qDebug() << "Getting list of purchased apps.";
+        run_under_qt([this, &purchased_promise]() {
+                impl->purchases_operation = impl->pay_package.get_purchases([&purchased_promise](const pay::PurchaseSet& purchases) {
+                        purchased_promise.set_value(purchases);
+                    });
+            });
+        purchased_apps = purchased_future.get();
+    }
 
     add_available_apps(searchReply, get_installed_packages(), categoryTemplate);
 }

=== modified file 'scope/clickstore/store-query.h'
--- scope/clickstore/store-query.h	2014-08-11 18:30:00 +0000
+++ scope/clickstore/store-query.h	2015-04-14 19:49:39 +0000
@@ -81,8 +81,11 @@
 
     virtual void run(scopes::SearchReplyProxy const& reply) override;
 
+    pay::PurchaseSet purchased_apps;
+
 protected:
-    virtual void populate_departments(const click::DepartmentList& depts, const std::string& current_department_id, unity::scopes::Department::SPtr &root);
+    virtual unity::scopes::Department::SPtr fromClickDepartment(const click::Department::SCPtr click_dept, const std::string& current_dept_id, const click::DepartmentList& subdepts);
+    virtual unity::scopes::Department::SPtr populate_departments(const click::DepartmentList& depts, const std::string& current_department_id);
     virtual void store_departments(const click::DepartmentList& depts);
     virtual void push_departments(const scopes::SearchReplyProxy& searchReply, const scopes::Department::SCPtr& root);
     virtual void add_highlights(scopes::SearchReplyProxy const& searchReply, const PackageSet& installedPackages);

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2014-08-13 14:43:32 +0000
+++ scope/clickstore/store-scope.cpp	2015-04-14 19:49:39 +0000
@@ -52,7 +52,7 @@
     index.reset(new click::Index(client));
     depts.reset(new click::DepartmentLookup());
     highlights.reset(new click::HighlightList());
-    pay_package.reset(new pay::Package());
+    pay_package.reset(new pay::Package(client));
 
     try
     {

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-08-13 14:43:32 +0000
+++ scope/tests/CMakeLists.txt	2015-04-14 19:49:39 +0000
@@ -21,6 +21,8 @@
   test_pay.cpp
   test_query.cpp
   test_store_scope.cpp
+
+  ${CMAKE_SOURCE_DIR}/libclickscope/tests/fake_json.cpp
 )
 
 add_executable (${APPS_SCOPE_TESTS_TARGET}

=== modified file 'scope/tests/mock_pay.h'
--- scope/tests/mock_pay.h	2014-07-17 16:20:24 +0000
+++ scope/tests/mock_pay.h	2015-04-14 19:49:39 +0000
@@ -29,6 +29,8 @@
 
 #include "clickstore/pay.h"
 
+#include <click/webclient.h>
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -36,9 +38,40 @@
 namespace
 {
 
+    constexpr static const char* FAKE_PURCHASES_LIST_JSON{R"foo(
+            [
+                {
+                    "state": "Complete",
+                    "package_name": "com.example.fake",
+                    "refundable_until": "1970-01-01T00:01:23Z",
+                    "open_id": "https:\/\/login.ubuntu.com/+openid/fakeuser"
+                }
+            ]
+        )foo"};
+
+
+    constexpr static const char* FAKE_PURCHASES_LIST_JSON_NULL_TIMESTAMP{R"foo(
+            [
+                {
+                    "state": "Complete",
+                    "package_name": "com.example.fake",
+                    "refundable_until": null,
+                    "open_id": "https:\/\/login.ubuntu.com/+openid/fakeuser"
+                }
+            ]
+        )foo"};
+
+
+
     class MockPayPackage : public pay::Package {
     public:
         MockPayPackage()
+            : Package(QSharedPointer<click::web::Client>())
+        {
+        }
+
+        MockPayPackage(const QSharedPointer<click::web::Client>& client)
+            : Package(client)
         {
         }
 
@@ -52,6 +85,7 @@
         MOCK_METHOD1(do_pay_package_verify, void(const std::string&));
 
         bool purchased = false;
+        pay::PurchaseSet purchases;
 };
 
 } // namespace

=== modified file 'scope/tests/test_pay.cpp'
--- scope/tests/test_pay.cpp	2014-07-17 16:20:24 +0000
+++ scope/tests/test_pay.cpp	2015-04-14 19:49:39 +0000
@@ -29,28 +29,208 @@
 
 #include "mock_pay.h"
 
+#include <click/webclient.h>
+
+#include <tests/mock_network_access_manager.h>
+#include <tests/mock_ubuntuone_credentials.h>
+#include <tests/mock_webclient.h>
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-
-TEST(PayTest, testPayPackageVerifyCalled)
-{
-    MockPayPackage package;
-    EXPECT_CALL(package, do_pay_package_verify("foo")).Times(1);
-    EXPECT_EQ(false, package.verify("foo"));
-}
-
-TEST(PayTest, testPayPackageVerifyNotCalledIfCallbackExists)
-{
-    MockPayPackage package;
-    package.callbacks["foo"] = [](const std::string&, bool) {};
-    EXPECT_CALL(package, do_pay_package_verify("foo")).Times(0);
-    EXPECT_EQ(false, package.verify("foo"));
-}
-
-TEST(PayTest, testVerifyReturnsTrueForPurchasedItem)
-{
-    MockPayPackage package;
-    package.purchased = true;
-    EXPECT_EQ(true, package.verify("foo"));
+#include <memory>
+
+using namespace ::testing;
+
+
+namespace
+{
+
+class PayTest : public ::testing::Test
+{
+protected:
+    QSharedPointer<MockNetworkAccessManager> namPtr;
+    QSharedPointer<MockClient> clientPtr;
+    std::shared_ptr<MockPayPackage> package;
+
+    virtual void SetUp()
+    {
+        namPtr.reset(new MockNetworkAccessManager());
+        clientPtr.reset(new NiceMock<MockClient>(namPtr));
+        package.reset(new MockPayPackage(clientPtr));
+    }
+
+public:
+    MOCK_METHOD1(purchases_callback, void(pay::PurchaseSet));
+};
+
+}
+
+TEST_F(PayTest, testPayPackageVerifyCalled)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
+    EXPECT_EQ(false, package->verify("foo"));
+}
+
+TEST_F(PayTest, testPayPackageVerifyNotCalledIfCallbackExists)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    package->callbacks["foo"] = [](const std::string&, bool) {};
+    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(0);
+    EXPECT_EQ(false, package->verify("foo"));
+}
+
+TEST_F(PayTest, testVerifyReturnsTrueForPurchasedItem)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    package->purchased = true;
+    EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
+    EXPECT_EQ(true, package->verify("foo"));
+}
+
+TEST_F(PayTest, testGetPurchasesCallsWebservice)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    package->get_purchases([](pay::PurchaseSet) {});
+}
+
+TEST_F(PayTest, testGetPurchasesSendsCorrectPath)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*clientPtr, callImpl(EndsWith(pay::PURCHASES_API_PATH),
+                                     _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    package->get_purchases([](pay::PurchaseSet) {});
+}
+
+TEST_F(PayTest, testGetPurchasesCallbackCalled)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    QByteArray fake_json("[]");
+    EXPECT_CALL(reply.instance, readAll())
+            .Times(1)
+            .WillOnce(Return(fake_json));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+    EXPECT_CALL(*this, purchases_callback(_)).Times(1);
+
+    package->get_purchases([this](pay::PurchaseSet purchases) {
+            purchases_callback(purchases);
+        });
+    response->replyFinished();
+}
+
+TEST_F(PayTest, testGetPurchasesEmptyJsonIsParsed)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    QByteArray fake_json("[]");
+    EXPECT_CALL(reply.instance, readAll())
+            .Times(1)
+            .WillOnce(Return(fake_json));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+    pay::PurchaseSet empty_purchases_list;
+    EXPECT_CALL(*this, purchases_callback(empty_purchases_list)).Times(1);
+
+    package->get_purchases([this](pay::PurchaseSet purchases) {
+            purchases_callback(purchases);
+        });
+    response->replyFinished();
+}
+
+TEST_F(PayTest, testGetPurchasesSingleJsonIsParsedNullTimestamp)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON_NULL_TIMESTAMP);
+    EXPECT_CALL(reply.instance, readAll())
+            .Times(1)
+            .WillOnce(Return(fake_json));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+    pay::PurchaseSet single_purchase_list{{"com.example.fake", 0}};
+    EXPECT_CALL(*this, purchases_callback(single_purchase_list)).Times(1);
+
+    package->get_purchases([this](pay::PurchaseSet purchases) {
+            purchases_callback(purchases);
+        });
+    response->replyFinished();
+}
+
+TEST_F(PayTest, testGetPurchasesTimestampIsParsed)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    QByteArray fake_json(FAKE_PURCHASES_LIST_JSON);
+    EXPECT_CALL(reply.instance, readAll())
+            .Times(1)
+            .WillOnce(Return(fake_json));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+    const time_t EIGHTYTHREE_SECONDS_INTO_THE_SEVENTIES=83;
+    pay::PurchaseSet single_purchase_list{{"com.example.fake", EIGHTYTHREE_SECONDS_INTO_THE_SEVENTIES}};
+    EXPECT_CALL(*this, purchases_callback(single_purchase_list)).Times(1);
+
+    package->get_purchases([this](pay::PurchaseSet purchases) {
+            purchases_callback(purchases);
+        });
+    response->replyFinished();
+}
+
+TEST_F(PayTest, testGetPurchasesIsCancellable)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    auto get_purchases_op = package->get_purchases([](pay::PurchaseSet) {});
+    EXPECT_CALL(reply.instance, abort()).Times(1);
+    get_purchases_op.cancel();
+}
+
+TEST_F(PayTest, testGetBaseUrl)
+{
+    const char *value = getenv(pay::BASE_URL_ENVVAR);
+    if (value != NULL) {
+        ASSERT_TRUE(unsetenv(pay::BASE_URL_ENVVAR) == 0);
+    }
+    ASSERT_TRUE(pay::Package::get_base_url() == pay::BASE_URL);
+    
+}
+
+TEST_F(PayTest, testGetBaseUrlFromEnv)
+{
+    ASSERT_TRUE(setenv(pay::BASE_URL_ENVVAR, FAKE_SERVER.c_str(), 1) == 0);
+    ASSERT_TRUE(pay::Package::get_base_url() == FAKE_SERVER);
+    ASSERT_TRUE(unsetenv(pay::BASE_URL_ENVVAR) == 0);
 }

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-08-21 20:05:19 +0000
+++ scope/tests/test_query.cpp	2015-04-14 19:49:39 +0000
@@ -43,7 +43,9 @@
 #include "click/application.h"
 #include "click/departments-db.h"
 #include "test_helpers.h"
+#include "click/package.h"
 
+#include <tests/fake_json.h>
 #include <tests/mock_network_access_manager.h>
 
 #include <unity/scopes/CategoryRenderer.h>
@@ -147,6 +149,7 @@
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
     EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
 }
 
@@ -179,6 +182,7 @@
 
     auto expected_title = packages.front().title;
     EXPECT_CALL(q, push_result(_, Property(&scopes::CategorisedResult::title, expected_title)));
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
 }
 
@@ -203,7 +207,8 @@
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
-    EXPECT_CALL(q, finished(_));
+    EXPECT_CALL(q, push_result(_, _));
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
 }
 
@@ -224,6 +229,9 @@
     EXPECT_CALL(q, get_installed_packages()).WillOnce(Return(no_installed_packages));
     EXPECT_CALL(q, add_available_apps(reply, no_installed_packages, _));
 
+    // No need to test purchases in this testcase
+    ASSERT_EQ(setenv(Configuration::PURCHASES_ENVVAR, "0", 1), 0);
+
     q.run(reply);
 }
 
@@ -258,6 +266,7 @@
     EXPECT_CALL(q, push_result(_, HasPackageName(expected_name1)));
     auto expected_name2 = packages.back().name;
     EXPECT_CALL(q, push_result(_, HasPackageName(expected_name2)));
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE);
 }
 
@@ -287,6 +296,7 @@
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
     EXPECT_CALL(q, push_result(_, IsInstalled(true)));
     EXPECT_CALL(q, push_result(_, IsInstalled(false)));
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE);
 }
 
@@ -323,6 +333,7 @@
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE);
 }
 
@@ -359,40 +370,6 @@
 typedef std::pair<bool, bool> _PurchasedValues;
 MATCHER_P(PurchasedProperties, b, "") { return arg[click::Query::ResultKeys::PURCHASED].get_bool() == b.first && arg[click::Query::ResultKeys::INSTALLED].get_bool() == b.second; }
 
-TEST(QueryTest, testQueryRunCallsPayPackageVerify)
-{
-    ASSERT_EQ(setenv(Configuration::PURCHASES_ENVVAR, "1", 1), 0);
-    click::Packages packages {
-        {"name", "title", 0.99, "icon", "uri"}
-    };
-    MockIndex mock_index(packages);
-    click::DepartmentLookup dept_lookup;
-    click::HighlightList highlights;
-    scopes::SearchMetadata metadata("en_EN", "phone");
-    MockPayPackage pay_pkg;
-    PackageSet no_installed_packages;
-    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
-    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
-
-    scopes::CategoryRenderer renderer("{}");
-    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
-
-    ON_CALL(q, register_category(_, _, _, _, _)).WillByDefault(Return(ptrCat));
-    EXPECT_CALL(q, register_category(_, "appstore", CategoryHasNumberOfResults(1), _, _));
-    EXPECT_CALL(q, register_category(_, "recommends", _, _, _));
-
-    scopes::testing::MockSearchReply mock_reply;
-    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
-
-    EXPECT_CALL(pay_pkg, do_pay_package_verify(_)).Times(1);
-    EXPECT_CALL(q, push_result(_, PurchasedProperties(_PurchasedValues{false, false}))).Times(1);
-    EXPECT_CALL(q, finished(_));
-
-    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
-    ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
-}
-
 TEST(QueryTest, testQueryRunPurchased)
 {
     ASSERT_EQ(setenv(Configuration::PURCHASES_ENVVAR, "1", 1), 0);
@@ -404,10 +381,10 @@
     click::HighlightList highlights;
     scopes::SearchMetadata metadata("en_EN", "phone");
     MockPayPackage pay_pkg;
-    pay_pkg.purchased = true;
     PackageSet no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
+    q.purchased_apps.insert({"name"});
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -420,7 +397,6 @@
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
 
-    EXPECT_CALL(pay_pkg, do_pay_package_verify(_)).Times(1);
     EXPECT_CALL(q, push_result(_, PurchasedProperties(_PurchasedValues{true, false}))).Times(1);
     EXPECT_CALL(q, finished(_));
 
@@ -442,9 +418,9 @@
     click::HighlightList highlights;
     scopes::SearchMetadata metadata("en_EN", "phone");
     MockPayPackage pay_pkg;
-    pay_pkg.purchased = true;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
+    q.purchased_apps.insert({"name"});
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -457,7 +433,6 @@
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
 
-    EXPECT_CALL(pay_pkg, do_pay_package_verify(_)).Times(1);
     EXPECT_CALL(q, push_result(_, PurchasedProperties(_PurchasedValues{true, true}))).Times(1);
     EXPECT_CALL(q, finished(_));
 
@@ -491,6 +466,7 @@
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
     auto expected_name2 = packages.back().name;
     EXPECT_CALL(q, push_result(_, HasPackageName(expected_name2)));
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
 
     ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
@@ -524,6 +500,7 @@
     EXPECT_CALL(q, push_result(_, HasPackageName(expected_name1)));
     auto expected_name2 = packages.back().name;
     EXPECT_CALL(q, push_result(_, HasPackageName(expected_name2)));
+    EXPECT_CALL(q, finished(_)).Times(1);
     q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
 
     ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
@@ -553,5 +530,103 @@
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
     EXPECT_CALL(q, push_result(_, HasAttributes(true)));
-    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
-}
+    EXPECT_CALL(q, finished(_)).Times(1);
+    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
+}
+
+MATCHER_P(HasPrice, price, "") { return arg["price"].get_double() == price; }
+
+TEST(QueryTest, testPushPackagePushesPriceUSD)
+{
+    ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
+    ASSERT_EQ(setenv(Configuration::PURCHASES_ENVVAR, "1", 1), 0);
+
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_ONE, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages packages = package_list_from_json_node(ci_package);
+
+    MockIndex mock_index(packages);
+    scopes::SearchMetadata metadata("en_EN", "phone");
+    PackageSet no_installed_packages;
+    DepartmentLookup dept_lookup;
+    HighlightList highlights;
+    MockPayPackage pay_pkg;
+    const unity::scopes::CannedQuery query("foo.scope", "", "");
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(q, push_result(reply, HasPrice(1.99)));
+    q.push_package(reply, ptrCat, no_installed_packages, packages[0]);
+
+    ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
+}
+
+TEST(QueryTest, testPushPackagePushesPriceEUR)
+{
+    ASSERT_EQ(setenv(Configuration::CURRENCY_ENVVAR, "EUR", 1), 0);
+    ASSERT_EQ(setenv(Configuration::PURCHASES_ENVVAR, "1", 1), 0);
+
+    Json::Value root;
+    Json::Reader().parse(FAKE_JSON_SEARCH_RESULT_ONE, root);
+    auto const embedded = root[Package::JsonKeys::embedded];
+    auto const ci_package = embedded[Package::JsonKeys::ci_package];
+
+    Packages packages = package_list_from_json_node(ci_package);
+
+    MockIndex mock_index(packages);
+    scopes::SearchMetadata metadata("en_EN", "phone");
+    PackageSet no_installed_packages;
+    DepartmentLookup dept_lookup;
+    HighlightList highlights;
+    MockPayPackage pay_pkg;
+    const unity::scopes::CannedQuery query("foo.scope", "", "");
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(q, push_result(reply, HasPrice(1.69)));
+    q.push_package(reply, ptrCat, no_installed_packages, packages[0]);
+
+    ASSERT_EQ(unsetenv(Configuration::CURRENCY_ENVVAR), 0);
+    ASSERT_EQ(unsetenv(Configuration::PURCHASES_ENVVAR), 0);
+}
+
+MATCHER_P(HasVersion, v, "") { return arg[click::Query::ResultKeys::VERSION].get_string() == v; }
+
+TEST(QueryTest, testPushPackagePushesVersion)
+{
+    auto const fake_version = "0.83b";
+    click::Packages packages {
+        {"org.example.app1", "app title1", 0.0, "icon", "uri", fake_version, "scope"},
+    };
+    MockIndex mock_index(packages);
+    scopes::SearchMetadata metadata("en_EN", "phone");
+    PackageSet no_installed_packages;
+    click::DepartmentLookup dept_lookup;
+    click::HighlightList highlights;
+    MockPayPackage pay_pkg;
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(q, push_result(_, HasVersion(fake_version)));
+    EXPECT_CALL(q, finished(_)).Times(1);
+    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
+}
+

=== added directory 'tests'
=== renamed file 'autopilot/CMakeLists.txt' => 'tests/CMakeLists.txt'
--- autopilot/CMakeLists.txt	2014-05-26 15:37:02 +0000
+++ tests/CMakeLists.txt	2015-04-14 19:49:39 +0000
@@ -1,6 +1,7 @@
 find_package (PythonInterp)
 
 set (AUTOPILOT_DIR unityclickscope)
+set (COMMON_PYTHONPATH common)
 
 execute_process (
   COMMAND python3 -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"
@@ -8,11 +9,11 @@
   OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install (
-  DIRECTORY ${AUTOPILOT_DIR}
+  DIRECTORY autopilot/${AUTOPILOT_DIR}
   DESTINATION ${PYTHON_PACKAGE_DIR}
 )
 
 add_custom_target(test-click-scope-autopilot-fake-servers
-    COMMAND U1_SEARCH_BASE_URL=fake DOWNLOAD_BASE_URL=fake BUILD_DIR=${CMAKE_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND PYTHONPATH=$ENV{PYTHONPATH}:../${COMMON_PYTHONPATH} U1_SEARCH_BASE_URL=fake DOWNLOAD_BASE_URL=fake BUILD_DIR=${CMAKE_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/autopilot
 )

=== renamed directory 'autopilot' => 'tests/autopilot'
=== modified file 'tests/autopilot/unityclickscope/__init__.py'
--- autopilot/unityclickscope/__init__.py	2014-07-07 21:14:09 +0000
+++ tests/autopilot/unityclickscope/__init__.py	2015-04-14 19:49:39 +0000
@@ -17,85 +17,95 @@
 import logging
 
 import autopilot.logging
-import ubuntuuitoolkit
-from autopilot.introspection import dbus as autopilot_dbus
-from testtools.matchers import Equals, MatchesAny
+from autopilot import exceptions, introspection
 from unity8.shell.emulators import dash
 
 
 logger = logging.getLogger(__name__)
 
 
-class GenericScopeView(dash.DashApps):
+class GenericScopeView(dash.GenericScopeView):
+
+    # XXX workaround for bug http://pad.lv/1350532, which causes the unity8
+    # GenericScopeView class to match with the ClickScope and StoreScope.
+    # --elopio - 2014-11-28
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        return False
+
+
+class ClickScope(GenericScopeView):
+
+    """Autopilot helper for the click scope."""
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = introspection.get_classname_from_path(path)
+        if name == b'GenericScopeView':
+            if state['objectName'][1] == 'clickscope':
+                return True
+        return False
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_store(self):
+        """Open the applicatmions store.
+
+        :return: The store Scope View.
+
+        """
+        # XXX The click_scope_item in unity should take care of swiping if the
+        # item is not visible.
+        # TODO file a bug. --elopio - 2014-11-28
+        self._swipe_to_bottom()
+        self.click_scope_item('store', 'Ubuntu Store')
+        store_scope = self.get_root_instance().select_single(
+            'GenericScopeView', objectName='dashTempScopeItem')
+        store_scope.isCurrent.wait_for(True)
+        return store_scope
+
+    def _swipe_to_bottom(self):
+        list_view = self.select_single(
+            'ListViewWithPageHeader', objectName='categoryListView')
+        list_view.swipe_to_bottom()
+
+
+class StoreScope(GenericScopeView):
 
     """Autopilot helper for the generic scope view of the store."""
 
-    # XXX We need to set an objectName to this scope, so we can put a different
-    # name to this custom proxy object class. --elopio - 2014-06-28
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = introspection.get_classname_from_path(path)
+        if name == b'GenericScopeView':
+            # This is probably not a good objectName. It can cause more than
+            # one custom proxy object to match. --elopio - 2014-11-28
+            if state['objectName'][1] == 'dashTempScopeItem':
+                return True
+        return False
 
+    @autopilot.logging.log_action(logger.info)
     def enter_search_query(self, query):
-        # TODO once http://pad.lv/1335551 is fixed, we can use the search
-        # helpers from unity. --elopio - 2014-06-28
-        search_text_field = self._get_search_text_field()
+        # XXX the enter_search_query of the dash provided by unity doesn't
+        # work for the temp store scope.
+        # TODO file a bug. --elopio - 2014-11-28
+        search_button = self.select_single(objectName='search_header_button')
+        self.pointing_device.click_object(search_button)
+        headerContainer = self.select_single(objectName='headerContainer')
+        headerContainer.contentY.wait_for(0)
+        search_text_field = self.select_single(objectName='searchTextField')
         search_text_field.write(query)
-        search_text_field.state.wait_for('idle')
-
-    def _get_search_text_field(self):
-        page_header = self._get_scope_item_header()
-        search_container = page_header.select_single(
-            'QQuickItem', objectName='searchContainer')
-        search_container.state.wait_for(
-            MatchesAny(Equals('narrowActive'), Equals('active')))
-        return search_container.select_single(ubuntuuitoolkit.TextField)
-
-    def _get_scope_item_header(self):
-        return self._get_scope_item().select_single(
-            'PageHeader', objectName='')
-
-    def _get_scope_item(self):
-        return self.get_root_instance().select_single('ScopeItem')
-
-    @autopilot.logging.log_action(logger.info)
+        self.get_root_instance().select_single(
+            objectName='processingIndicator').visible.wait_for(False)
+
     def open_preview(self, category, app_name):
-        """Open the preview of an application.
-
-        :parameter category: The name of the category where the application is.
-        :parameter app_name: The name of the application.
-        :return: The opened preview.
-
-        """
-        category_element = self._get_category_element(category)
-        icon = category_element.select_single('AbstractButton', title=app_name)
-        self.pointing_device.click_object(icon)
-        # TODO assign an object name to this preview list view.
-        # --elopio - 2014-06-29
-        preview_list = self._get_scope_item().wait_select_single(
-            'PreviewListView', objectName='')
-        preview_list.x.wait_for(0)
-        return preview_list.select_single(
-            Preview, objectName='preview{}'.format(preview_list.currentIndex))
-
-
-class DashApps(dash.DashApps):
-
-    """Autopilot helper for the applicatios scope."""
-
-    @autopilot.logging.log_action(logger.info)
-    def go_to_store(self):
-        """Open the applications store.
-
-        :return: The store Scope View.
-
-        """
-        # TODO call click_scope_item once the fix for bug http://pad.lv/1335548
-        # lands. --elopio - 2014-06-28
-        category_element = self._get_category_element('store')
-        icon = category_element.select_single(
-            'AbstractButton', title='Ubuntu Store')
-        self.pointing_device.click_object(icon)
-        scope_item = self.get_root_instance().select_single('ScopeItem')
-        scope_item.x.wait_for(0)
-        return scope_item.select_single(GenericScopeView)
+        # XXX the open preview method provided by unity doesn't wait for the
+        # preview to be ready.
+        # TODO file a bug. --elopio - 2014-11-28
+        preview = super(StoreScope, self).open_preview(category, app_name)
+        self.get_root_instance().select_single(
+            objectName='processingIndicator').visible.wait_for(False)
+        return preview
 
 
 class Preview(dash.Preview):
@@ -113,16 +123,13 @@
             title=title_label.text, subtitle=subtitle_label.text)
 
     def install(self):
-        parent = self.get_parent()
         install_button = self.select_single(
             'PreviewActionButton', objectName='buttoninstall_click')
         self.pointing_device.click_object(install_button)
-        self.implicitHeight.wait_for(0)
-        parent.ready.wait_for(True)
 
     def is_progress_bar_visible(self):
         try:
             self.select_single('ProgressBar', objectName='progressBar')
             return True
-        except autopilot_dbus.StateNotFoundError:
+        except exceptions.StateNotFoundError:
             return False

=== modified file 'tests/autopilot/unityclickscope/fixture_setup.py'
--- autopilot/unityclickscope/fixture_setup.py	2014-02-01 12:37:12 +0000
+++ tests/autopilot/unityclickscope/fixture_setup.py	2015-04-14 19:49:39 +0000
@@ -16,52 +16,19 @@
 
 """Set up and clean up fixtures for the Unity Click Scope acceptance tests."""
 
-
-import logging
-import threading
-
-import fixtures
+import fake_server_fixture
 
 from unityclickscope import fake_servers
 
 
-logger = logging.getLogger(__name__)
-
-
-class FakeServerRunning(fixtures.Fixture):
-
-    def __init__(self, server_class):
-        super(FakeServerRunning, self).__init__()
-        self.server_class = server_class
-
-    def setUp(self):
-        super(FakeServerRunning, self).setUp()
-        self._start_fake_server()
-
-    def _start_fake_server(self):
-        logger.info('Starting fake server: {}.'.format(self.server_class))
-        server_address = ('', 0)
-        fake_server = self.server_class(server_address)
-        server_thread = threading.Thread(target=fake_server.serve_forever)
-        server_thread.start()
-        logger.info('Serving at port {}.'.format(fake_server.server_port))
-        self.addCleanup(self._stop_fake_server, server_thread, fake_server)
-        self.url = 'http://localhost:{}/'.format(fake_server.server_port)
-
-    def _stop_fake_server(self, thread, server):
-        logger.info('Stopping fake server: {}.'.format(self.server_class))
-        server.shutdown()
-        thread.join()
-
-
-class FakeSearchServerRunning(FakeServerRunning):
+class FakeSearchServerRunning(fake_server_fixture.FakeServerFixture):
 
     def __init__(self):
         super(FakeSearchServerRunning, self).__init__(
             fake_servers.FakeSearchServer)
 
 
-class FakeDownloadServerRunning(FakeServerRunning):
+class FakeDownloadServerRunning(fake_server_fixture.FakeServerFixture):
 
     def __init__(self):
         super(FakeDownloadServerRunning, self).__init__(

=== modified file 'tests/autopilot/unityclickscope/test_click_scope.py'
--- autopilot/unityclickscope/test_click_scope.py	2014-07-07 18:25:46 +0000
+++ tests/autopilot/unityclickscope/test_click_scope.py	2015-04-14 19:49:39 +0000
@@ -18,15 +18,14 @@
 import os
 import shutil
 import subprocess
+import time
 
 import dbusmock
 import fixtures
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
-from unity8 import process_helpers
 from unity8.shell import tests as unity_tests
 
-import unityclickscope
 from unityclickscope import credentials, fake_services, fixture_setup
 
 
@@ -37,7 +36,8 @@
     """Exception raised when there's a problem with the scope."""
 
 
-class BaseClickScopeTestCase(dbusmock.DBusTestCase, unity_tests.UnityTestCase):
+class BaseClickScopeTestCase(
+        dbusmock.DBusTestCase, unity_tests.DashBaseTestCase):
 
     scenarios = [
         ('Desktop Nexus 4', dict(
@@ -47,8 +47,6 @@
     ]
 
     def setUp(self):
-        super(BaseClickScopeTestCase, self).setUp()
-
         # We use fake servers by default because the current Jenkins
         # configuration does not let us override the variables.
         if os.environ.get('DOWNLOAD_BASE_URL', 'fake') == 'fake':
@@ -59,10 +57,7 @@
 
         self.useFixture(fixtures.EnvironmentVariable('U1_DEBUG', newvalue='1'))
         self._restart_scopes()
-
-        unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(unity_proxy)
-        self.dash = self.main_window.get_dash()
+        super(BaseClickScopeTestCase, self).setUp()
         self.scope = self.dash.get_scope('clickscope')
 
     def _use_fake_server(self):
@@ -187,18 +182,6 @@
         scope.isCurrent.wait_for(True)
         return scope
 
-    def search(self, query):
-        search_indicator = self._proxy.select_single(
-            'SearchIndicator', objectName='search')
-        search_indicator.pointing_device.click_object(search_indicator)
-        self.scope.enter_search_query(query)
-
-    def open_app_preview(self, category, name):
-        self.search(name)
-        preview = self.scope.open_preview(category, name)
-        preview.get_parent().ready.wait_for(True)
-        return preview
-
 
 class TestCaseWithHomeScopeOpen(BaseClickScopeTestCase):
 
@@ -218,24 +201,29 @@
 class TestCaseWithStoreScopeOpen(BaseTestCaseWithStoreScopeOpen):
 
     def test_search_available_app(self):
-        self.search('Delta')
+        self.scope.enter_search_query('Delta')
         applications = self.scope.get_applications('appstore')
         self.assertThat(applications[0], Equals('Delta'))
 
     def test_open_app_preview(self):
         expected_details = dict(
             title='Delta', subtitle='Rodney Dawes')
-        preview = self.open_app_preview('appstore', 'Delta')
+
+        self.scope.enter_search_query('Delta')
+        preview = self.scope.open_preview('appstore', 'Delta')
         details = preview.get_details()
         self.assertEqual(details, expected_details)
 
     def test_install_without_credentials(self):
-        preview = self.open_app_preview('appstore', 'Delta')
+        self.scope.enter_search_query('Delta')
+        preview = self.scope.open_preview('appstore', 'Delta')
         preview.install()
-        error = self.dash.wait_select_single(unityclickscope.Preview)
-
-        details = error.get_details()
-        self.assertEqual('Login Error', details.get('title'))
+        # XXX hacky way to check if the online accounts ui was opened.
+        time.sleep(3)
+        online_accounts_pid = subprocess.check_output(
+            ['pgrep', '-f', 'online-accounts-ui'],
+            universal_newlines=True).strip()
+        subprocess.check_output(['kill', '-9', online_accounts_pid])
 
 
 class ClickScopeTestCaseWithCredentials(BaseTestCaseWithStoreScopeOpen):
@@ -246,7 +234,8 @@
             'opened prompting for a password. http://pad.lv/1338714')
         self.add_u1_credentials()
         super(ClickScopeTestCaseWithCredentials, self).setUp()
-        self.preview = self.open_app_preview('appstore', 'Delta')
+        self.scope.enter_search_query('Delta')
+        self.preview = self.scope.open_preview('appstore', 'Delta')
 
     def add_u1_credentials(self):
         account_manager = credentials.AccountManager()

=== added directory 'tests/common'
=== added file 'tests/common/__init__.py'
--- tests/common/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/common/__init__.py	2015-04-14 19:49:39 +0000
@@ -0,0 +1,15 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2015 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.

=== added file 'tests/common/fake_server_fixture.py'
--- tests/common/fake_server_fixture.py	1970-01-01 00:00:00 +0000
+++ tests/common/fake_server_fixture.py	2015-04-14 19:49:39 +0000
@@ -0,0 +1,60 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014, 2015 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Base class for fake server fixtures."""
+
+
+import logging
+import multiprocessing as mp
+
+import fixtures
+
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+
+
+class FakeServerFixture(fixtures.Fixture):
+
+    def __init__(self, server_class, *server_args):
+        super().__init__()
+        self.server_class = server_class
+        self.server_args = server_args
+
+    def setUp(self):
+        super().setUp()
+        self._start_fake_server()
+
+    def _server_process(self, queue, server_class):
+        logger.info('Starting fake server: {}.'.format(server_class))
+        server_address = ('localhost', 0)
+        fake_server = server_class(server_address, *self.server_args)
+        fake_server.url = 'http://localhost:{}/'.format(fake_server.server_port)
+        logger.info('Serving at port {}.'.format(fake_server.server_port))
+        queue.put(fake_server.url)
+        fake_server.serve_forever()
+
+    def _start_fake_server(self):
+        queue = mp.Queue()
+        server_process = mp.Process(target=self._server_process,
+                                    args=(queue, self.server_class))
+        server_process.start()
+        self.addCleanup(self._stop_fake_server, server_process)
+        self.url = queue.get()
+
+    def _stop_fake_server(self, process):
+        logger.info('Stopping fake server: {}.'.format(self.server_class))
+        process.terminate()
+        process.join()

=== added directory 'tests/scope-harness'
=== added file 'tests/scope-harness/apps-scope-harness.py'
--- tests/scope-harness/apps-scope-harness.py	1970-01-01 00:00:00 +0000
+++ tests/scope-harness/apps-scope-harness.py	2015-04-14 19:49:39 +0000
@@ -0,0 +1,200 @@
+#!/usr/bin/env python3
+
+from scope_harness import *
+from scope_harness.testing import *
+import unittest, sys
+
+class AppsTest (ScopeHarnessTestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.harness = ScopeHarness.new_from_scope_list(Parameters([
+            "/usr/lib/arm-linux-gnueabihf/unity-scopes/clickapps/clickscope.ini"
+            ]))
+
+    def setUp(self):
+        self.view = self.harness.results_view
+        self.view.active_scope = 'clickscope'
+
+    def test_surfacing_results(self):
+        self.view.browse_department('')
+        self.view.search_query = ''
+
+        # Check first apps of every category
+        match = CategoryListMatcher() \
+            .has_exactly(3) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("predefined") \
+                    .has_at_least(1) \
+                    .mode(CategoryMatcherMode.BY_URI) \
+                    .result(ResultMatcher("application:///dialer-app.desktop") \
+                    .title('Phone') \
+                    .property('installed', True) \
+            )) \
+            .category(CategoryMatcher("local") \
+                      .has_at_least(1) \
+                      .mode(CategoryMatcherMode.STARTS_WITH) \
+                      .result(ResultMatcher("application:///com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon.*") \
+                      .properties({'installed': True, 'version': '1.0.10'}) \
+                      .title('Amazon') \
+            )) \
+            .category(CategoryMatcher("store") \
+                      .has_at_least(1) \
+                      .mode(CategoryMatcherMode.BY_URI) \
+                      .result(ResultMatcher("scope://com.canonical.scopes.clickstore.*") \
+            )) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+
+    def test_surfacing_departments(self):
+        self.view.search_query = ''
+
+        departments = self.view.browse_department('')
+
+        self.assertTrue(self.view.has_departments)
+        self.assertFalse(self.view.has_alt_departments)
+
+        # TODO: list all expected departments (depending on installed apps)
+        match = DepartmentMatcher() \
+            .mode(DepartmentMatcherMode.STARTS_WITH) \
+            .id('') \
+            .label('All') \
+            .all_label('') \
+            .parent_id('') \
+            .parent_label('') \
+            .is_root(True) \
+            .is_hidden(False) \
+            .child(ChildDepartmentMatcher('communication')) \
+            .child(ChildDepartmentMatcher('games')) \
+            .match(departments)
+        self.assertMatchResult(match)
+
+    def test_department_browsing(self):
+        self.view.search_query = ''
+
+        departments = self.view.browse_department('games')
+
+        match = DepartmentMatcher() \
+            .has_exactly(0) \
+            .mode(DepartmentMatcherMode.STARTS_WITH) \
+            .label('Games') \
+            .all_label('') \
+            .parent_id('') \
+            .parent_label('All') \
+            .is_root(False) \
+            .is_hidden(False) \
+            .match(departments)
+        self.assertMatchResult(match)
+
+        # FIXME: scope harness shouldn't report empty categories, so should be exactly 2
+        res_match = CategoryListMatcher() \
+            .has_at_least(2) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("local") \
+                      .has_at_least(1) \
+                      .mode(CategoryMatcherMode.STARTS_WITH) \
+                      .result(ResultMatcher("application:///com.ubuntu.dropping-letters_dropping-letters.*") \
+                      .art('/custom/click/.click/users/@all/com.ubuntu.dropping-letters/./dropping-letters.png') \
+                      .properties({'installed': True, 'version': '0.1.2.2.67'})
+                      .title('Dropping Letters') \
+            )) \
+            .category(CategoryMatcher("store") \
+                      .has_at_least(1) \
+                      .mode(CategoryMatcherMode.BY_URI) \
+                      .result(ResultMatcher("scope://com.canonical.scopes.clickstore.*dep=games") \
+            )) \
+            .match(self.view.categories)
+        self.assertMatchResult(res_match)
+
+        # browse different department
+
+        departments = self.view.browse_department('communication')
+        self.view.search_query = ''
+
+        match = DepartmentMatcher() \
+            .has_exactly(0) \
+            .mode(DepartmentMatcherMode.STARTS_WITH) \
+            .label('Communication') \
+            .all_label('') \
+            .parent_id('') \
+            .parent_label('All') \
+            .is_root(False) \
+            .is_hidden(False) \
+            .match(departments)
+        self.assertMatchResult(match)
+
+        # FIXME: scope harness shouldn't report empty categories, so should be exactly 2
+        res_match = CategoryListMatcher() \
+            .has_at_least(2) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("local") \
+                      .has_at_least(1) \
+                      .mode(CategoryMatcherMode.STARTS_WITH) \
+                      .result(ResultMatcher('application:///com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.10.desktop')) \
+                      .result(ResultMatcher('application:///webbrowser-app.desktop') \
+                      .title('Browser') \
+            )) \
+            .category(CategoryMatcher("store") \
+                      .has_at_least(1) \
+                      .mode(CategoryMatcherMode.BY_URI) \
+                      .result(ResultMatcher("scope://com.canonical.scopes.clickstore.*dep=communication") \
+            )) \
+            .match(self.view.categories)
+        self.assertMatchResult(res_match)
+
+    def test_nonremovable_app_preview(self):
+        self.view.browse_department('')
+        self.view.search_query = 'Brow'
+
+        pview = self.view.categories[0].results[0].long_press()
+        self.assertIsInstance(pview, PreviewView)
+
+        match = PreviewColumnMatcher().column(\
+                    PreviewMatcher() \
+                        .widget(PreviewWidgetMatcher("hdr")) \
+                        .widget(PreviewWidgetMatcher("buttons") \
+                                .type("actions") \
+                                .data({'actions':[{'id':'open_click', 'label':'Open', 'uri':'application:///webbrowser-app.desktop'}]}) \
+                                ) \
+                        .widget(PreviewWidgetMatcher("screenshots")) \
+                        .widget(PreviewWidgetMatcher("summary")) \
+                ).match(pview.widgets)
+        self.assertMatchResult(match)
+
+    def test_removable_app_preview(self):
+        self.view.browse_department('')
+        self.view.search_query = 'Amazon'
+
+        pview = self.view.categories[0].results[0].long_press()
+        self.assertIsInstance(pview, PreviewView)
+
+        match = PreviewColumnMatcher().column(\
+                    PreviewMatcher() \
+                        .widget(PreviewWidgetMatcher("hdr")) \
+                        .widget(PreviewWidgetMatcher("buttons") \
+                                .type("actions") \
+                                .data({'actions':[
+                                    {'id':'open_click',
+                                     'label':'Open',
+                                     'uri':'application:///com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.10.desktop'},
+                                    {'id':'uninstall_click',
+                                     'label':'Uninstall'}]}) \
+                                ) \
+                        .widget(PreviewWidgetMatcher("summary") \
+                                .type('text')) \
+                        .widget(PreviewWidgetMatcher("other_metadata") \
+                                .type('text')) \
+                        .widget(PreviewWidgetMatcher("updates") \
+                                .type('text')) \
+                        .widget(PreviewWidgetMatcher("whats_new") \
+                                .type('text')) \
+                        .widget(PreviewWidgetMatcher("rating") \
+                                .type('rating-input')) \
+                        .widget(PreviewWidgetMatcher("reviews_title") \
+                                .type('text')) \
+                        .widget(PreviewWidgetMatcher("summary") \
+                                .type('reviews')) \
+        ).match(pview.widgets)
+        self.assertMatchResult(match)
+
+if __name__ == '__main__':
+    unittest.main(argv = sys.argv[:1])

=== added directory 'tests/scope-harness/fake_responses'
=== added directory 'tests/scope-harness/fake_responses/click-package-index'
=== added directory 'tests/scope-harness/fake_responses/click-package-index/api'
=== added directory 'tests/scope-harness/fake_responses/click-package-index/api/v1'
=== added directory 'tests/scope-harness/fake_responses/click-package-index/api/v1/departments'
=== added directory 'tests/scope-harness/fake_responses/click-package-index/api/v1/departments/games'
=== added file 'tests/scope-harness/fake_responses/click-package-index/api/v1/departments/games/index.json'
--- tests/scope-harness/fake_responses/click-package-index/api/v1/departments/games/index.json	1970-01-01 00:00:00 +0000
+++ tests/scope-harness/fake_responses/click-package-index/api/v1/departments/games/index.json	2015-04-14 19:49:39 +0000
@@ -0,0 +1,174 @@
+{
+  "_embedded": {
+    "clickindex:package": [
+      {
+        "publisher": "Robert Ancell",
+        "name": "com.ubuntu.developer.robert-ancell.yatzy",
+        "title": "Yatzy",
+        "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2015/02/yatzy_rqoPQxE.png",
+        "price": 0,
+        "content": "application",
+        "ratings_average": 5,
+        "version": "8",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.robert-ancell.yatzy"
+          }
+        },
+        "architecture": [
+          "all"
+        ],
+        "prices": {}
+      },
+      {
+        "publisher": "Victor Tuson Palau",
+        "name": "com.ubuntu.developer.vtuson.lego",
+        "title": "uBrick scope",
+        "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2015/01/256.png",
+        "price": 0,
+        "content": "scope",
+        "ratings_average": 5,
+        "version": "0.3",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.vtuson.lego"
+          }
+        },
+        "architecture": [
+          "armhf"
+        ],
+        "prices": {}
+      }
+    ],
+    "clickindex:highlight": [
+      {
+        "_embedded": {
+          "clickindex:package": [
+            {
+              "publisher": "Daniel Beck",
+              "name": "com.ubuntu.developer.danielbeck.greenmahjong",
+              "title": "Green Mahjong",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/08/greenmahjong.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 3.5,
+              "version": "2.2.1",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.danielbeck.greenmahjong"
+                }
+              },
+              "architecture": [
+                "all"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Riccardo Padovani",
+              "name": "com.ubuntu.developer.rpadovani.100balls",
+              "title": "100balls",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2015/02/100balls_256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.57,
+              "version": "0.4.1",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.rpadovani.100balls"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Robert Ancell",
+              "name": "com.ubuntu.developer.robert-ancell.dotty",
+              "title": "Dotty",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2013/12/dotty.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.2,
+              "version": "8",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.robert-ancell.dotty"
+                }
+              },
+              "architecture": [
+                "all"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Filippo Scognamiglio",
+              "name": "com.ubuntu.developer.flscogna.ubuntu-netwalk",
+              "title": "Ubuntu Netwalk",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/03/ubuntuNetwalkicon256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.92,
+              "version": "0.9.2",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.flscogna.ubuntu-netwalk"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Ken VanDine",
+              "name": "com.ubuntu.developer.ken-vandine.pathwind",
+              "title": "PathWind",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/05/pathwind.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.38,
+              "version": "0.2.9",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.ken-vandine.pathwind"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            }
+          ]
+        },
+        "slug": "top-games",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/highlights/top-games"
+          }
+        },
+        "description": "",
+        "name": "Top Games"
+      }
+    ]
+  },
+  "has_children": false,
+  "_links": {
+    "curies": [
+      {
+        "href": "https://wiki.ubuntu.com/AppStore/Interfaces/ClickPackageIndex#reltype_{rel}",
+        "name": "clickindex",
+        "templated": true
+      }
+    ],
+    "self": {
+      "href": "[FAKE_SERVER_BASE]/api/v1/departments/games"
+    },
+    "collection": {
+      "href": "[FAKE_SERVER_BASE]/api/v1/departments"
+    }
+  },
+  "name": "Games",
+  "slug": "games"
+}
+

=== added file 'tests/scope-harness/fake_responses/click-package-index/api/v1/index.json'
--- tests/scope-harness/fake_responses/click-package-index/api/v1/index.json	1970-01-01 00:00:00 +0000
+++ tests/scope-harness/fake_responses/click-package-index/api/v1/index.json	2015-04-14 19:49:39 +0000
@@ -0,0 +1,642 @@
+{
+  "_embedded": {
+    "clickindex:department": [
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/social-networking"
+          }
+        },
+        "name": "Social Networking",
+        "slug": "social-networking"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/travel-local"
+          }
+        },
+        "name": "Travel & Local",
+        "slug": "travel-local"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/reference"
+          }
+        },
+        "name": "Reference",
+        "slug": "reference"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/food-drink"
+          }
+        },
+        "name": "Food & Drink",
+        "slug": "food-drink"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/communication"
+          }
+        },
+        "name": "Communication",
+        "slug": "communication"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/accessories"
+          }
+        },
+        "name": "Utilities",
+        "slug": "accessories"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/science-engineering"
+          }
+        },
+        "name": "Science & Engineering",
+        "slug": "science-engineering"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/personalisation"
+          }
+        },
+        "name": "Personalisation",
+        "slug": "personalisation"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/education"
+          }
+        },
+        "name": "Education",
+        "slug": "education"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/productivity"
+          }
+        },
+        "name": "Productivity",
+        "slug": "productivity"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/entertainment"
+          }
+        },
+        "name": "Entertainment",
+        "slug": "entertainment"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/sports"
+          }
+        },
+        "name": "Sports",
+        "slug": "sports"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/health-fitness"
+          }
+        },
+        "name": "Health & Fitness",
+        "slug": "health-fitness"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/music-audio"
+          }
+        },
+        "name": "Music & Audio",
+        "slug": "music-audio"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/weather"
+          }
+        },
+        "name": "Weather",
+        "slug": "weather"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/shopping"
+          }
+        },
+        "name": "Shopping",
+        "slug": "shopping"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/finance"
+          }
+        },
+        "name": "Finance",
+        "slug": "finance"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/business"
+          }
+        },
+        "name": "Business",
+        "slug": "business"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/media-video"
+          }
+        },
+        "name": "Media & Video",
+        "slug": "media-video"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/universal-accessaccessibility"
+          }
+        },
+        "name": "Universal Access/Accessibility",
+        "slug": "universal-accessaccessibility"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/news-magazines"
+          }
+        },
+        "name": "News & Magazines",
+        "slug": "news-magazines"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/graphics"
+          }
+        },
+        "name": "Graphics",
+        "slug": "graphics"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/lifestyle"
+          }
+        },
+        "name": "Lifestyle",
+        "slug": "lifestyle"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/medical"
+          }
+        },
+        "name": "Medical",
+        "slug": "medical"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/developer-tools"
+          }
+        },
+        "name": "Developer Tools",
+        "slug": "developer-tools"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/games"
+          }
+        },
+        "name": "Games",
+        "slug": "games"
+      },
+      {
+        "has_children": false,
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/departments/books-comics"
+          }
+        },
+        "name": "Books & Comics",
+        "slug": "books-comics"
+      }
+    ],
+    "clickindex:highlight": [
+      {
+        "_embedded": {
+          "clickindex:package": [
+            {
+              "publisher": "Zhang Boren",
+              "name": "com.ubuntu.developer.bobo1993324.udropcabin",
+              "title": "uDropCabin",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/06/logo.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.17,
+              "version": "0.2.1",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.bobo1993324.udropcabin"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Ubuntu Core App Developers",
+              "name": "com.ubuntu.docviewer",
+              "title": "Document Viewer",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/11/docviewer_32.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4,
+              "version": "0.3.92",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.docviewer"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Michael Zanetti",
+              "name": "com.ubuntu.developer.mzanetti.wheretheissat",
+              "title": "WhereTheIssAt",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/08/wheretheissat.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 5,
+              "version": "0.4.0",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.mzanetti.wheretheissat"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Michael Zanetti",
+              "name": "com.ubuntu.developer.mzanetti.ubuntu-authenticator",
+              "title": "Authenticator",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2013/10/ubuntu-authenticator256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.72,
+              "version": "0.10.0",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.mzanetti.ubuntu-authenticator"
+                }
+              },
+              "architecture": [
+                "amd64",
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Michael Zanetti",
+              "name": "com.ubuntu.developer.mzanetti.tagger",
+              "title": "Tagger",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2013/11/tagger256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 3.64,
+              "version": "0.9.0.0",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.mzanetti.tagger"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Dennis O'Flaherty",
+              "name": "com.ubuntu.developer.doflah.realtai",
+              "title": "Réaltaí",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/04/realtai256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.6,
+              "version": "0.6.3",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.doflah.realtai"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            }
+          ]
+        },
+        "slug": "top-apps",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/highlights/top-apps"
+          }
+        },
+        "description": "",
+        "name": "Top apps"
+      },
+      {
+        "_embedded": {
+          "clickindex:package": [
+            {
+              "publisher": "Michael Zanetti",
+              "name": "com.ubuntu.developer.mzanetti.machines-vs-machines",
+              "title": "Machines vs. Machines",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2015/01/mvm-game-icon256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.97,
+              "version": "1.2.0",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.mzanetti.machines-vs-machines"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Riccardo Padovani",
+              "name": "com.ubuntu.developer.rpadovani.100balls",
+              "title": "100balls",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2015/02/100balls_256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.57,
+              "version": "0.4.1",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.rpadovani.100balls"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Robert Ancell",
+              "name": "com.ubuntu.developer.robert-ancell.dotty",
+              "title": "Dotty",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2013/12/dotty.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.2,
+              "version": "8",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.andrew-hayzen.volleyball2d"
+                }
+              },
+              "architecture": [
+                "all"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Filippo Scognamiglio",
+              "name": "com.ubuntu.developer.flscogna.ubuntu-netwalk",
+              "title": "Ubuntu Netwalk",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/03/ubuntuNetwalkicon256.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.92,
+              "version": "0.9.2",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.flscogna.ubuntu-netwalk"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Ken VanDine",
+              "name": "com.ubuntu.developer.ken-vandine.pathwind",
+              "title": "PathWind",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/05/pathwind.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.38,
+              "version": "0.2.9",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.ken-vandine.pathwind"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            },
+            {
+              "publisher": "Oliver Grawert",
+              "name": "com.ubuntu.developer.ogra.speed-pool-king",
+              "title": "Speed Billiards",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/11/icon_e2OQD6l.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 5,
+              "version": "0.1",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.ogra.speed-pool-king"
+                }
+              },
+              "architecture": [
+                "all"
+              ],
+              "prices": {}
+            }
+          ]
+        },
+        "slug": "our-favorite-games",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/highlights/our-favorite-games"
+          }
+        },
+        "description": "",
+        "name": "Our favorite games"
+      },
+      {
+        "_embedded": {
+          "clickindex:package": [
+            {
+              "publisher": "Canonical",
+              "name": "com.canonical.scopes.wikinear",
+              "title": "Nearby Articles Scope",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/11/store-icon_cDUSB9o.png",
+              "price": 0,
+              "content": "scope",
+              "ratings_average": 5,
+              "version": "1.0.9",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.canonical.scopes.wikinear"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            }
+          ]
+        },
+        "slug": "travel-apps",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/highlights/travel-apps"
+          }
+        },
+        "description": "",
+        "name": "Travel apps"
+      },
+      {
+        "_embedded": {
+          "clickindex:package": [
+            {
+              "publisher": "Ubuntu Core App Developers",
+              "name": "com.ubuntu.telegram",
+              "title": "Telegram",
+              "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2015/02/icon_Gah5OG4.png",
+              "price": 0,
+              "content": "application",
+              "ratings_average": 4.52,
+              "version": "1.0.6.90",
+              "_links": {
+                "self": {
+                  "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.telegram"
+                }
+              },
+              "architecture": [
+                "armhf"
+              ],
+              "prices": {}
+            }
+          ]
+        },
+        "slug": "app-of-the-week",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/highlights/app-of-the-week"
+          }
+        },
+        "description": "",
+        "name": "App of the week"
+      }
+    ]
+  },
+  "_links": {
+    "search": {
+      "title": "Search",
+      "href": "[FAKE_SERVER_BASE]/api/v1/search{?q}",
+      "templated": true
+    },
+    "clickindex:departments": {
+      "href": "[FAKE_SERVER_BASE]/api/v1/departments",
+      "title": "Departments"
+    },
+    "clickindex:highlight": {
+      "title": "Highlight",
+      "href": "[FAKE_SERVER_BASE]/api/v1/highlights/{slug}",
+      "templated": true
+    },
+    "curies": [
+      {
+        "href": "https://wiki.ubuntu.com/AppStore/Interfaces/ClickPackageIndex#reltype_{rel}",
+        "name": "clickindex",
+        "templated": true
+      }
+    ],
+    "self": {
+      "href": "[FAKE_SERVER_BASE]/api/v1"
+    },
+    "clickindex:highlights": {
+      "href": "[FAKE_SERVER_BASE]/api/v1/highlights",
+      "title": "Highlights"
+    },
+    "clickindex:package": {
+      "title": "Package",
+      "href": "[FAKE_SERVER_BASE]/api/v1/package/{name}",
+      "templated": true
+    },
+    "clickindex:department": {
+      "title": "Department",
+      "href": "[FAKE_SERVER_BASE]/api/v1/departments/{slug}",
+      "templated": true
+    }
+  }
+}
+

=== added directory 'tests/scope-harness/fake_responses/click-package-index/api/v1/package'
=== added file 'tests/scope-harness/fake_responses/click-package-index/api/v1/package/com.ubuntu.calendar'
--- tests/scope-harness/fake_responses/click-package-index/api/v1/package/com.ubuntu.calendar	1970-01-01 00:00:00 +0000
+++ tests/scope-harness/fake_responses/click-package-index/api/v1/package/com.ubuntu.calendar	2015-04-14 19:49:39 +0000
@@ -0,0 +1,86 @@
+{
+  "whitelist_country_codes": [],
+  "status": "Published",
+  "last_updated": "2015-03-05T14:25:13.226958Z",
+  "video_embedded_html_urls": [],
+  "screenshot_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/10/device-2014-10-02-155500.png",
+  "video_urls": [],
+  "framework": [
+    "ubuntu-sdk-14.10-qml"
+  ],
+  "terms_of_service": "",
+  "keywords": [
+    "calendar",
+    "time",
+    "task",
+    "plan",
+    "journal",
+    "diary"
+  ],
+  "stores": {
+    "china-mobile": {
+      "status": "Published"
+    },
+    "ninjablocks": {
+      "status": "Published"
+    },
+    "ubuntu": {
+      "status": "Published"
+    }
+  },
+  "id": 156,
+  "title": "Calendar",
+  "support_url": "mailto:[e-mail]",
+  "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/02/calendar-app_32.png",
+  "binary_filesize": 149943,
+  "download_url": "https://public.apps.ubuntu.com/download/com.ubuntu/calendar/com.ubuntu.calendar_0.4.572_all.click",
+  "allow_unauthenticated": false,
+  "content": "application",
+  "developer_name": "Ubuntu Core App Developers",
+  "version": "0.4.600",
+  "_links": {
+    "curies": [
+      {
+        "href": "https://wiki.ubuntu.com/AppStore/Interfaces/ClickPackageIndex#reltype_{rel}",
+        "name": "clickindex",
+        "templated": true
+      }
+    ],
+    "self": {
+      "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.calendar"
+    }
+  },
+  "company_name": "",
+  "department": [
+    "accessories"
+  ],
+  "screenshot_urls": [
+    "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/10/device-2014-10-02-155500.png",
+    "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/10/device-2014-10-02-155757.png",
+    "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/10/device-2014-10-02-155855.png"
+  ],
+  "website": "https://launchpad.net/ubuntu-calendar-app",
+  "description": "The Calendar application for Ubuntu devices lets you organise your life your  way by month, week or daily diary\nIt’s about the task and the context; use the calendar app as a todo list,  a diary, a planner, a journal, a life log; and the calendar will behave how you need it to.",
+  "click_framework": [
+    "ubuntu-sdk-14.10-qml"
+  ],
+  "price": 0,
+  "translations": {},
+  "blacklist_country_codes": [],
+  "date_published": "2013-10-16T19:19:29.080512Z",
+  "alias": null,
+  "prices": {},
+  "icon_urls": {
+    "256": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/02/calendar-app_32.png"
+  },
+  "download_sha512": "2fa658804e63da1869037cd9bc74b792875404f03b6c6449271ae5244688ff42a4524712ccb748ab9004344cccddd59063f3d3a4af899a3cc6f64ddc1a27072b",
+  "publisher": "Ubuntu Core App Developers",
+  "name": "com.ubuntu.calendar",
+  "license": "GNU GPL v3",
+  "changelog": "* Improved week view\r\n* Events appear faster\r\n* Events can be created by longpress on timeline\r\n* Events can be moved via drag/drop",
+  "click_version": "0.1",
+  "ratings_average": 4,
+  "architecture": [
+    "all"
+  ]
+}

=== added file 'tests/scope-harness/fake_responses/click-package-index/api/v1/search'
--- tests/scope-harness/fake_responses/click-package-index/api/v1/search	1970-01-01 00:00:00 +0000
+++ tests/scope-harness/fake_responses/click-package-index/api/v1/search	2015-04-14 19:49:39 +0000
@@ -0,0 +1,76 @@
+{
+  "_embedded": {
+    "clickindex:package": [
+      {
+        "publisher": "Ubuntu Core App Developers",
+        "name": "com.ubuntu.calendar",
+        "title": "Calendar",
+        "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/02/calendar-app_32.png",
+        "price": 0,
+        "content": "application",
+        "ratings_average": 4,
+        "version": "0.4.600",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.calendar"
+          }
+        },
+        "architecture": [
+          "all"
+        ],
+        "prices": {}
+      },
+      {
+        "publisher": "Sonrise Software",
+        "name": "com.ubuntu.developer.mdspencer.project-dashboard",
+        "title": "Project Dashboard",
+        "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/03/project-dashboard-256.png",
+        "price": 0,
+        "content": "application",
+        "ratings_average": 3.71,
+        "version": "0.5.3",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.mdspencer.project-dashboard"
+          }
+        },
+        "architecture": [
+          "all"
+        ],
+        "prices": {}
+      },
+      {
+        "publisher": "Canonical Group Limited",
+        "name": "com.ubuntu.developer.webapps.webapp-googlecalendar",
+        "title": "Google Calendar",
+        "icon_url": "https://myapps.developer.ubuntu.com/site_media/appmedia/2014/04/icon256_1.png",
+        "price": 0,
+        "content": "application",
+        "ratings_average": 3.5,
+        "version": "1.0.12",
+        "_links": {
+          "self": {
+            "href": "[FAKE_SERVER_BASE]/api/v1/package/com.ubuntu.developer.webapps.webapp-googlecalendar"
+          }
+        },
+        "architecture": [
+          "all"
+        ],
+        "prices": {}
+      }
+    ]
+  },
+  "_links": {
+    "curies": [
+      {
+        "href": "https://wiki.ubuntu.com/AppStore/Interfaces/ClickPackageIndex#reltype_{rel}",
+        "name": "clickindex",
+        "templated": true
+      }
+    ],
+    "self": {
+      "href": "[FAKE_SERVER_BASE]/api/v1/search?q=Calendar"
+    }
+  }
+}
+

=== added directory 'tests/scope-harness/fake_responses/ratings-and-reviews'
=== added directory 'tests/scope-harness/fake_responses/ratings-and-reviews/click'
=== added directory 'tests/scope-harness/fake_responses/ratings-and-reviews/click/api'
=== added directory 'tests/scope-harness/fake_responses/ratings-and-reviews/click/api/1.0'
=== added directory 'tests/scope-harness/fake_responses/ratings-and-reviews/click/api/1.0/reviews'
=== added file 'tests/scope-harness/fake_responses/ratings-and-reviews/click/api/1.0/reviews/index.json'
--- tests/scope-harness/fake_responses/ratings-and-reviews/click/api/1.0/reviews/index.json	1970-01-01 00:00:00 +0000
+++ tests/scope-harness/fake_responses/ratings-and-reviews/click/api/1.0/reviews/index.json	2015-04-14 19:49:39 +0000
@@ -0,0 +1,210 @@
+[
+    {
+        "rating": 2, 
+        "hide": false, 
+        "package_name": "com.ubuntu.calendar", 
+        "language": "es", 
+        "reviewer_username": "hnXrswe", 
+        "usefulness_total": 0, 
+        "usefulness_favorable": 0, 
+        "review_text": "El diseño es simple pero aceptable, pero no sincroniza con google. Nexus 4.", 
+        "date_deleted": null, 
+        "summary": "Review", 
+        "version": "0.4.585", 
+        "date_created": "2015-02-23T16:46:16.314Z", 
+        "reviewer_displayname": "javipt", 
+        "id": 1201
+    }, 
+    {
+        "rating": 2, 
+        "hide": false, 
+        "package_name": "com.ubuntu.calendar", 
+        "language": "es", 
+        "reviewer_username": "oskitar1981", 
+        "usefulness_total": 0, 
+        "usefulness_favorable": 0,