From 74f8ab42da151239bc1d0fb01ded6520af7b3bca Mon Sep 17 00:00:00 2001 From: David Burns Date: Fri, 19 Jun 2015 15:42:04 +0100 Subject: [PATCH] Bug 1174941: Update server capabilities that are set on startup; r=ato --HG-- extra : commitid : JBXi8bCndb6 extra : rebase_source : 749e07ec25d12ffbcd739d807e67067ee67ad7a7 --- .../client/marionette/tests/unit/test_capabilities.py | 8 ++------ .../client/marionette/tests/unit/test_session.py | 1 - testing/marionette/driver.js | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/testing/marionette/client/marionette/tests/unit/test_capabilities.py b/testing/marionette/client/marionette/tests/unit/test_capabilities.py index 672211f69e25..f41af390d91d 100644 --- a/testing/marionette/client/marionette/tests/unit/test_capabilities.py +++ b/testing/marionette/client/marionette/tests/unit/test_capabilities.py @@ -26,17 +26,13 @@ class TestCapabilities(MarionetteTestCase): self.appinfo["platformVersion"]) def test_supported_features(self): - self.assertIn("handlesAlerts", self.caps) - self.assertIn("nativeEvents", self.caps) self.assertIn("rotatable", self.caps) - self.assertIn("secureSsl", self.caps) + self.assertIn("acceptSslCerts", self.caps) self.assertIn("takesElementScreenshot", self.caps) self.assertIn("takesScreenshot", self.caps) - self.assertFalse(self.caps["handlesAlerts"]) - self.assertFalse(self.caps["nativeEvents"]) self.assertEqual(self.caps["rotatable"], self.appinfo["name"] == "B2G") - self.assertFalse(self.caps["secureSsl"]) + self.assertFalse(self.caps["acceptSslCerts"]) self.assertTrue(self.caps["takesElementScreenshot"]) self.assertTrue(self.caps["takesScreenshot"]) diff --git a/testing/marionette/client/marionette/tests/unit/test_session.py b/testing/marionette/client/marionette/tests/unit/test_session.py index 14fb2e353cab..90c2a573303e 100644 --- a/testing/marionette/client/marionette/tests/unit/test_session.py +++ b/testing/marionette/client/marionette/tests/unit/test_session.py @@ -24,7 +24,6 @@ class TestSession(MarionetteTestCase): # Optional capabilities we want Marionette to support self.assertIn("device", caps) - self.assertIn("handlesAlerts", caps) self.assertIn("rotatable", caps) self.assertIn("takesScreenshot", caps) self.assertIn("version", caps) diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js index f49c74746a47..f2382ffae0e8 100644 --- a/testing/marionette/driver.js +++ b/testing/marionette/driver.js @@ -143,11 +143,9 @@ this.GeckoDriver = function(appName, device, emulator) { "platformVersion": Services.appinfo.platformVersion, // Supported features - "handlesAlerts": false, - "nativeEvents": false, "raisesAccessibilityExceptions": false, "rotatable": this.appName == "B2G", - "secureSsl": false, + "acceptSslCerts": false, "takesElementScreenshot": true, "takesScreenshot": true,