Merge lp:~mhr3/unity-lens-shopping/use-proper-emblems into lp:unity-lens-shopping

[Michal Hruby]

Use proper emblems on the search results

So far we're not using proper emblems on the search results, this ensures we do.

Trivial change, no new tests.

[Paweł Stołowski (stolowski)]

Works fine with latest branch of Unity. +1.

review: Approve

[Paweł Stołowski (stolowski)]

Ahh.. can you update manual tests?

review: Needs Fixing

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-lens-shopping/1/console reported an error when processing this lp:~mhr3/unity-lens-shopping/use-proper-emblems branch.
Not merging it.

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Paweł Stołowski (stolowski)]

+1

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-lens-shopping/2/console reported an error when processing this lp:~mhr3/unity-lens-shopping/use-proper-emblems branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-lens-shopping/3/console reported an error when processing this lp:~mhr3/unity-lens-shopping/use-proper-emblems branch.
Not merging it.

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-09-26 15:33:10 +0000
+++ src/scope.vala	2012-09-27 08:48:21 +0000
@@ -383,13 +383,32 @@
 
         if (image_uri != "")
         {
-          // TODO: what to do if we have price but no icon?
           var file = File.new_for_uri (image_uri);
           var icon = new AnnotatedIcon (new FileIcon (file));
           // FIXME: dash doesn't like empty string as ribbon
-          icon.ribbon = price == null || price == "" ? " " : price; 
-          // FIXME: the service doesn't expose categories yet
-          // icon.category = CategoryType.BOOK;
+          icon.ribbon = price == null || price == "" ? " " : price;
+
+          unowned string category = "";
+          if (result.has_member ("category"))
+            category = result.get_string_member ("category");
+          switch (category)
+          {
+            case "application":
+              icon.category = CategoryType.APPLICATION;
+              break;
+            case "movie":
+              icon.category = CategoryType.MOVIE;
+              break;
+            case "music":
+              icon.category = CategoryType.MUSIC;
+              break;
+            case "book":
+              icon.category = CategoryType.BOOK;
+              break;
+            default:
+              icon.category = CategoryType.HOME; // will use generic icon
+              break;
+          }
           image_uri = icon.to_string ();
         }
 

=== modified file 'tests/manual-tests/shopping-lens-tests.txt'
--- tests/manual-tests/shopping-lens-tests.txt	2012-09-26 06:38:26 +0000
+++ tests/manual-tests/shopping-lens-tests.txt	2012-09-27 08:48:21 +0000
@@ -70,6 +70,19 @@
 Expected Results:
 Web site for selected item is opened in web browser, with an option to complete purchase.
 
+Emblems on icons provided by the Shopping lens
+----------------------------------------------------
+Whenever there are results from the shopping lens, emblems are present on the icons.
+
+Setup:
+Internet connectivity.
+
+Actions:
+Perform a search so that some results in the "More suggestions" category are displayed. (for example search for "novel")
+
+Expected Results:
+All items that are displayed have an icon categorizing the product - either a music icon, book, movie, or a generic shopping bag icon along with a price.
+
 'Disable' Shopping Lens Search
 ----------------------------------------------------
 Disabling the shopping lens should not show any result.