diff options
author | Adam Kallai <kadam@inf.u-szeged.hu> | 2014-09-15 02:18:01 -0700 |
---|---|---|
committer | Adam Kallai <kadam@inf.u-szeged.hu> | 2014-09-23 22:07:03 +0200 |
commit | a193b3b9abb6d742b40d0a8067155932a5c2c2d3 (patch) | |
tree | f66e946da6921fd0f0f2ab80fbbfa1d48f58802a /tests/auto/quick/qmltests | |
parent | 599df4b32bffedcaebb3dbd1605d919642e72e69 (diff) |
Fix an assertion in web_content_delegates_qt.cpp
If we get a replacement content, we can see a DidFinishLoad event for a frame.
This error page should be ignored based on the frame.
Change-Id: I3e1cd1773e8c5fc608605197c957011ddf258123
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tests/auto/quick/qmltests')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_loadFail.qml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml index e2282129f..7b0a1849e 100644 --- a/tests/auto/quick/qmltests/data/tst_loadFail.qml +++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml @@ -50,6 +50,12 @@ TestWebEngineView { property variant testUrl + SignalSpy { + id: spyIconChanged + target: webEngineView + signalName: "iconChanged" + } + TestCase { id: test name: "WebEngineViewLoadFail" @@ -57,6 +63,11 @@ TestWebEngineView { testUrl = Qt.resolvedUrl("file_that_does_not_exist.html") webEngineView.url = testUrl verify(webEngineView.waitForLoadFailed()) + spyIconChanged.clear() + + // If this testcase finishes too early, we can not handle the received replacement content. + // So we should wait to ignore this error page. + spyIconChanged.wait() } } |