Bug 846534 - Use a data url as the default WebAPI test page in Marionette. r=mdas, a=tef+
authorJonathan Griffin <jgriffin@mozilla.com>
Tue, 05 Mar 2013 13:23:41 -0800
changeset 118700 aec2f0738fab8d8e5ab688554fab4c9d042f5b2c
parent 118699 5ba282182901ca77eeac517c8c181bd57c8242d0
child 118701 750a3eab8c3d30b4df3696baad7a92334f4b7b49
push id536
push userryanvm@gmail.com
push dateSun, 10 Mar 2013 03:05:48 +0000
reviewersmdas, tef
bugs846534
milestone18.0
Bug 846534 - Use a data url as the default WebAPI test page in Marionette. r=mdas, a=tef+
testing/marionette/client/marionette/marionette_test.py
testing/marionette/client/marionette/tests/unit/test_simpletest_pass.js
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -196,18 +196,17 @@ class MarionetteJSTestCase(CommonTestCas
                     js += line
 
         context = self.context_re.search(js)
         if context:
             context = context.group(3)
             self.marionette.set_context(context)
 
         if context != "chrome":
-            page = self.marionette.absolute_url("empty.html")
-            self.marionette.navigate(page)
+            self.marionette.navigate('data:text/html,<html>test page</html>')
 
         timeout = self.timeout_re.search(js)
         if timeout:
             timeout = timeout.group(3)
             self.marionette.set_script_timeout(timeout)
 
         try:
             results = self.marionette.execute_js_script(js, args, special_powers=True)
--- a/testing/marionette/client/marionette/tests/unit/test_simpletest_pass.js
+++ b/testing/marionette/client/marionette/tests/unit/test_simpletest_pass.js
@@ -3,12 +3,10 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 MARIONETTE_TIMEOUT = 1000;
 
 is(2, 2, "test for is()");
 isnot(2, 3, "test for isnot()");
 ok(2 == 2, "test for ok()");
 
-is(window.location.pathname.slice(-10), "empty.html");
-
 setTimeout(finish, 100);