Bug 1408044 - fix miscellaneous tests that depended on about: existing, r?dao draft
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 15 Nov 2017 17:19:33 +0000
changeset 700597 7258feed5f10d03c93a90c69ddfdff7ee0611c73
parent 700583 8b97a4aafe3e817f34aa6f1198bb8e3d8a2c35a0
child 740936 6adb0cdb0a2d22ccae331a9b30e5d01ed312e9d6
push id89903
push usergijskruitbosch@gmail.com
push dateMon, 20 Nov 2017 15:25:52 +0000
reviewersdao
bugs1408044
milestone59.0a1
Bug 1408044 - fix miscellaneous tests that depended on about: existing, r?dao MozReview-Commit-ID: EKsaFbRoBc4
accessible/tests/browser/events/browser_test_docload.js
accessible/tests/mochitest/events/docload/test_docload_busy.html
accessible/tests/mochitest/events/docload/test_docload_embedded.html
accessible/tests/mochitest/events/docload/test_docload_root.html
accessible/tests/mochitest/name/test_browserui.xul
accessible/tests/mochitest/name/test_general.html
accessible/tests/mochitest/relations/test_embeds.xul
accessible/tests/mochitest/relations/test_tabbrowser.xul
accessible/tests/mochitest/textcaret/test_browserui.xul
accessible/tests/mochitest/textcaret/test_general.html
accessible/tests/mochitest/tree/test_tabbrowser.xul
browser/base/content/test/general/browser_audioTabIcon.js
browser/base/content/test/general/browser_bug537474.js
browser/base/content/test/tabs/browser_navigatePinnedTab.js
browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
browser/components/places/tests/browser/browser_library_middleclick.js
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js
browser/components/sessionstore/test/browser_350525.js
browser/components/sessionstore/test/browser_367052.js
dom/base/test/chrome/frame_bug814638.xul
js/xpconnect/tests/chrome/test_bug865948.xul
testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py
testing/marionette/harness/marionette_harness/tests/unit/test_quit_restart.py
testing/marionette/puppeteer/firefox/firefox_puppeteer/mixins.py
toolkit/mozapps/extensions/test/mochitest/test_bug887098.html
--- a/accessible/tests/browser/events/browser_test_docload.js
+++ b/accessible/tests/browser/events/browser_test_docload.js
@@ -43,22 +43,22 @@ async function runTests(browser, accDoc)
   browser.loadURI(`data:text/html;charset=utf-8,
     <html><body id="body2">
       <iframe id="iframe1" src="http://example.com"></iframe>
     </body></html>`);
 
   await onLoadEvents;
 
   onLoadEvents = waitForEvents([
-      [EVENT_DOCUMENT_LOAD_COMPLETE, urlChecker("about:")],
+      [EVENT_DOCUMENT_LOAD_COMPLETE, urlChecker("about:about")],
       [EVENT_STATE_CHANGE, busyChecker(false)],
       [EVENT_REORDER, getAccessible(browser)]
   ]);
 
-  browser.loadURI("about:");
+  browser.loadURI("about:about");
 
   await onLoadEvents;
 
   onLoadEvents = waitForEvents([
     [EVENT_DOCUMENT_RELOAD, evt => evt.isFromUserInput],
     [EVENT_REORDER, getAccessible(browser)],
     [EVENT_STATE_CHANGE, busyChecker(false)]
   ]);
--- a/accessible/tests/mochitest/events/docload/test_docload_busy.html
+++ b/accessible/tests/mochitest/events/docload/test_docload_busy.html
@@ -74,11 +74,11 @@
     Mozilla Bug 658185
   </a>
 
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test">
   </pre>
 
-  <div id="testContainer"><iframe id="iframe" src="about:" style="visibility: hidden;"></iframe></div>
+  <div id="testContainer"><iframe id="iframe" src="about:mozilla" style="visibility: hidden;"></iframe></div>
 </body>
 </html>
--- a/accessible/tests/mochitest/events/docload/test_docload_embedded.html
+++ b/accessible/tests/mochitest/events/docload/test_docload_embedded.html
@@ -35,30 +35,30 @@
       this.invoke = () => (this.DOMNode.src = aURL);
 
       this.finalCheck = () =>
         testAccessibleTree(this.DOMNode, {
           role: ROLE_INTERNAL_FRAME,
           children: [
             {
               role: ROLE_DOCUMENT,
-              name: aURL == "about:" ? "About:" : aURL
+              name: aURL == "about:license" ? "Licenses" : aURL
             }
           ]
         });
 
       this.getID = () => `change iframe src on ${aURL}`;
     }
 
     // //////////////////////////////////////////////////////////////////////////
     // Do tests
 
     function doTests() {
       const gQueue = new eventQueue();
-      gQueue.push(new changeIframeSrc("iframe", "about:"));
+      gQueue.push(new changeIframeSrc("iframe", "about:license"));
       gQueue.push(new changeIframeSrc("iframe", "about:buildconfig"));
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
 
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTests);
   </script>
 </head>
--- a/accessible/tests/mochitest/events/docload/test_docload_root.html
+++ b/accessible/tests/mochitest/events/docload/test_docload_root.html
@@ -107,17 +107,17 @@
       this.getID = () => "close dialog";
     }
 
     // //////////////////////////////////////////////////////////////////////////
     // Do tests
 
     function doTests() {
       const gQueue = new eventQueue();
-      gQueue.push(new openDialogWnd("about:"));
+      gQueue.push(new openDialogWnd("about:about"));
       gQueue.push(new closeDialogWnd());
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
 
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTests);
   </script>
 </head>
--- a/accessible/tests/mochitest/name/test_browserui.xul
+++ b/accessible/tests/mochitest/name/test_browserui.xul
@@ -79,17 +79,17 @@
       {
         closeBrowserWindow();
       }
 
       gQueue.invoke();
     }
 
     SimpleTest.waitForExplicitFinish();
-    openBrowserWindow(doTests, "about:");
+    openBrowserWindow(doTests, "about:license");
   ]]>
   </script>
 
   <vbox flex="1" style="overflow: auto;">
   <body xmlns="http://www.w3.org/1999/xhtml">
     <a target="_blank"
        href="https://bugzilla.mozilla.org/show_bug.cgi?id=507382"
        title="focus is fired earlier than root accessible name is changed when switching between tabs">
--- a/accessible/tests/mochitest/name/test_general.html
+++ b/accessible/tests/mochitest/name/test_general.html
@@ -418,17 +418,17 @@
          title="Input your country of origin"/ >
 
   <!-- name from subtree, surround control by spaces to not jamm the text -->
   <label id="insert_spaces_around_control">
     start<input value="value">end
   </label>
 
   <!-- no name from subtree because it holds whitespaces only -->
-  <a id="from_label_ignore_ws_subtree" href="about:" title="about">&nbsp;&nbsp;  </a>
+  <a id="from_label_ignore_ws_subtree" href="about:mozilla" title="about">&nbsp;&nbsp;  </a>
 
   <!-- label element, label contains control -->
   <label>text<button id="btn_label_inside">10</button>text</label>
   <br/>
 
   <!-- label element, label and the button are in the same form -->
   <form>
     <label for="btn_label_inform">in form</label>
--- a/accessible/tests/mochitest/relations/test_embeds.xul
+++ b/accessible/tests/mochitest/relations/test_embeds.xul
@@ -90,29 +90,29 @@
     function doTests()
     {
       testRelation(browserDocument(), RELATION_EMBEDS,
                    getAccessible(currentTabDocument()));
 
       enableLogging("docload");
       gQueue = new eventQueue();
 
-      gQueue.push(new loadURI("about:about"));
+      gQueue.push(new loadURI("about:robots"));
       gQueue.push(new loadOneTab("about:mozilla"));
 
       gQueue.onFinish = function()
       {
         disableLogging();
         closeBrowserWindow();
       }
       gQueue.invoke();
     }
 
     SimpleTest.waitForExplicitFinish();
-    openBrowserWindow(doTests, "about:");
+    openBrowserWindow(doTests, "about:license");
   ]]>
   </script>
 
   <vbox flex="1" style="overflow: auto;">
   <body xmlns="http://www.w3.org/1999/xhtml">
     <a target="_blank"
        href="https://bugzilla.mozilla.org/show_bug.cgi?id=707654"
        title="Embeds relation on root accessible can return not content document">
--- a/accessible/tests/mochitest/relations/test_tabbrowser.xul
+++ b/accessible/tests/mochitest/relations/test_tabbrowser.xul
@@ -30,17 +30,17 @@
     {
       this.eventSeq = [
         new asyncInvokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, tabDocumentAt, 0),
         new asyncInvokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, tabDocumentAt, 1)
      ];
 
       this.invoke = function testTabRelations_invoke()
       {
-        var docURIs = ["about:", "about:mozilla"];
+        var docURIs = ["about:license", "about:mozilla"];
         tabBrowser().loadTabs(docURIs, {
           inBackground: false,
           replace: true,
           triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
         });
       }
 
       this.finalCheck = function testTabRelations_finalCheck(aEvent)
--- a/accessible/tests/mochitest/textcaret/test_browserui.xul
+++ b/accessible/tests/mochitest/textcaret/test_browserui.xul
@@ -41,17 +41,17 @@
       {
         closeBrowserWindow();
       }
 
       gQueue.invoke();
     }
 
     SimpleTest.waitForExplicitFinish();
-    openBrowserWindow(doTests, "about:");
+    openBrowserWindow(doTests, "about:mozilla");
   ]]>
   </script>
 
   <vbox flex="1" style="overflow: auto;">
   <body xmlns="http://www.w3.org/1999/xhtml">
     <a target="_blank"
        href="https://bugzilla.mozilla.org/show_bug.cgi?id=723833"
        title="IAccessibleText::setCaretOffset on location or search bar causes focus to jump">
--- a/accessible/tests/mochitest/textcaret/test_general.html
+++ b/accessible/tests/mochitest/textcaret/test_general.html
@@ -162,16 +162,16 @@
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test">
   </pre>
 
   <input id="textbox" value="hello"/>
   <textarea id="textarea">text<br>text</textarea>
   <p id="p" contentEditable="true"><span>text</span><br/>text</p>
-  <a id="link" href="about:">about mozilla</a>
+  <a id="link" href="about:mozilla">about mozilla</a>
   <h5 id="heading">heading</h5>
   <iframe id="p2_container"
           src="data:text/html,<p id='p2' contentEditable='true'>a<a id='p2_a' href='mozilla.org'>b</a>c</p>"></iframe>
 
   <div id="eventdump"></div>
 </body>
 </html>
--- a/accessible/tests/mochitest/tree/test_tabbrowser.xul
+++ b/accessible/tests/mochitest/tree/test_tabbrowser.xul
@@ -29,17 +29,17 @@
     {
       this.eventSeq = [
         new asyncInvokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, tabDocumentAt, 0),
         new asyncInvokerChecker(EVENT_DOCUMENT_LOAD_COMPLETE, tabDocumentAt, 1)
       ];
 
       this.invoke = function testTabHierarchy_invoke()
       {
-        var docURIs = ["about:", "about:mozilla"];
+        var docURIs = ["about:license", "about:mozilla"];
         tabBrowser().loadTabs(docURIs, {
           inBackground: false,
           replace: true,
           triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
         });
       }
 
       this.finalCheck = function testTabHierarchy_finalCheck(aEvent)
@@ -61,17 +61,17 @@
 
           tabsAccTree.children.splice(0, 0,
             {
               // xul:toolbarbutton ("Open a new tab")
               role: ROLE_PUSHBUTTON,
               children: []
             },
             {
-              // xul:tab ("about:")
+              // xul:tab ("about:license")
               role: ROLE_PAGETAB,
               children: []
             },
             {
               // tab ("about:mozilla")
               role: ROLE_PAGETAB,
               children: []
             },
@@ -103,17 +103,17 @@
               }
             ];
           }
 
           // NB: The (3) buttons are not visible, unless manually hovered,
           //     probably due to size reduction in this test.
           tabsAccTree.children.splice(0, 0,
             {
-              // xul:tab ("about:")
+              // xul:tab ("about:license")
               role: ROLE_PAGETAB,
               children: [
                 {
                   // xul:text, i.e. the tab label text
                   role: ROLE_TEXT_LEAF,
                   children: []
                 },
                 {
@@ -163,17 +163,17 @@
               // xul:notificationbox
               role: ROLE_PROPERTYPAGE,
               children: [
                 {
                   // xul:browser
                   role: ROLE_INTERNAL_FRAME,
                   children: [
                     {
-                      // #document ("about:")
+                      // #document ("about:license")
                       role: ROLE_DOCUMENT
                       // children: [ ... ] // Ignore document content.
                     }
                   ]
                 }
               ]
             },
             {
--- a/browser/base/content/test/general/browser_audioTabIcon.js
+++ b/browser/base/content/test/general/browser_audioTabIcon.js
@@ -398,17 +398,17 @@ async function test_cross_process_load()
     //   Start playback and wait for it to finish.
     await play(tab);
 
     let soundPlayingStoppedPromise = BrowserTestUtils.waitForEvent(tab, "TabAttrModified", false,
       event => event.detail.changed.includes("soundplaying")
     );
 
     // Go to a different process.
-    browser.loadURI("about:");
+    browser.loadURI("about:mozilla");
     await BrowserTestUtils.browserLoaded(browser);
 
     await soundPlayingStoppedPromise;
 
     ok(!tab.hasAttribute("soundplaying"), "Tab should not be playing sound any more");
     ok(!tab.soundPlaying, "Tab should not be playing sound any more");
   }
 
--- a/browser/base/content/test/general/browser_bug537474.js
+++ b/browser/base/content/test/general/browser_bug537474.js
@@ -1,8 +1,8 @@
 add_task(async function() {
   let browserLoadedPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-  window.browserDOMWindow.openURI(makeURI("about:"), null,
+  window.browserDOMWindow.openURI(makeURI("about:mozilla"), null,
                                   Ci.nsIBrowserDOMWindow.OPEN_CURRENTWINDOW, null,
                                   Services.scriptSecurityManager.getSystemPrincipal());
   await browserLoadedPromise;
-  is(gBrowser.currentURI.spec, "about:", "page loads in the current content window");
+  is(gBrowser.currentURI.spec, "about:mozilla", "page loads in the current content window");
 });
--- a/browser/base/content/test/tabs/browser_navigatePinnedTab.js
+++ b/browser/base/content/test/tabs/browser_navigatePinnedTab.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 add_task(async function() {
   // Test that changing the URL in a pinned tab works correctly
 
-  let TEST_LINK_INITIAL = "about:";
+  let TEST_LINK_INITIAL = "about:mozilla";
   let TEST_LINK_CHANGED = "about:support";
 
   let appTab = BrowserTestUtils.addTab(gBrowser, TEST_LINK_INITIAL);
   let browser = appTab.linkedBrowser;
   await BrowserTestUtils.browserLoaded(browser);
 
   gBrowser.pinTab(appTab);
   is(appTab.pinned, true, "Tab was successfully pinned");
--- a/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
+++ b/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
  /**
  * Tests middle-clicking items in the Library.
  */
 
-const URIs = ["about:license", "about:"];
+const URIs = ["about:license", "about:mozilla"];
 
 var gLibrary = null;
 
 add_task(async function test_setup() {
   // Temporary disable history, so we won't record pages navigation.
   await SpecialPowers.pushPrefEnv({set: [
     ["places.history.enabled", false]
   ]});
--- a/browser/components/places/tests/browser/browser_library_middleclick.js
+++ b/browser/components/places/tests/browser/browser_library_middleclick.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
  /**
  * Tests middle-clicking items in the Library.
  */
 
-const URIs = ["about:license", "about:"];
+const URIs = ["about:license", "about:mozilla"];
 
 var gLibrary = null;
 var gTests = [];
 
 add_task(async function test_setup() {
   // Increase timeout, this test can be quite slow due to waitForFocus calls.
   requestLongerTimeout(2);
 
@@ -67,17 +67,17 @@ gTests.push({
   }
 });
 
 // ------------------------------------------------------------------------------
 // Open a folder in tabs.
 //
 gTests.push({
   desc: "Open a folder in tabs.",
-  URIs: ["about:buildconfig", "about:"],
+  URIs: ["about:buildconfig", "about:mozilla"],
   _bookmarks: null,
 
   async setup() {
     // Create a new folder.
     let children = this.URIs.map(url => {
       return {
         title: "Title",
         url,
@@ -107,17 +107,17 @@ gTests.push({
   }
 });
 
 // ------------------------------------------------------------------------------
 // Open a query in tabs.
 
 gTests.push({
   desc: "Open a query in tabs.",
-  URIs: ["about:buildconfig", "about:"],
+  URIs: ["about:buildconfig", "about:mozilla"],
   _bookmarks: null,
   _query: null,
 
   async setup() {
     let children = this.URIs.map(url => {
       return {
         title: "Title",
         url,
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoom.js
@@ -2,18 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // This test makes sure that private browsing turns off doesn't cause zoom
 // settings to be reset on tab switch (bug 464962)
 
 add_task(async function test() {
   let win = (await BrowserTestUtils.openNewBrowserWindow({ private: true }));
-  let tabAbout = (await BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:"));
-  let tabMozilla = (await BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:"));
+  let tabAbout = (await BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:mozilla"));
+  let tabMozilla = (await BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:mozilla"));
 
   let mozillaZoom = win.ZoomManager.zoom;
 
   // change the zoom on the mozilla page
   win.FullZoom.enlarge();
   // make sure the zoom level has been changed
   isnot(win.ZoomManager.zoom, mozillaZoom, "Zoom level can be changed");
   mozillaZoom = win.ZoomManager.zoom;
--- a/browser/components/sessionstore/test/browser_350525.js
+++ b/browser/components/sessionstore/test/browser_350525.js
@@ -69,17 +69,17 @@ add_task(async function() {
 
   // get closed tab count
   let count = ss.getClosedTabCount(window);
   let max_tabs_undo = gPrefService.getIntPref("browser.sessionstore.max_tabs_undo");
   ok(0 <= count && count <= max_tabs_undo,
      "getClosedTabCount returns zero or at most max_tabs_undo");
 
   // create a new tab
-  let testURL = "about:";
+  let testURL = "about:mozilla";
   tab = BrowserTestUtils.addTab(gBrowser, testURL);
   await promiseBrowserLoaded(tab.linkedBrowser);
 
   // make sure that the next closed tab will increase getClosedTabCount
   gPrefService.setIntPref("browser.sessionstore.max_tabs_undo", max_tabs_undo + 1);
   registerCleanupFunction(() => gPrefService.clearUserPref("browser.sessionstore.max_tabs_undo"));
 
   // remove tab
--- a/browser/components/sessionstore/test/browser_367052.js
+++ b/browser/components/sessionstore/test/browser_367052.js
@@ -11,17 +11,17 @@ add_task(async function() {
   registerCleanupFunction(() => gPrefService.clearUserPref("browser.sessionstore.max_tabs_undo"));
 
   // Empty the list of closed tabs.
   while (ss.getClosedTabCount(window)) {
     ss.forgetClosedTab(window, 0);
   }
 
   // restore a blank tab
-  let tab = BrowserTestUtils.addTab(gBrowser, "about:");
+  let tab = BrowserTestUtils.addTab(gBrowser, "about:mozilla");
   await promiseBrowserLoaded(tab.linkedBrowser);
 
   let count = await promiseSHistoryCount(tab.linkedBrowser);
   ok(count >= 1, "the new tab does have at least one history entry");
 
   await promiseTabState(tab, {entries: []});
 
   // We may have a different sessionHistory object if the tab
--- a/dom/base/test/chrome/frame_bug814638.xul
+++ b/dom/base/test/chrome/frame_bug814638.xul
@@ -5,11 +5,11 @@ https://bugzilla.mozilla.org/show_bug.cg
 -->
 <window title="Mozilla Bug 814638"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <keyset>
     <key key="T" modifiers="control" oncommand="receivedKeyEvent()"/>
   </keyset>
 
-  <iframe flex="1" src="about:"/>
+  <iframe flex="1" src="about:mozilla"/>
 
 </window>
--- a/js/xpconnect/tests/chrome/test_bug865948.xul
+++ b/js/xpconnect/tests/chrome/test_bug865948.xul
@@ -21,16 +21,16 @@ https://bugzilla.mozilla.org/show_bug.cg
   /** Test for Bug 865948 **/
   SimpleTest.waitForExplicitFinish();
   const Cu = Components.utils;
   function go() {
     $('ifr').onload = null;
     var sb = Cu.Sandbox(['http://example.com', 'http://example.org']);
     sb.iwin = $('ifr').contentWindow;
     sb.ok = ok;
-    Cu.evalInSandbox('try { iwin.location = "about:"; ok(false, "didnt throw"); } catch (e) { ok(!!/denied/.exec(e), "threw: " + e); }', sb);
+    Cu.evalInSandbox('try { iwin.location = "about:mozilla"; ok(false, "didnt throw"); } catch (e) { ok(!!/denied/.exec(e), "threw: " + e); }', sb);
     SimpleTest.finish();
   }
 
   ]]>
   </script>
 <iframe id="ifr" type="content" onload="go();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_empty.html" />
 </window>
--- a/testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py
+++ b/testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py
@@ -7,17 +7,17 @@ from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase
 
 
 class TestBrowserWindowShortcuts(PuppeteerMixin, MarionetteTestCase):
 
     def test_addons_manager(self):
         # If an about:xyz page is visible, no new tab will be opened
         with self.marionette.using_context('content'):
-            self.marionette.navigate('about:')
+            self.marionette.navigate('about:about')
 
         # TODO: To be moved to the upcoming add-ons library
         def opener(tab):
             tab.window.send_shortcut(tab.window.localize_entity('addons.commandkey'),
                                      accel=True, shift=True)
         self.browser.tabbar.open_tab(opener)
 
         # TODO: Marionette currently fails to detect the correct tab
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_quit_restart.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_quit_restart.py
@@ -73,18 +73,18 @@ class TestQuitRestart(MarionetteTestCase
 
         self.pid = self.marionette.process_id
         self.profile = self.marionette.profile
         self.session_id = self.marionette.session_id
 
         # Use a preference to check that the restart was successful. If its
         # value has not been forced, a restart will cause a reset of it.
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
-        self.marionette.set_pref("startup.homepage_welcome_url", "about:")
+                            "about:about")
+        self.marionette.set_pref("startup.homepage_welcome_url", "about:about")
 
     def tearDown(self):
         # Ensure to restart a session if none exist for clean-up
         if self.marionette.session is None:
             self.marionette.start_session()
 
         self.marionette.clear_pref("startup.homepage_welcome_url")
 
@@ -111,52 +111,52 @@ class TestQuitRestart(MarionetteTestCase
 
     def test_force_clean_restart(self):
         self.marionette.restart(clean=True)
         self.assertNotEqual(self.marionette.profile, self.profile)
         self.assertNotEqual(self.marionette.session_id, self.session_id)
         # A forced restart will cause a new process id
         self.assertNotEqual(self.marionette.process_id, self.pid)
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     def test_force_restart(self):
         self.marionette.restart()
         self.assertEqual(self.marionette.profile, self.profile)
         self.assertNotEqual(self.marionette.session_id, self.session_id)
         # A forced restart will cause a new process id
         self.assertNotEqual(self.marionette.process_id, self.pid)
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     def test_force_clean_quit(self):
         self.marionette.quit(clean=True)
 
         self.assertEqual(self.marionette.session, None)
         with self.assertRaisesRegexp(errors.MarionetteException, "Please start a session"):
             self.marionette.get_url()
 
         self.marionette.start_session()
         self.assertNotEqual(self.marionette.profile, self.profile)
         self.assertNotEqual(self.marionette.session_id, self.session_id)
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     def test_force_quit(self):
         self.marionette.quit()
 
         self.assertEqual(self.marionette.session, None)
         with self.assertRaisesRegexp(errors.MarionetteException, "Please start a session"):
             self.marionette.get_url()
 
         self.marionette.start_session()
         self.assertEqual(self.marionette.profile, self.profile)
         self.assertNotEqual(self.marionette.session_id, self.session_id)
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     @skip("Bug 1363368 - Wrong window handles after in_app restarts")
     def test_no_in_app_clean_restart(self):
         # Test that in_app and clean cannot be used in combination
         with self.assertRaises(ValueError):
             self.marionette.restart(in_app=True, clean=True)
 
     @skip("Bug 1363368 - Wrong window handles after in_app restarts")
@@ -170,17 +170,17 @@ class TestQuitRestart(MarionetteTestCase
 
         # An in-app restart will keep the same process id only on Linux
         if self.marionette.session_capabilities["platformName"] == "linux":
             self.assertEqual(self.marionette.process_id, self.pid)
         else:
             self.assertNotEqual(self.marionette.process_id, self.pid)
 
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     @skip("Bug 1363368 - Wrong window handles after in_app restarts")
     def test_in_app_restart_with_callback(self):
         if self.marionette.session_capabilities["platformName"] != "windows_nt":
             skip("Bug 1363368 - Wrong window handles after in_app restarts")
 
         self.marionette.restart(in_app=True,
                                 callback=lambda: self.shutdown(restart=True))
@@ -190,17 +190,17 @@ class TestQuitRestart(MarionetteTestCase
 
         # An in-app restart will keep the same process id only on Linux
         if self.marionette.session_capabilities["platformName"] == "linux":
             self.assertEqual(self.marionette.process_id, self.pid)
         else:
             self.assertNotEqual(self.marionette.process_id, self.pid)
 
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     def test_in_app_restart_safe_mode(self):
         if self.marionette.session_capabilities["platformName"] != "linux":
             raise unittest.SkipTest("Bug 1397612 - Hang of Marionette client after the restart.")
 
         def restart_in_safe_mode():
             with self.marionette.using_context("chrome"):
                 self.marionette.execute_script("""
@@ -250,33 +250,33 @@ class TestQuitRestart(MarionetteTestCase
         self.assertEqual(self.marionette.session, None)
         with self.assertRaisesRegexp(errors.MarionetteException, "Please start a session"):
             self.marionette.get_url()
 
         self.marionette.start_session()
         self.assertEqual(self.marionette.profile, self.profile)
         self.assertNotEqual(self.marionette.session_id, self.session_id)
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     @skip("Bug 1363368 - Wrong window handles after in_app restarts")
     def test_in_app_quit_with_callback(self):
         if self.marionette.session_capabilities["platformName"] != "windows_nt":
             skip("Bug 1363368 - Wrong window handles after in_app restarts")
 
         self.marionette.quit(in_app=True, callback=self.shutdown)
         self.assertEqual(self.marionette.session, None)
         with self.assertRaisesRegexp(errors.MarionetteException, "Please start a session"):
             self.marionette.get_url()
 
         self.marionette.start_session()
         self.assertEqual(self.marionette.profile, self.profile)
         self.assertNotEqual(self.marionette.session_id, self.session_id)
         self.assertNotEqual(self.marionette.get_pref("startup.homepage_welcome_url"),
-                            "about:")
+                            "about:about")
 
     def test_in_app_quit_with_callback_missing_shutdown(self):
         try:
             timeout = self.marionette.DEFAULT_SHUTDOWN_TIMEOUT
             self.marionette.DEFAULT_SHUTDOWN_TIMEOUT = 10
 
             with self.assertRaisesRegexp(IOError, "a requested application quit did not happen"):
                 self.marionette.quit(in_app=True, callback=lambda: False)
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/mixins.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/mixins.py
@@ -83,17 +83,18 @@ class PuppeteerMixin(object):
 
         self.puppeteer = Puppeteer(self.marionette)
         self.browser = self.puppeteer.windows.current
         self.browser.focus()
 
         with self.marionette.using_context(self.marionette.CONTEXT_CONTENT):
             # Bug 1312674 - Navigating to about:blank twice can cause a hang in
             # Marionette. So try to always have a known default page loaded.
-            self.marionette.navigate('about:')
+            # Bug 1418979 - Update this to a test-framework-specific file.
+            self.marionette.navigate('about:about')
 
     def tearDown(self, *args, **kwargs):
         self.marionette.set_context('chrome')
 
         try:
             # This code should be run after all other tearDown code
             # so that in case of a failure, further tests will not run
             # in a state that is more inconsistent than necessary.
--- a/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html
+++ b/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html
@@ -16,26 +16,26 @@ https://bugzilla.mozilla.org/show_bug.cg
   /* globals $,evalRef */
 
   function loaded() {
     var iwin = $("ifr").contentWindow;
     var href = SpecialPowers.wrap(iwin).location.href;
     if (/file_empty/.test(href)) {
       window.evalRef = iwin.eval;
       window.installTriggerRef = iwin.InstallTrigger; // Force lazy instantiation.
-      // about: is privileged, so we need to be privileged to load it.
-      SpecialPowers.wrap(iwin).location.href = "about:";
+      // about:mozilla is privileged, so we need to be privileged to load it.
+      SpecialPowers.wrap(iwin).location.href = "about:mozilla";
     } else {
-      is(href, "about:", "Successfully navigated to about:");
+      is(href, "about:mozilla", "Successfully navigated to about:mozilla");
       try {
         evalRef('InstallTrigger.install({URL: "chrome://global/skin/global.css"});');
         ok(false, "Should have thrown when trying to install restricted URI from InstallTrigger");
       } catch (e) {
         // XXXgijs this test broke because of the switch to webidl. I'm told
-        // it has to do with compartments and the fact that we eval in "about:".
+        // it has to do with compartments and the fact that we eval in "about:mozilla".
         // Tracking in bug 1007671
         todo(/permission/.test(e), "We should throw a security exception. Got: " + e);
       }
       SimpleTest.finish();
     }
   }
 
   </script>