Bug 1317462 - Remove screenshot capabilities from Marionette; r?automatedtester
MozReview-Commit-ID: EVdiixG6dsD
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -138,18 +138,16 @@ this.GeckoDriver = function(appName, ser
"platformName": Services.sysinfo.getProperty("name").toLowerCase(),
"platformVersion": Services.sysinfo.getProperty("version"),
"specificationLevel": 0,
// supported features
"raisesAccessibilityExceptions": false,
"rotatable": this.appName == "B2G",
"acceptSslCerts": false,
- "takesElementScreenshot": true,
- "takesScreenshot": true,
"proxy": {},
// proprietary extensions
"processId" : Services.appinfo.processID,
};
this.mm = globalMessageManager;
this.listener = proxy.toListener(() => this.mm, this.sendAsync.bind(this));
--- a/testing/marionette/harness/marionette/tests/unit/test_capabilities.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_capabilities.py
@@ -30,22 +30,18 @@ class TestCapabilities(MarionetteTestCas
self.assertEqual(self.caps["browserVersion"], self.appinfo["version"])
self.assertEqual(self.caps["platformName"], self.os_name)
self.assertEqual(self.caps["platformVersion"], self.os_version)
self.assertEqual(self.caps["specificationLevel"], 0)
def test_supported_features(self):
self.assertIn("rotatable", self.caps)
self.assertIn("acceptSslCerts", self.caps)
- self.assertIn("takesElementScreenshot", self.caps)
- self.assertIn("takesScreenshot", self.caps)
self.assertFalse(self.caps["acceptSslCerts"])
- self.assertTrue(self.caps["takesElementScreenshot"])
- self.assertTrue(self.caps["takesScreenshot"])
def test_we_can_pass_in_capabilities_on_session_start(self):
self.marionette.delete_session()
capabilities = {"desiredCapabilities": {"somethingAwesome": "cake"}}
self.marionette.start_session(capabilities)
caps = self.marionette.session_capabilities
self.assertIn("somethingAwesome", caps)
--- a/testing/marionette/harness/marionette/tests/unit/test_session.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_session.py
@@ -21,17 +21,16 @@ class TestSession(MarionetteTestCase):
# Required capabilities mandated by WebDriver spec
self.assertIn("browserName", caps)
self.assertIn("browserVersion", caps)
self.assertIn("platformName", caps)
self.assertIn("platformVersion", caps)
# Optional capabilities we want Marionette to support
self.assertIn("rotatable", caps)
- self.assertIn("takesScreenshot", caps)
def test_we_can_get_the_session_id(self):
# Sends newSession
self.marionette.start_session()
self.assertTrue(self.marionette.session_id is not None)
self.assertTrue(isinstance(self.marionette.session_id, unicode))