Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb52773_fixing_tests_2' into 'master'
Fix some more tests.

See merge request mer-core/qtmozembed!81
  • Loading branch information
Tomin1 committed Apr 12, 2021
2 parents 536e1b1 + cba6aba commit 8ebb544
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
8 changes: 4 additions & 4 deletions tests/auto/desktop-qt5/favicons/tst_favicon.qml
Expand Up @@ -30,12 +30,12 @@ Item {
anchors.fill: parent
onViewInitialized: {
appWindow.mozViewInitialized = true
webViewport.addMessageListener("chrome:linkadded")
webViewport.addMessageListener("Link:SetIcon")
}
onRecvAsyncMessage: {
print("onRecvAsyncMessage:" + message + ", data:" + data)
if (message == "chrome:linkadded" && data.get == "image/x-icon") {
appWindow.favicon = data.href
// print("onRecvAsyncMessage:" + message + ", data:" + data)
if (message == "Link:SetIcon" && data.url.slice(0, 17) == "data:image/x-icon") {
appWindow.favicon = data.url
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions tests/auto/run-tests.sh
Expand Up @@ -20,9 +20,15 @@ export QTTESTSLOCATION=${QTTESTSLOCATION:-"/opt/tests/qtmozembed/auto/mer-qt$QTV

#export MOZ_LOG=EmbedLiteTrace:5,EmbedNonImpl:5,EmbedLiteApp:5,EmbedLiteView:5,EmbedLiteViewThreadParent:5

# Clean up settings
rm -rf ~/.mozilla/mozembed-testrunner/

$QMLMOZTESTRUNNER -opengl $@
exit_code=$?
cd $CURDIR
kill $DBUS_SESSION_BUS_PID

# Clean up settings afterwards
rm -rf ~/.mozilla/mozembed-testrunner/

exit $exit_code
2 changes: 1 addition & 1 deletion tests/auto/shared/newviewrequest/newwin.html
Expand Up @@ -4,7 +4,7 @@
<script>
function open_win()
{
window.open("https://example.com/")
window.open("about:license")
}
</script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/shared/sharedTests.js
Expand Up @@ -218,7 +218,7 @@ function shared_viewTestNewWindowAPI()
testcaseid.verify(mozView !== undefined)
testcaseid.verify(MyScript.waitLoadFinished(mozView))
testcaseid.verify(wrtWait(function() { return (!mozView.painted); }))
testcaseid.compare(mozView.url, "https://example.com/")
testcaseid.compare(mozView.url, "about:license")
mozContext.dumpTS("test_viewTestNewWindowAPI end")
}

Expand Down

0 comments on commit 8ebb544

Please sign in to comment.