4 files changed, 79 insertions, 1 deletions
diff --git a/docshell/test/navigation/file_bug1379762-1.html b/docshell/test/navigation/file_bug1379762-1.html
new file mode 100644
index 000000000..e8cd8b30b
--- /dev/null
+++ b/docshell/test/navigation/file_bug1379762-1.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Bug 1379762</title>
+  </head>
+  <img srcset> <!-- This tries to add load blockers during bfcache restoration -->
+  <script>
+    onunload = null; // enable bfcache
+    opener.is(opener.testCount, 0,
+              "We should only run once; otherwise the loadCount variable makes no sense");
+    var loadCount = 0;
+    onpageshow = function() {
+      ++opener.testCount;
+      if (opener.testCount == 1) {
+        // Navigate forward and then back.
+        setTimeout(function() { location = "goback.html"; }, 0);
+      } else if (opener.testCount == 2) {
+        // Do this async so our load event gets a chance to fire if it plans to
+        // do it.
+        setTimeout(function() {
+          opener.nextTest();
+          window.close();
+        });
+      }
+    };
+    onload = function() {
+      ++loadCount;
+      opener.is(loadCount, 1, "Should only get one onload");
+    }
+  </script>
+</html>
diff --git a/docshell/test/navigation/file_bug1379762-2.html b/docshell/test/navigation/file_bug1379762-2.html
new file mode 100644
index 000000000..86033cb2e
--- /dev/null
+++ b/docshell/test/navigation/file_bug1379762-2.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Bug 1379762</title>
+  </head>
+  <script type="text/just-data">
+    onunload = null; // enable bfcache
+    ++opener.testCount;
+    onpageshow = function(e) {
+      opener.ok(!e.persisted, "Pageshow should not be coming from bfcache " + opener.testCount);
+    }
+    if (opener.testCount == 1) {
+      onload = function () {
+        setTimeout(function() {
+          document.write(testScript);
+        }, 0);
+      }
+    } else if (opener.testCount == 2) {
+      // Do this async, just in case.
+      setTimeout(function() {
+        history.back();
+      }, 0);
+    } else if (opener.testCount == 3) {
+      // Do this async, just in case.
+      setTimeout(function() {
+        history.forward();
+      }, 0);
+    } else if (opener.testCount == 4) {
+      onload = function() {
+        opener.nextTest();
+        window.close();
+      }
+    }
+  </script>
+  <script>
+    var data = document.querySelector("script[type='text/just-data']").textContent;
+    // Store the string that does all out work in a global variable, so we can
+    // get at it later.
+    var testScript = "<script>" + data + "</" + "script>";
+    document.write(testScript);
+  </script>
+</html>
diff --git a/docshell/test/navigation/mochitest.ini b/docshell/test/navigation/mochitest.ini
index 1b5f33c7f..8cff81ad1 100644
--- a/docshell/test/navigation/mochitest.ini
+++ b/docshell/test/navigation/mochitest.ini
@@ -59,6 +59,7 @@ skip-if = (toolkit == 'android') || (!debug && (os == 'mac' || os == 'win')) # B
 skip-if = (toolkit == 'android') || (debug && e10s) #too slow on Android 4.3 aws only; bug 1030403; bug 1263213 for debug e10s
 [test_sessionhistory.html]
 skip-if = toolkit == 'android' #RANDOM
+support-files = file_bug1379762-1.html file_bug1379762-2.html
 [test_sibling-matching-parent.html]
 [test_sibling-off-domain.html]
 [test_triggeringprincipal_frame_nav.html]
diff --git a/docshell/test/navigation/test_sessionhistory.html b/docshell/test/navigation/test_sessionhistory.html
index 452271a41..10b0cbcaf 100644
--- a/docshell/test/navigation/test_sessionhistory.html
+++ b/docshell/test/navigation/test_sessionhistory.html
@@ -31,7 +31,9 @@ var testFiles =
     "file_nested_frames.html",
     "file_shiftReload_and_pushState.html",
     "file_scrollRestoration.html",
-    "file_bug1300461.html"
+    "file_bug1300461.html",
+    "file_bug1379762-1.html",
+    "file_bug1379762-2.html",
   ];
 var testCount = 0; // Used by the test files.