← Back to branch summary

~rpadovani/oxide/type-info

« back to all changes in this revision

Viewing changes to qt/tests/qmltests/ssl/tst_CertificateError.qml

  • Committer: Riccardo Padovani
  • Date: 2015-10-19 07:56:29 UTC
  • mfrom: (1088.1.131 oxide)
  • Revision ID: riccardo@rpadovani.com-20151019075629-z0mlhwlb9xflkovw
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/tests/qmltests/ssl/tst_CertificateError.qml
246
246
        webView.getTestApiForFrame(frame).evaluateCode(
247
247
            "window.location = \"https://testsuite/empty.html\";",
248
248
            true);
249
 
        webView.waitFor(function() { return frame.url == "https://testsuite/empty.html" });
 
249
        TestUtils.waitFor(function() { return frame.url == "https://testsuite/empty.html" });
250
250
      }
251
251
 
252
252
      // Test that deleting a frame cancels errors
253
253
      function _action_4() {
254
254
        var frame = webView.rootFrame.childFrames[0];
255
 
        var obs = OxideTestingUtils.createDestructionObserver(frame);
 
255
        var obs = Utils.createDestructionObserver(frame);
256
256
        webView.getTestApi().evaluateCode("
257
257
var f = document.getElementsByTagName(\"iframe\")[0];
258
258
f.parentElement.removeChild(f);", true);
259
 
        webView.waitFor(function() { return obs.destroyed; });
 
259
        TestUtils.waitFor(function() { return obs.destroyed; });
260
260
      }
261
261
 
262
262
      // Test that interrupting a load before it's committed doesn't cancel