Merge lp:~osomon/oxide/restore-error-page-unit-test into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Add a unit test to verify that restoring the state of a navigation that had triggered an error triggers the error again.
Also update an existing test to verify that reloading a page that had triggered an error generates the same sequence of load events.

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'qt/tests/qmltests/api/tst_WebView_loading.qml'
--- qt/tests/qmltests/api/tst_WebView_loading.qml	2015-02-26 20:59:00 +0000
+++ qt/tests/qmltests/api/tst_WebView_loading.qml	2015-03-02 21:53:23 +0000
@@ -162,6 +162,29 @@
       compare(spy.count, 1,
               "WebView.loading should have changed twice during the load");
       compare(expectedLoadEvents.length, 0, "Some load events are missing");
+
+      // Verify that reloading a page that triggered an error
+      // generates the same sequence of load events
+      spy.clear();
+      expectedLoadEvents = [
+        { type: LoadEvent.TypeStarted, url: url, loading: true },
+        { type: LoadEvent.TypeFailed, url: url, loading: true },
+        { type: LoadEvent.TypeCommitted, url: url, error: true, loading: true }
+      ];
+      webView.reload();
+
+      verify(webView.loading,
+             "WebView.loading should be true once we start loading");
+      compare(spy.count, 1);
+
+      spy.clear();
+      spy.wait();
+
+      verify(!webView.loading,
+             "WebView.loading should be false after we finish loading");
+      compare(spy.count, 1,
+              "WebView.loading should have changed twice during the load");
+      compare(expectedLoadEvents.length, 0, "Some load events are missing");
     }
 
     function test_WebView_loading5_redirection() {
 
=== modified file 'qt/tests/qmltests/api/tst_WebView_save_restore_state.qml'
--- qt/tests/qmltests/api/tst_WebView_save_restore_state.qml	2014-11-20 12:37:10 +0000
+++ qt/tests/qmltests/api/tst_WebView_save_restore_state.qml	2015-03-02 21:53:23 +0000
@@ -149,4 +149,44 @@
             "document.querySelector('#textInput').value") == "Te$t"; });
     restored.destroy();
   }
+
+  function test_WebView_save_and_restore_error_page_data() {
+    return get_restore_types();
+  }
+
+  // Test that restoring the state of a navigation that had triggered an error
+  // triggers the error again (see https://launchpad.net/bugs/1423531).
+  function test_WebView_save_and_restore_error_page(data) {
+    var url = "http://invalid/";
+    webView.url = url;
+    verify(webView.waitForLoadCommitted(),
+           "Timed out waiting for error page");
+
+    var state = webView.currentState;
+    verify(state.length > 0);
+
+    var restored = webViewComponent.createObject(
+        webView, {"restoreType": data.restoreType, "restoreState": state});
+    verify(restored !== null);
+
+    var expectedLoadEvents = [
+      { type: LoadEvent.TypeStarted, isError: false },
+      { type: LoadEvent.TypeFailed, isError: false },
+      { type: LoadEvent.TypeCommitted, isError: true }
+    ];
+    function _loadEvent(event) {
+      var expected = expectedLoadEvents[0];
+      compare(event.type, expected.type);
+      compare(event.url, url);
+      compare(event.isError, expected.isError);
+      expectedLoadEvents.shift();
+    }
+    restored.loadEvent.connect(_loadEvent);
+
+    tryCompare(restored, "url", url);
+    restored.waitFor(function() {
+        return (expectedLoadEvents.length === 0);
+    });
+    restored.destroy();
+  }
 }