JENKINS-15326 Removed quotes from BrowserAxis arguments

jenkinsci · Sep 28, 2012 · f8ac508 · f8ac508
1 parent 992e9c6
commit f8ac508
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -146,7 +146,7 @@
         <dependency>
             <groupId>com.saucelabs</groupId>
             <artifactId>ci-sauce</artifactId>
-            <version>1.16-SNAPSHOT</version>
+            <version>1.16</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/hudson/plugins/sauce_ondemand/BrowserAxis.java b/src/main/java/hudson/plugins/sauce_ondemand/BrowserAxis.java
@@ -82,10 +82,10 @@ public List<com.saucelabs.ci.Browser> getBrowsers() {
      * @param map
      */
     public void addBuildVariable(String value, Map<String,String> map) {
-        com.saucelabs.ci.Browser b = BrowserFactory.getInstance().forKey(value);
+        com.saucelabs.ci.Browser b = BrowserFactory.getInstance().webDriverBrowserForKey(value);
         if (b!=null) {   // should never be null, but let's be defensive in case of downgrade.
             map.put(getName(), b.getUri());
-            map.put("arguments", "\"-D" + getName() + "=" + b.getUri() + "\"");
+            map.put("arguments", "-D" + getName() + "=" + b.getUri());
         }
     }
 }
diff --git a/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper.java b/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper.java
@@ -160,7 +160,7 @@ public void buildEnvVars(Map<String, String> env) {
             private void outputSeleniumVariables(Map<String, String> env) {
                 if (seleniumBrowsers != null && !seleniumBrowsers.isEmpty()) {
                     if (seleniumBrowsers.size() == 1) {
-                        Browser browserInstance = BrowserFactory.getInstance().forKey(seleniumBrowsers.get(0));
+                        Browser browserInstance = BrowserFactory.getInstance().seleniumBrowserForKey(seleniumBrowsers.get(0));
                         env.put(SELENIUM_PLATFORM, browserInstance.getPlatform().toString());
                         env.put(SELENIUM_BROWSER, browserInstance.getBrowserName());
                         env.put(SELENIUM_VERSION, browserInstance.getVersion());
@@ -169,7 +169,7 @@ private void outputSeleniumVariables(Map<String, String> env) {
 
                     JSONArray browsersJSON = new JSONArray();
                     for (String browser : seleniumBrowsers) {
-                        Browser browserInstance = BrowserFactory.getInstance().forKey(browser);
+                        Browser browserInstance = BrowserFactory.getInstance().seleniumBrowserForKey(browser);
                         JSONObject config = new JSONObject();
                         try {
                             config.put("os", browserInstance.getPlatform().toString());
@@ -190,7 +190,7 @@ private void outputSeleniumVariables(Map<String, String> env) {
             private void outputWebDriverVariables(Map<String, String> env) {
                 if (webDriverBrowsers != null && !webDriverBrowsers.isEmpty()) {
                     if (webDriverBrowsers.size() == 1) {
-                        Browser browserInstance = BrowserFactory.getInstance().forKey(webDriverBrowsers.get(0));
+                        Browser browserInstance = BrowserFactory.getInstance().webDriverBrowserForKey(webDriverBrowsers.get(0));
                         env.put(SELENIUM_PLATFORM, browserInstance.getPlatform().toString());
                         env.put(SELENIUM_BROWSER, browserInstance.getBrowserName());
                         env.put(SELENIUM_VERSION, browserInstance.getVersion());
@@ -199,7 +199,7 @@ private void outputWebDriverVariables(Map<String, String> env) {
 
                     JSONArray browsersJSON = new JSONArray();
                     for (String browser : webDriverBrowsers) {
-                        Browser browserInstance = BrowserFactory.getInstance().forKey(browser);
+                        Browser browserInstance = BrowserFactory.getInstance().webDriverBrowserForKey(browser);
                         JSONObject config = new JSONObject();
                         try {
                             config.put("os", browserInstance.getPlatform().toString());
@@ -538,7 +538,6 @@ public String getDisplayName() {
         }
 
 
-
         public List<Browser> getSeleniumBrowsers() {
             try {
                 return BrowserFactory.getInstance().getSeleniumBrowsers();