Bug 1317462 - Remove version capability from Marionette. r=automatedtester, a=test-only
authorAndreas Tolfsen <ato@mozilla.com>
Tue, 15 Nov 2016 00:22:15 +0000
changeset 352814 191d4889fc848394a5cdc1a24de413b3a633c7c9
parent 352813 857532658f4838d486a8c54be6fbfceed7d2030e
child 352815 735d9cd1eb175bf51b151968ad7718dddd967892
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester, test-only
bugs1317462
milestone52.0a2
Bug 1317462 - Remove version capability from Marionette. r=automatedtester, a=test-only MozReview-Commit-ID: 2XtugK0mJrj
testing/marionette/driver.js
testing/marionette/harness/marionette/tests/unit/test_capabilities.py
testing/marionette/harness/marionette/tests/unit/test_session.py
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -148,17 +148,16 @@ this.GeckoDriver = function(appName, ser
 
     // Selenium 2 compat
     "platform": Services.sysinfo.getProperty("name").toUpperCase(),
 
     // proprietary extensions
     "XULappId" : Services.appinfo.ID,
     "appBuildId" : Services.appinfo.appBuildID,
     "processId" : Services.appinfo.processID,
-    "version": Services.appinfo.version,
   };
 
   this.mm = globalMessageManager;
   this.listener = proxy.toListener(() => this.mm, this.sendAsync.bind(this));
 
   // always keep weak reference to current dialogue
   this.dialog = null;
   let handleDialog = (subject, topic) => {
--- a/testing/marionette/harness/marionette/tests/unit/test_capabilities.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_capabilities.py
@@ -44,21 +44,19 @@ class TestCapabilities(MarionetteTestCas
 
     def test_selenium2_compat(self):
         self.assertIn("platform", self.caps)
         self.assertEqual(self.caps["platform"], self.caps["platformName"].upper())
 
     def test_extensions(self):
         self.assertIn("XULappId", self.caps)
         self.assertIn("appBuildId", self.caps)
-        self.assertIn("version", self.caps)
 
         self.assertEqual(self.caps["XULappId"], self.appinfo["ID"])
         self.assertEqual(self.caps["appBuildId"], self.appinfo["appBuildID"])
-        self.assertEqual(self.caps["version"], self.appinfo["version"])
 
     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
@@ -15,23 +15,23 @@ class TestSession(MarionetteTestCase):
         caps = self.marionette.start_session()
 
         # Check that session was created.  This implies the server
         # sent us the sessionId and status fields.
         self.assertIsNotNone(self.marionette.session)
 
         # 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)
-        self.assertIn("version", 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))