mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1669604 - Make test_bug1422334.html xorigin compatible, r=smaug 

When xorigin is enabled, test url is amended with extra query parameters, as a way to send extra information via test runner, which this test does not expect. When we are comparing test url with the url of the iframe it embeds, we need to remove extra query parameters.

Differential Revision: https://phabricator.services.mozilla.com/D92771
This commit is contained in:
Anny G 2020-10-07 14:54:36 +00:00
Родитель c4e657f4da
Коммит 3d58b6a993
2 изменённых файлов: 10 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
docshell/test/mochitest/mochitest.ini
Просмотреть файл

@ -62,7 +62,6 @@ support-files =
bug1422334_redirect.html
bug1422334_redirect.html^headers^
!/docshell/test/navigation/blank.html
fail-if = xorigin
[test_bug385434.html]
skip-if = fission # Hangs, JavaScript error: http://mochi.test:8888/tests/docshell/test/mochitest/test_bug385434.html?currentTestURL=docshell%2Ftest%2Fmochitest%2Ftest_bug385434.html&closeWhenDone=undefined&showTestReport=true&expected=pass, line 132: NS_ERROR_FAILURE:; Bug 1668809
[test_bug387979.html]

20
docshell/test/mochitest/test_bug1422334.html
Просмотреть файл

@ -10,26 +10,26 @@
addLoadEvent(function() {
var ifr = document.querySelector("iframe");
var win = ifr.contentWindow;
is(win.location.href,
location.href.replace("mochitest/test_bug1422334.html",
"navigation/blank.html?x=y"),
is(win.location.href, location.href.replace(location.search, "")
.replace("mochitest/test_bug1422334.html",
"navigation/blank.html?x=y"),
"Should have the right location on initial load");
win.history.replaceState(null, '', win.location.pathname);
is(win.location.href,
location.href.replace("mochitest/test_bug1422334.html",
"navigation/blank.html"),
is(win.location.href, location.href.replace(location.search, "")
.replace("mochitest/test_bug1422334.html",
"navigation/blank.html"),
"Should have the right location after replaceState call");
ifr.onload = function() {
is(win.location.href,
location.href.replace("mochitest/test_bug1422334.html",
"navigation/blank.html"),
is(win.location.href, location.href.replace(location.search, "")
.replace("mochitest/test_bug1422334.html",
"navigation/blank.html"),
"Should have the right location after reload");
SimpleTest.finish();
}
win.location.reload();
})
});
</script>
</head>
<body>