增加代理开关

LinuxSuRen · LinuxSuRen · commit ccb0e88f03a0 · 2017-05-17T20:10:52.000+08:00
diff --git a/src/main/java/org/suren/autotest/web/framework/selenium/CapabilityConfig.java b/src/main/java/org/suren/autotest/web/framework/selenium/CapabilityConfig.java
@@ -168,7 +168,11 @@ else if(key.startsWith("chrome.binary"))
 				options.setBinary(enginePro.getProperty(key));
 			}
 		}
-		capability.setCapability("proxy", proxy);
+		
+		if("true".equals(enginePro.getProperty("chrome.cap.proxy.enable")))
+		{
+			capability.setCapability("proxy", proxy);
+		}
 		capability.setCapability(ChromeOptions.CAPABILITY, options);
 	
 		engineCapMap.put(DRIVER_CHROME, capability);

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,11 @@ else if(key.startsWith("chrome.binary"))`
`168`	`168`	`options.setBinary(enginePro.getProperty(key));`
`169`	`169`	`}`
`170`	`170`	`}`
`171`		`- capability.setCapability("proxy", proxy);`
	`171`	`+`
	`172`	`+ if("true".equals(enginePro.getProperty("chrome.cap.proxy.enable")))`
	`173`	`+ {`
	`174`	`+ capability.setCapability("proxy", proxy);`
	`175`	`+ }`
`172`	`176`	`capability.setCapability(ChromeOptions.CAPABILITY, options);`
`173`	`177`
`174`	`178`	`engineCapMap.put(DRIVER_CHROME, capability);`