Bug 1675318 - Part 11: Split up test for bug 1379762 from test_sessionhistory.html, r=peterv

annygakh · annygakh · commit f89cf12ec6f8 · 2020-11-13T23:30:18.000Z
Differential Revision: https://phabricator.services.mozilla.com/D96874
diff --git a/docshell/test/navigation/file_bug1379762-1.html b/docshell/test/navigation/file_bug1379762-1.html
@@ -20,8 +20,7 @@
         // Do this async so our load event gets a chance to fire if it plans to
         // do it.
         setTimeout(function() {
-          opener.nextTest();
-          window.close();
+          opener.finishTest();
         });
       }
     };
diff --git a/docshell/test/navigation/mochitest.ini b/docshell/test/navigation/mochitest.ini
@@ -60,6 +60,7 @@ support-files =
   file_bug1375833-frame2.html
   test_bug145971.html
   file_bug1609475.html
+  file_bug1379762-1.html
 
 [test_aboutblank_change_process.html]
 [test_bug13871.html]
@@ -91,7 +92,6 @@ skip-if =
 skip-if = fission # bug 1666602
 [test_sessionhistory.html]
 skip-if = toolkit == 'android' || fission # RANDOM on android
-support-files = file_bug1379762-1.html
 [test_dynamic_frame_forward_back.html]
 [test_sessionhistory_document_write.html]
 [test_session_history_entry_cleanup.html]
@@ -105,6 +105,8 @@ skip-if = fission # It relies on the bfcache
 skip-if = fission
 [test_bug1326251.html]
 skip-if = toolkit == 'android' || fission # It relies on the bfcache
+[test_bug1379762.html]
+skip-if = fission # It relies on the bfcache
 [test_sibling-matching-parent.html]
 [test_sibling-off-domain.html]
 [test_triggeringprincipal_frame_nav.html]
diff --git a/docshell/test/navigation/test_bug1379762.html b/docshell/test/navigation/test_bug1379762.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1379762</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1379762">Mozilla Bug 1379762</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    var testCount = 0; // Used by the test files.
+
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_bug1379762-1.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff --git a/docshell/test/navigation/test_sessionhistory.html b/docshell/test/navigation/test_sessionhistory.html
@@ -24,7 +24,6 @@
         "file_bug462076_2.html",         // Dynamic frames when handling onload
         "file_bug462076_3.html",         // Dynamic frames after onload
         // "file_static_and_dynamic_1.html",// Static and dynamic frames and forward-back
-        "file_bug1379762-1.html",
       ];
     var testCount = 0; // Used by the test files.
 
