# HG changeset patch # User Mike Conley # Date 1434464140 14400 # Tue Jun 16 10:15:40 2015 -0400 # Node ID 9a14d69e77000c6f2bad1acb5cb46e8cc1f4111c # Parent cd0d976e5f5c6389512cad8f2cae03526b0fb0f3 Add browser_multiple_pushState.js regression test diff --git a/docshell/test/browser/browser.ini b/docshell/test/browser/browser.ini --- a/docshell/test/browser/browser.ini +++ b/docshell/test/browser/browser.ini @@ -28,16 +28,17 @@ support-files = file_bug234628-9.html file_bug420605.html file_bug503832.html file_bug655270.html file_bug670318.html file_bug852909.pdf file_bug852909.png file_bug1046022.html + file_multiple_pushState.html print_postdata.sjs test-form_sjis.html timelineMarkers-04.html browser_timelineMarkers-frame-02.js browser_timelineMarkers-frame-03.js browser_timelineMarkers-frame-04.js browser_timelineMarkers-frame-05.js head.js @@ -93,16 +94,17 @@ skip-if = e10s # Bug ?????? - test touch skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that. [browser_bug92473.js] skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that. [browser_uriFixupIntegration.js] [browser_loadDisallowInherit.js] skip-if = e10s [browser_loadURI.js] skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that. +[browser_multiple_pushState.js] [browser_onbeforeunload_navigation.js] skip-if = e10s [browser_search_notification.js] [browser_timelineMarkers-01.js] [browser_timelineMarkers-02.js] [browser_timelineMarkers-03.js] [browser_timelineMarkers-04.js] [browser_timelineMarkers-05.js] diff --git a/docshell/test/browser/browser_multiple_pushState.js b/docshell/test/browser/browser_multiple_pushState.js new file mode 100644 --- /dev/null +++ b/docshell/test/browser/browser_multiple_pushState.js @@ -0,0 +1,15 @@ +add_task(function* test_multiple_pushState() { + yield BrowserTestUtils.withNewTab({ + gBrowser, + url: "http://example.org/browser/docshell/test/browser/file_multiple_pushState.html", + }, function* (browser) { + const kExpected = "http://example.org/bar/ABC/DEF?key=baz"; + + let contentLocation = yield ContentTask.spawn(browser, null, function* () { + return content.document.location.href; + }); + + is(contentLocation, kExpected); + is(browser.documentURI.spec, kExpected); + }); +}); diff --git a/docshell/test/browser/file_multiple_pushState.html b/docshell/test/browser/file_multiple_pushState.html new file mode 100644 --- /dev/null +++ b/docshell/test/browser/file_multiple_pushState.html @@ -0,0 +1,14 @@ + + + + + Test multiple calls to history.pushState + + +

Ohai

+ + +