Bug 1283459 - Rename pacUrl to proxyAutoconfigUrl; r=automatedtester, a=test-only
authorAndreas Tolfsen <ato@mozilla.com>
Thu, 30 Jun 2016 14:41:45 +0100
changeset 335530 ade7d8506f42b92f662db72b6d63a4645b66d0df
parent 335529 c2280cbee4ed9092158c59bd9ba224a3bf909afa
child 335531 1c9185a7df828f0065c20d34b7eda15aa2628883
push id1146
push userCallek@gmail.com
push dateMon, 25 Jul 2016 16:35:44 +0000
treeherdermozilla-release@a55778f9cd5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester, test-only
bugs1283459
milestone48.0
Bug 1283459 - Rename pacUrl to proxyAutoconfigUrl; r=automatedtester, a=test-only In order to not have to manage compatibility in this area, we use the field name proxyAutoconfigUrl that existing Selenium implementations use. MozReview-Commit-ID: JRk6uvEbJQi
testing/marionette/driver.js
testing/marionette/harness/marionette/tests/unit/test_proxy.py
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -663,17 +663,17 @@ GeckoDriver.prototype.setUpProxy = funct
           if (proxy.socksVersion) {
             Preferences.set("network.proxy.socks_version", proxy.socksVersion);
           }
         }
         break;
 
       case "PAC":
         Preferences.set("network.proxy.type", 2);
-        Preferences.set("network.proxy.autoconfig_url", proxy.pacUrl);
+        Preferences.set("network.proxy.autoconfig_url", proxy.proxyAutoconfigUrl);
         break;
 
       case "AUTODETECT":
         Preferences.set("network.proxy.type", 4);
         break;
 
       case "SYSTEM":
         Preferences.set("network.proxy.type", 5);
--- a/testing/marionette/harness/marionette/tests/unit/test_proxy.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_proxy.py
@@ -61,31 +61,31 @@ class TestProxy(MarionetteTestCase):
         self.assertEqual(result["proxyType"], 5)
 
     def test_we_can_set_a_pac_proxy(self):
         url = "http://marionette.test"
         capabilities = {"requiredCapabilities":
                             {
                                 "proxy":{
                                     "proxyType": "pac",
-                                    "pacUrl": url,
+                                    "proxyAutoconfigUrl": url,
                                 }
                             }
                         }
         self.marionette.start_session(capabilities)
         result = None
         with self.marionette.using_context('chrome'):
             result = self.marionette.execute_script("""return {
                 "proxyType" : Services.prefs.getIntPref('network.proxy.type'),
-                "pacUrl" : Services.prefs.getCharPref('network.proxy.autoconfig_url'),
+                "proxyAutoconfigUrl" : Services.prefs.getCharPref('network.proxy.autoconfig_url'),
                 }
             """)
 
         self.assertEqual(result["proxyType"], 2)
-        self.assertEqual(result["pacUrl"], url, 'pacUrl was not set')
+        self.assertEqual(result["proxyAutoconfigUrl"], url, 'proxyAutoconfigUrl was not set')
 
     def test_that_we_can_set_a_manual_proxy(self):
         port = 4444
         url = "http://marionette.test"
         capabilities = {"requiredCapabilities":
                             {
                                 "proxy":{
                                     "proxyType": "manual",