Bug 1008626 - Removed javaScriptEnabled and cssSelectors capabilities ( no longer needed); updated tests accordingly. r=automatedtester
authorShashank Sabniveesu <shashank@linux.com>
Thu, 29 May 2014 18:53:00 +0200
changeset 205481 e20435fd8c3e8193dba12f5ee4047252c05c255a
parent 205480 1137d4bcc40a9fd957bfa1c24fa6b71ea865d42b
child 205482 dcb77f2cdc4ce9a4e1a2973794e7376f967912fe
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1008626
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1008626 - Removed javaScriptEnabled and cssSelectors capabilities ( no longer needed); updated tests accordingly. r=automatedtester
testing/marionette/client/marionette/tests/unit/test_capabilities.py
testing/marionette/client/marionette/tests/unit/test_session.py
testing/marionette/marionette-server.js
--- a/testing/marionette/client/marionette/tests/unit/test_capabilities.py
+++ b/testing/marionette/client/marionette/tests/unit/test_capabilities.py
@@ -20,28 +20,24 @@ class TestCapabilities(MarionetteTestCas
 
         self.assertEqual(self.caps["browserName"], self.appinfo["name"])
         self.assertEqual(self.caps["browserVersion"], self.appinfo["version"])
         self.assertEqual(self.caps["platformName"], self.appinfo["OS"].upper())
         self.assertEqual(self.caps["platformVersion"],
                          self.appinfo["platformVersion"])
 
     def test_supported_features(self):
-        self.assertIn("cssSelectorsEnabled", self.caps)
         self.assertIn("handlesAlerts", self.caps)
-        self.assertIn("javascriptEnabled", self.caps)
         self.assertIn("nativeEvents", self.caps)
         self.assertIn("rotatable", self.caps)
         self.assertIn("secureSsl", self.caps)
         self.assertIn("takesElementScreenshot", self.caps)
         self.assertIn("takesScreenshot", self.caps)
 
-        self.assertTrue(self.caps["cssSelectorsEnabled"])
         self.assertFalse(self.caps["handlesAlerts"])
-        self.assertTrue(self.caps["javascriptEnabled"])
         self.assertFalse(self.caps["nativeEvents"])
         self.assertEqual(self.caps["rotatable"], self.appinfo["name"] == "B2G")
         self.assertFalse(self.caps["secureSsl"])
         self.assertTrue(self.caps["takesElementScreenshot"])
         self.assertTrue(self.caps["takesScreenshot"])
 
     def test_selenium2_compat(self):
         self.assertIn("platform", self.caps)
--- a/testing/marionette/client/marionette/tests/unit/test_session.py
+++ b/testing/marionette/client/marionette/tests/unit/test_session.py
@@ -18,17 +18,15 @@ class TestSession(marionette_test.Marion
         self.assertIsNotNone(self.marionette.session)
 
         # Required capabilities mandated by WebDriver spec
         self.assertIn("browserName", caps)
         self.assertIn("platformName", caps)
         self.assertIn("platformVersion", caps)
 
         # Optional capabilities we want Marionette to support
-        self.assertIn("cssSelectorsEnabled", caps)
         self.assertIn("device", caps)
         self.assertIn("handlesAlerts", caps)
-        self.assertIn("javascriptEnabled", caps)
         self.assertIn("rotatable", caps)
         self.assertIn("takesScreenshot", caps)
         self.assertIn("version", caps)
 
 
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -566,19 +566,17 @@ MarionetteServerConnection.prototype = {
     let caps = {
       // Mandated capabilities
       "browserName": appName,
       "browserVersion": Services.appinfo.version,
       "platformName": platformName,
       "platformVersion": Services.appinfo.platformVersion,
 
       // Supported features
-      "cssSelectorsEnabled": true,
       "handlesAlerts": false,
-      "javascriptEnabled": true,
       "nativeEvents": false,
       "rotatable": isB2G,
       "secureSsl": false,
       "takesElementScreenshot": true,
       "takesScreenshot": true,
 
       // Selenium 2 compat
       "platform": platformName,