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

[dobey]

Merge release revisions from trunk back to devel.
Don't use empty strings for the icon and app URIs in the tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/48

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[lp:~dobey/unity-scope-click/merge-trunk]

264. By dobey on 2014-05-20

Merge release revisions from trunk back to devel.
Don't use empty strings for the icon and app URIs in the tests.

Approved by Rodney Dawes, PS Jenkins bot.

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-06 17:24:10 +0000
+++ debian/changelog	2014-05-20 18:31:10 +0000
@@ -1,3 +1,38 @@
+unity-scope-click (0.1+14.10.20140520-0ubuntu1) utopic; urgency=low
+
+  [ Rodney Dawes ]
+  * Don't use empty strings for the icon and app URIs in the tests. (LP:
+    #1321312)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 20 May 2014 14:57:40 +0000
+
+unity-scope-click (0.1+14.10.20140516-0ubuntu1) utopic; urgency=low
+
+  [ Rodney Dawes ]
+  * Improve the text in the uninstall confirmation dialog per latest
+    design. (LP: #1234211). Reorder the header and screenshots to more
+    closely match the new design. Translations updates. Update autopilot
+    tests for some changes in apps and unity8. Log the response body on
+    network errors. Initial work for splitting scope per new designs.
+    Support running unit tests under valgrind. (LP: #1234211)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 16 May 2014 15:34:59 +0000
+
+unity-scope-click (0.1+14.10.20140508.1-0ubuntu1) utopic; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Rodney Dawes ]
+  * Support for translations of installed apps. (LP: #1237992) Fix
+    translations not being installed. (LP: #1316802) Fix merge of
+    translations to clickscope.ini. (LP: #1316778) Strip full path from
+    translations and template. (LP: #1316777) Enable submission of
+    reviews from the installed preview. (LP: #1237992, #1316777,
+    #1316802, #1316778)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 08 May 2014 18:24:59 +0000
+
 unity-scope-click (0.1+14.10.20140506-0ubuntu1) utopic; urgency=low
 
   [ Alejandro J. Cura ]

=== modified file 'scope/tests/test_index.cpp'
--- scope/tests/test_index.cpp	2014-05-14 18:34:20 +0000
+++ scope/tests/test_index.cpp	2014-05-20 18:31:10 +0000
@@ -445,7 +445,7 @@
     click::Package package = {
         "org.example.testapp", "Test App", 0.00,
         "/tmp/foo.png",
-        "", "0.1.5"
+        "uri", "0.1.5"
     };
     std::string expected = "pkcon -p remove org.example.testapp;0.1.5;all;local:click";
     EXPECT_CALL(*this, execute_uninstall_command(expected, _)).Times(1);

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-05-14 18:34:20 +0000
+++ scope/tests/test_query.cpp	2014-05-20 18:31:10 +0000
@@ -159,7 +159,7 @@
 TEST(QueryTest, testAddAvailableAppsPushesResults)
 {
     click::PackageList packages {
-        {"name", "title", 0.0, "", ""}
+        {"name", "title", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
@@ -181,7 +181,7 @@
 TEST(QueryTest, testAddAvailableAppsCallsFinished)
 {
     click::PackageList packages {
-        {"name", "title", 0.0, "", ""}
+        {"name", "title", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
@@ -202,7 +202,7 @@
 TEST(QueryTest, testAddAvailableAppsWithNullCategory)
 {
     click::PackageList packages {
-        {"name", "title", 0.0, "", ""}
+        {"name", "title", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
@@ -221,7 +221,7 @@
 TEST(QueryTest, testQueryRunCallsAddAvailableApps)
 {
     click::PackageList packages {
-        {"name", "title", 0.0, "", ""}
+        {"name", "title", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
@@ -240,8 +240,8 @@
 TEST(QueryTest, testDuplicatesFilteredOnPackageName)
 {
     click::PackageList packages {
-        {"org.example.app1", "app title1", 0.0, "", ""},
-        {"org.example.app2", "app title2", 0.0, "", ""}
+        {"org.example.app1", "app title1", 0.0, "icon", "uri"},
+        {"org.example.app2", "app title2", 0.0, "icon", "uri"}
     };
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");