From 2ec15707bb03ec2a368c4fde66e968d5d1943243 Mon Sep 17 00:00:00 2001 From: Simon Pieters Date: Fri, 1 Jun 2018 14:07:13 +0200 Subject: [PATCH 1/2] HTML: Run a history navigation test in a popup to report a result Part of #11269. --- ...ss-origin-main-frame-navigation-popup.sub.html | 10 ++++++++++ .../support/window-name-test.sub.html | 2 ++ ...er-cross-origin-main-frame-navigation.sub.html | 15 +++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html diff --git a/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html b/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html new file mode 100644 index 00000000000000..e13d191658046b --- /dev/null +++ b/html/browsers/browsing-the-web/history-traversal/support/window-name-after-cross-origin-main-frame-navigation-popup.sub.html @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html b/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html index 65662031a044b5..15a3db91304722 100644 --- a/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html +++ b/html/browsers/browsing-the-web/history-traversal/support/window-name-test.sub.html @@ -1,6 +1,7 @@ + From 3d713c549db9785a902832c9e24f50cad865d766 Mon Sep 17 00:00:00 2001 From: Simon Pieters Date: Fri, 1 Jun 2018 14:17:34 +0200 Subject: [PATCH 2/2] Fix typo in traverse_the_history_1.html --- .../the-history-interface/traverse_the_history_1.html | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/html/browsers/history/the-history-interface/traverse_the_history_1.html b/html/browsers/history/the-history-interface/traverse_the_history_1.html index 11715583dd4fc8..9b59bb058798bb 100644 --- a/html/browsers/history/the-history-interface/traverse_the_history_1.html +++ b/html/browsers/history/the-history-interface/traverse_the_history_1.html @@ -13,16 +13,13 @@ clearTimeout(timer); timer = setTimeout(t.step_func( function() { - try { - assert_array_equals(pages, [4, 2], "Pages opened during history navigation"); - t.done(); - } finally { - // win.close(); - } + assert_array_equals(pages, [4, 2], "Pages opened during history navigation"); + t.done(); } ), 500); } ); - t.step(function() {win = window.open("history_entry.html&urls=history_entry.html,history_entry.html,traverse_the_history_1-1.html"); + t.step(function() {win = window.open("history_entry.html?urls=history_entry.html,history_entry.html,traverse_the_history_1-1.html"); + t.add_cleanup(() => { win.close() }); });