Merge lp:~mhr3/unity-lens-shopping/hide-errors into lp:unity-lens-shopping

[Michal Hruby]

Show empty preview on network issues, chug input strings instead of stripping them

Currently if it's not possible to get preview for a result (due to for example network issue). A preview is displayed with description that shows the error message from libsoup, although handy for development, this isn't desired to be shown to the user. (also includes a tiny closure data leak fix)

[Paweł Stołowski (stolowski)]

Could you please add a manual test for error case?

review: Needs Fixing

[Michal Hruby (mhr3)]

> Could you please add a manual test for error case?

Done

[Paweł Stołowski (stolowski)]

Thanks. Works Fine.

review: Approve

[Unity Merger (unity-merger)]

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

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-09-28 14:25:32 +0000
+++ src/scope.vala	2012-10-03 12:15:41 +0000
@@ -56,7 +56,7 @@
 
       /* No need to search if only the whitespace changes */
       generate_search_key.connect ((lens_search) => {
-        return lens_search.search_string.strip ();
+        return lens_search.search_string.chug ();
       });
 
       /* Listen for changes to the lens search entry */
@@ -107,7 +107,7 @@
                                               Cancellable cancellable)
     {
       search.results_model.clear ();
-      string query_string = search.search_string.strip ();
+      string query_string = search.search_string.chug ();
       if (query_string == "") return;
 
       var uri = build_search_uri (query_string, SearchType.GLOBAL);
@@ -128,7 +128,7 @@
                                        Cancellable cancellable)
     {
       search.results_model.clear ();
-      string query_string = search.search_string.strip ();
+      string query_string = search.search_string.chug ();
       if (query_string == "") return;
 
       // we want prefix matching too
@@ -155,8 +155,9 @@
       }
       catch (Error err)
       {
-        return new GenericPreview (Path.get_basename (details_uri),
-                                   err.message, null);
+        warning ("%s", err.message);
+        // FIXME: just return null when libunity handles that gracefully
+        return new GenericPreview ("", "", null);
       }
 
       if (U1MSPreviewFactory.is_u1ms_details (parser))
@@ -275,6 +276,12 @@
         throw new IOError.CANCELLED ("Cancelled");
       }
 
+      if (cancellable != null)
+      {
+        // clean up
+        cancellable.disconnect (cancel_id);
+      }
+
       if (msg.status_code < 100)
       {
         throw new IOError.FAILED ("Request failed with error %u", msg.status_code);

=== modified file 'tests/manual-tests/shopping-lens-tests.txt'
--- tests/manual-tests/shopping-lens-tests.txt	2012-09-28 14:25:32 +0000
+++ tests/manual-tests/shopping-lens-tests.txt	2012-10-03 12:15:41 +0000
@@ -70,6 +70,20 @@
 Expected Results:
 Web site for selected item is opened in web browser, with an option to complete purchase.
 
+Previewing item after losing network connectivity
+-------------------------------------------------
+Previewing and item after losing network should display an empty preview.
+
+Setup:
+Internet connectivity.
+
+Actions:
+Perform a search that returns results in the dash home "More suggestions" category.
+Disconnect from the internet, afterwards try previewing any of the results.
+
+Expected Results:
+An empty preview should be displayed. Note that performing searches without internet connectivity will not return any results in the "More suggestions" category.
+
 'Disable' Shopping Lens Search
 ----------------------------------------------------
 Disabling the shopping lens should not show any result.