diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-04-19 12:18:20 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-05-02 09:05:19 +0000 |
| commit | 3e746644c6703a522d5658fc90dde721b4466d5b (patch) | |
| tree | 6a43ad950cc718027731b03f10c6ed5d1b8cd458 /tests | |
| parent | 4e7ce1659c3f80f40cd24fa291dd4de5922f6dda (diff) | |
Update tests for "Don't create undeserializable mojo origins"
Check that the workaround in src/3rdparty bf10f2f32a behaves as expected.
Task-number: QTBUG-62536
Change-Id: Ieae4ad61df303aae5c65d4f7be487574ce32eae0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/origins/resources/dedicatedWorker.html | 11 | ||||
| -rw-r--r-- | tests/auto/widgets/origins/tst_origins.cpp | 12 |
2 files changed, 14 insertions, 9 deletions
diff --git a/tests/auto/widgets/origins/resources/dedicatedWorker.html b/tests/auto/widgets/origins/resources/dedicatedWorker.html index eacdd18ac..cb4f14e73 100644 --- a/tests/auto/widgets/origins/resources/dedicatedWorker.html +++ b/tests/auto/widgets/origins/resources/dedicatedWorker.html @@ -5,9 +5,14 @@ <script> var done = false; var result; - let worker = new Worker("dedicatedWorker.js"); - worker.onmessage = (e) => { done = true; result = e.data; }; - worker.postMessage(41); + var error; + try { + let worker = new Worker("dedicatedWorker.js"); + worker.onmessage = (e) => { done = true; result = e.data; }; + worker.postMessage(41); + } catch (e) { + done = true; error = e.message; + } </script> </head> <body></body> diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp index 4dff28201..61d54e6de 100644 --- a/tests/auto/widgets/origins/tst_origins.cpp +++ b/tests/auto/widgets/origins/tst_origins.cpp @@ -262,9 +262,8 @@ void tst_Origins::webSocket() QVERIFY(load(QSL("qrc:/resources/websocket.html"))); QTRY_VERIFY(eval(QSL("err")) == QVariant(expected)); - // FIXME(juvaldma): QTBUG-62536 - // QVERIFY(load(QSL("tst:/resources/websocket.html"))); - // QTRY_VERIFY(eval(QSL("err")) == QVariant(expected)); + QVERIFY(load(QSL("tst:/resources/websocket.html"))); + QTRY_VERIFY(eval(QSL("err")) == QVariant(expected)); } // Create a (Dedicated)Worker. Since dedicated workers can only be accessed from @@ -280,9 +279,10 @@ void tst_Origins::dedicatedWorker() QCOMPARE(eval(QSL("result")), QVariant(42)); // FIXME(juvaldma): QTBUG-62536 - // QVERIFY(load(QSL("tst:/resources/dedicatedWorker.html"))); - // QTRY_VERIFY(eval(QSL("done")).toBool()); - // QCOMPARE(eval(QSL("result")), QVariant(42)); + QVERIFY(load(QSL("tst:/resources/dedicatedWorker.html"))); + QTRY_VERIFY(eval(QSL("done")).toBool()); + QVERIFY(eval(QSL("error")).toString() + .contains(QSL("Access to dedicated workers is denied to origin 'tst://'"))); } // Create a SharedWorker. Shared workers can be accessed from multiple pages, |