summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Kallai <kadam@inf.u-szeged.hu>2016-05-25 11:29:57 +0200
committerAdam Kallai <kadam@inf.u-szeged.hu>2016-05-25 10:55:35 +0000
commit9da1716d05770f6deb3af654f28024234d711eb7 (patch)
treed7f307dd2102fec8c87e7c2ac67083e70d20ac5a
parentbbfa47645204269ed50cbea21cb27febd676dfc2 (diff)
Unskip test_errorPageEnabled in tst_favicon.qml test
- Unskip this test becuse the releted issue is already fixed. - It is worth to restore the initial page before each test functions, not only when there was icon url. Change-Id: I2a71e026ab3ffabb8de191b7296a67ac44479934 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--tests/auto/quick/qmltests/data/tst_favicon.qml12
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index 633859add..f8ad998ef 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
@@ -70,14 +70,11 @@ TestWebEngineView {
name: "WebEngineFavicon"
when: windowShown
- function init() {
- if (webEngineView.icon != '') {
- // If this is not the first test, then load a blank page without favicon, restoring the initial state.
- webEngineView.url = 'about:blank'
- verify(webEngineView.waitForLoadSucceeded())
- iconChangedSpy.wait()
- }
+ function init() {
+ // It is worth to restore the initial state with loading a blank page before all test functions.
+ webEngineView.url = 'about:blank'
+ verify(webEngineView.waitForLoadSucceeded())
iconChangedSpy.clear()
}
@@ -149,7 +146,6 @@ TestWebEngineView {
}
function test_errorPageEnabled() {
- skip("Error page does not work properly: QTBUG-48995")
WebEngine.settings.errorPageEnabled = true
compare(iconChangedSpy.count, 0)