Socks5 support

lib/capybara/webkit/browser.rb

@@ -258,7 +258,8 @@ def get_cookies
 
     def set_proxy(options = {})
       options = default_proxy_options.merge(options)
-      command("SetProxy", options[:host], options[:port], options[:user], options[:pass])
+      command "SetProxy", options[:host], options[:port], options[:user],
+              options[:pass], options[:type]
     end
 
     def clear_proxy
@@ -321,10 +322,11 @@ def read_response
 
     def default_proxy_options
       {
-        :host => "localhost",
-        :port => "0",
-        :user => "",
-        :pass => ""
+        host: "localhost",
+        port: "0",
+        user: "",
+        pass: "",
+        type: "http",
       }
     end
   end

src/SetProxy.cpp

@@ -11,12 +11,13 @@ void SetProxy::start()
   // default to empty proxy
   QNetworkProxy proxy;
 
-  if (arguments().size() > 0)
-    proxy = QNetworkProxy(QNetworkProxy::HttpProxy,
-                          arguments()[0],
-                          (quint16)(arguments()[1].toInt()),
-                          arguments()[2],
-                          arguments()[3]);
+  if (arguments().size() > 0) {
+    proxy.setType((arguments()[4] == "socks5") ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy);
+    proxy.setHostName(arguments()[0]);
+    proxy.setPort((quint16)(arguments()[1].toInt()));
+    proxy.setUser(arguments()[2]);
+    proxy.setPassword(arguments()[3]);
+  }
 
   manager()->networkAccessManager()->setProxy(proxy);
   finish(true);