cuprite 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d183c86ecad6aaaf681364bda5ee919e5952a2b3a8d55cad40b3a6cec57ff26f
-  data.tar.gz: cccf18bb4e24c66262a0a6302ea7611e3aa1897c9b2442c24cfbc0feedfb46b1
+  metadata.gz: f883874c9b6d85c217809bb7423c5dc7b31db4932b9bf8ad8e8c469eb0820973
+  data.tar.gz: c29bbb53cd0a8153988e4d26dc709a3aa49ad94114a7c175d636705f94eb263c
 SHA512:
-  metadata.gz: '056827d707f4e8388aa2350b53791d060f7c30872d5930311606d750822483a667b5d74093e03217cfa3a342c4fe8cd5d5b766fd3155de9c5ff0c6da6b335a17'
-  data.tar.gz: 389f981e6ae4b3a06cc3babbb70b942b0e2a8844bee690fc508af111bab65b333777f7b330554d2ae0f43abae918e3395ff1ae306b17df015efe94eaebd8c0e8
+  metadata.gz: b0f9a932c1e3640eac45e9b1f3af0964f0f8e9c24037d961f6d10825bcbc97f323b324ae58595de0c84c73d900add6ef96357c6555796938fc3e8d2c261217b1
+  data.tar.gz: 4de0397ab55e6863d64a2faa20a63bc6b97b585308b6f8d5694c75dbc10b90b18b1b202a7501b51a409bd59eaa2fa415d637816060550927751d42047bf4a530

data/README.md

@@ -67,6 +67,10 @@ All the mandatory capybara features plus optional ones:
 * `page.response_headers`
 * `page.save_screenshot`
 * `page.driver.render_base64(format, options)`
+* `page.driver.scroll_to(left, top)`
+* `page.driver.basic_authorize(user, password)`
+* `element.send_keys(*keys)`
+* `page.driver.set_proxy(ip, port, type, user, password)`
 * window API
 * cookie handling
 
@@ -134,6 +138,8 @@ end
 * `:browser_path` (String) - Path to chrome binary, you can also set ENV
     variable as `BROWSER_PATH=some/path/chrome bundle exec rspec`.
 * `:headless` (Boolean) - Set browser as headless or not, `true` by default.
+* `:slowmo` (Integer | Float) - Set a delay to wait before sending command.
+    Usefull companion of headless option, so that you have time to see changes.
 * `:logger` (Object responding to `puts`) - When present, debug output is
     written to this object.
 * `:timeout` (Numeric) - The number of seconds we'll wait for a response when
@@ -156,14 +162,14 @@ Cuprite supports URL blacklisting, which allows you to prevent scripts from
 running on designated domains:
 
 ```ruby
-page.driver.browser.url_blacklist = ['http://www.example.com']
+page.driver.browser.url_blacklist = ["http://www.example.com"]
 ```
 
 and also URL whitelisting, which allows scripts to only run
 on designated domains:
 
 ```ruby
-page.driver.browser.url_whitelist = ['http://www.example.com']
+page.driver.browser.url_whitelist = ["http://www.example.com"]
 ```
 
 If you are experiencing slower run times, consider creating a URL whitelist of

data/lib/capybara/cuprite.rb

@@ -17,6 +17,10 @@ module Capybara::Cuprite
       RbConfig::CONFIG["host_os"] =~ /mingw|mswin|cygwin/
     end
 
+    def mac?
+      RbConfig::CONFIG["host_os"] =~ /darwin/
+    end
+
     def mri?
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
     end

data/lib/capybara/cuprite/browser.rb

@@ -10,13 +10,14 @@ require "capybara/cuprite/browser/page"
 module Capybara::Cuprite
   class Browser
     TIMEOUT = 5
+    WINDOW_SIZE = [1024, 768].freeze
     EXTENSIONS = [
       File.expand_path("browser/javascripts/index.js", __dir__)
     ].freeze
 
     extend Forwardable
 
-    attr_reader :headers
+    attr_reader :headers, :window_size
 
     def self.start(*args)
       new(*args)
@@ -26,27 +27,41 @@ module Capybara::Cuprite
     delegate %i(window_handle window_handles switch_to_window open_new_window
                 close_window within_window page) => :targets
     delegate %i(visit status_code body all_text property attributes attribute
-                value visible? disabled? resize path network_traffic
-                clear_network_traffic response_headers refresh click right_click
-                double_click hover set click_coordinates drag drag_by select
-                trigger scroll_to send_keys evaluate evaluate_on evaluate_async
-                execute frame_url frame_title switch_to_frame current_url title
-                go_back go_forward find_modal accept_confirm dismiss_confirm
-                accept_prompt dismiss_prompt reset_modals) => :page
-
-    attr_reader :process, :logger, :js_errors
+                value visible? disabled? network_traffic clear_network_traffic
+                path response_headers refresh click right_click double_click
+                hover set click_coordinates drag drag_by select trigger
+                scroll_to send_keys evaluate evaluate_on evaluate_async execute
+                frame_url frame_title switch_to_frame current_url title go_back
+                go_forward find_modal accept_confirm dismiss_confirm
+                accept_prompt dismiss_prompt reset_modals authorize
+                proxy_authorize) => :page
+
+    attr_reader :process, :logger, :js_errors, :slowmo,
+                :url_blacklist, :url_whitelist
     attr_writer :timeout
 
     def initialize(options = nil)
-      @options = Hash(options)
+      # Doesn't work on MacOS, so we need to set it by CDP as well
+      options ||= {}
+      @window_size = options.fetch(:window_size, WINDOW_SIZE)
+      @original_window_size = @window_size
+
+      @options = Hash(options.merge(window_size: @window_size))
       @logger, @timeout = @options.values_at(:logger, :timeout)
       @js_errors = @options.fetch(:js_errors, false)
+      @slowmo = @options[:slowmo]
+
+      self.url_blacklist = @options[:url_blacklist]
+      self.url_whitelist = @options[:url_whitelist]
 
-      if ENV["CUPRITE_DEBUG"]
+      if ENV["CUPRITE_DEBUG"] && !@logger
         STDOUT.sync = true
         @logger = STDOUT
+        @options[:logger] = @logger
       end
 
+      @options.freeze
+
       start
     end
 
@@ -169,23 +184,14 @@ module Capybara::Cuprite
       page.command("Network.clearBrowserCookies")
     end
 
-    def set_http_auth(user, password)
-      raise NotImplementedError
-    end
-
-    def page_settings=(settings)
-      raise NotImplementedError
-    end
-
-    def url_whitelist=(whitelist)
-      @url_whitelist = Array(whitelist).map { |p| { urlPattern: p } }
-      page.command("Network.setRequestInterception", patterns: @url_whitelist)
+    def url_whitelist=(wildcards)
+      @url_whitelist = prepare_wildcards(wildcards)
+      page.intercept_request("*") if @client && !@url_whitelist.empty?
     end
 
-    def url_blacklist=(blacklist)
-      # FIXME: We have to change the format and make it compatible with Chrome not PhantomJS
-      @url_blacklist = Array(blacklist).map { |p| { urlPattern: p.include?("*") ? p : "*#{p}*" } }
-      page.command("Network.setRequestInterception", patterns: @url_blacklist)
+    def url_blacklist=(wildcards)
+      @url_blacklist = prepare_wildcards(wildcards)
+      page.intercept_request("*") if @client && !@url_blacklist.empty?
     end
 
     def clear_memory_cache
@@ -195,6 +201,7 @@ module Capybara::Cuprite
     def reset
       @headers = {}
       @zoom_factor = nil
+      @window_size = @original_window_size
       targets.reset
     end
 
@@ -217,6 +224,11 @@ module Capybara::Cuprite
       page.evaluate("_cuprite.browserError()")
     end
 
+    def resize(**options)
+      @window_size = [options[:width], options[:height]]
+      page.resize(**options)
+    end
+
     def command(*args)
       id = @client.command(*args)
       @client.wait(id: id)
@@ -234,7 +246,7 @@ module Capybara::Cuprite
     def start
       @headers = {}
       @process = Process.start(@options)
-      @client = Client.new(self, @process.ws_url)
+      @client = Client.new(self, @process.ws_url, false)
     end
 
     def render_options(format, opts)
@@ -290,5 +302,16 @@ module Capybara::Cuprite
         raise
       end
     end
+
+    def prepare_wildcards(wc)
+      Array(wc).map do |wildcard|
+        if wildcard.is_a?(Regexp)
+          wildcard
+        else
+          wildcard = wildcard.gsub("*", ".*")
+          Regexp.new(wildcard, Regexp::IGNORECASE)
+        end
+      end
+    end
   end
 end

data/lib/capybara/cuprite/browser/client.rb

@@ -8,10 +8,10 @@ module Capybara::Cuprite
     class Client
       class IdError < RuntimeError; end
 
-      def initialize(browser, ws_url)
+      def initialize(browser, ws_url, allow_slowmo = true)
         @command_id = 0
         @subscribed = Hash.new { |h, k| h[k] = [] }
-        @browser = browser
+        @browser, @allow_slowmo = browser, allow_slowmo
         @commands = Queue.new
         @ws = WebSocket.new(ws_url, @browser.logger)
 
@@ -31,6 +31,7 @@ module Capybara::Cuprite
 
       def command(method, params = {})
         message = build_message(method, params)
+        sleep(@browser.slowmo) if !@browser.slowmo.nil? && @allow_slowmo
         @ws.send_message(message)
         message[:id]
       end

data/lib/capybara/cuprite/browser/frame.rb

@@ -38,6 +38,8 @@ module Capybara::Cuprite
       private
 
       def subscribe_events
+        super if defined?(super)
+
         @client.subscribe("Page.frameAttached") do |params|
           @frames[params["frameId"]] = { "parent_id" => params["parentFrameId"] }
         end

data/lib/capybara/cuprite/browser/javascripts/index.js

@@ -124,12 +124,12 @@ class Cuprite {
     }
 
     this.trigger(node, "focus");
-    node.value = "";
+    this.setValue(node, "");
 
     if (node.type == "number" || node.type == "date") {
-      node.value = value;
+      this.setValue(node, value);
     } else if (node.type == "time") {
-      node.value = new Date(value).toTimeString().split(" ")[0];
+      this.setValue(node, new Date(value).toTimeString().split(" ")[0]);
     } else if (node.type == "datetime-local") {
       value = new Date(value);
       let year = value.getFullYear();
@@ -138,13 +138,13 @@ class Cuprite {
       let hour = ("0" + value.getHours()).slice(-2);
       let min = ("0" + value.getMinutes()).slice(-2);
       let sec = ("0" + value.getSeconds()).slice(-2);
-      node.value = `${year}-${month}-${date}T${hour}:${min}:${sec}`;
+      this.setValue(node, `${year}-${month}-${date}T${hour}:${min}:${sec}`);
     } else {
       for (let i = 0; i < value.length; i++) {
         let char = value[i];
         let keyCode = this.characterToKeyCode(char);
         this.keyupdowned(node, "keydown", keyCode);
-        node.value += char;
+        this.setValue(node, node.value + char);
 
         this.keypressed(node, false, false, false, false, char.charCodeAt(0), char.charCodeAt(0));
         this.keyupdowned(node, "keyup", keyCode);
@@ -156,6 +156,16 @@ class Cuprite {
     this.trigger(node, "blur");
   }
 
+  setValue(node, value) {
+    let nativeInputValueSetter = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, "value").set;
+    let nativeTextareaValueSetter = Object.getOwnPropertyDescriptor(window.HTMLTextAreaElement.prototype, "value").set;
+
+    if (node.tagName.toLowerCase() === 'input') {
+      return nativeInputValueSetter.call(node, value);
+    }
+    return nativeTextareaValueSetter.call(node, value);
+  }
+
   input(node) {
     let event = document.createEvent("HTMLEvents");
     event.initEvent("input", true, false);

data/lib/capybara/cuprite/browser/net.rb

@@ -0,0 +1,90 @@
+module Capybara::Cuprite
+  class Browser
+    module Net
+      def proxy_authorize(user, password)
+        if user && password
+          @proxy_username, @proxy_password = user, password
+          intercept_request("*")
+        end
+      end
+
+      def authorize(user, password)
+        @username, @password = user, password
+        intercept_request("*")
+      end
+
+      def intercept_request(patterns)
+        patterns = Array(patterns).map { |p| { urlPattern: p } }
+        @client.command("Network.setRequestInterception", patterns: patterns)
+      end
+
+      def continue_request(interception_id, options = nil)
+        options ||= {}
+        options = options.merge(interceptionId: interception_id)
+        @client.command("Network.continueInterceptedRequest", **options)
+      end
+
+      private
+
+      def subscribe_events
+        super if defined?(super)
+
+        @client.subscribe("Network.loadingFailed") do |params|
+          # Free mutex as we aborted main request we are waiting for
+          if params["requestId"] == @request_id && params["canceled"] == true
+            signal
+            @client.command("DOM.getDocument", depth: 0)
+          end
+        end
+
+        @client.subscribe("Network.requestIntercepted") do |params|
+          @authorized_ids ||= []
+          @proxy_authorized_ids ||= []
+          url = params.dig("request", "url")
+          interception_id = params["interceptionId"]
+
+          if params["authChallenge"]
+            response = if params.dig("authChallenge", "source") == "Proxy"
+              if @proxy_authorized_ids.include?(interception_id)
+                { response: "CancelAuth" }
+              elsif @proxy_username && @proxy_password
+                { response: "ProvideCredentials",
+                  username: @proxy_username,
+                  password: @proxy_password }
+              else
+                { response: "CancelAuth" }
+              end
+            else
+              if @authorized_ids.include?(interception_id)
+                { response: "CancelAuth" }
+              elsif @username && @password
+                { response: "ProvideCredentials",
+                  username: @username,
+                  password: @password }
+              else
+                { response: "CancelAuth" }
+              end
+            end
+
+            @authorized_ids << interception_id
+            continue_request(interception_id, authChallengeResponse: response)
+          elsif @browser.url_blacklist && !@browser.url_blacklist.empty?
+            if @browser.url_blacklist.any? { |r| r.match(url) }
+              continue_request(interception_id, errorReason: "Aborted")
+            else
+              continue_request(interception_id)
+            end
+          elsif @browser.url_whitelist && !@browser.url_whitelist.empty?
+            if @browser.url_whitelist.any? { |r| r.match(url) }
+              continue_request(interception_id)
+            else
+              continue_request(interception_id, errorReason: "Aborted")
+            end
+          else
+            continue_request(interception_id)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/capybara/cuprite/browser/page.rb

@@ -5,6 +5,7 @@ require "capybara/cuprite/browser/input"
 require "capybara/cuprite/browser/runtime"
 require "capybara/cuprite/browser/frame"
 require "capybara/cuprite/browser/client"
+require "capybara/cuprite/browser/net"
 require "capybara/cuprite/network/error"
 require "capybara/cuprite/network/request"
 require "capybara/cuprite/network/response"
@@ -29,7 +30,7 @@ require "capybara/cuprite/network/response"
 module Capybara::Cuprite
   class Browser
     class Page
-      include Input, DOM, Runtime, Frame
+      include Input, DOM, Runtime, Frame, Net
 
       attr_accessor :referrer
       attr_reader :target_id, :status_code, :response_headers
@@ -74,7 +75,11 @@ module Capybara::Cuprite
         options = { url: url }
         options.merge!(referrer: referrer) if referrer
         response = command("Page.navigate", **options)
-        if %w[net::ERR_NAME_NOT_RESOLVED net::ERR_NAME_RESOLUTION_FAILED].include?(response["errorText"])
+        # https://cs.chromium.org/chromium/src/net/base/net_error_list.h
+        if %w[net::ERR_NAME_NOT_RESOLVED
+              net::ERR_NAME_RESOLUTION_FAILED
+              net::ERR_INTERNET_DISCONNECTED
+              net::ERR_CONNECTION_TIMED_OUT].include?(response["errorText"])
           raise StatusFailError, "url" => url
         end
         response["frameId"]
@@ -109,13 +114,13 @@ module Capybara::Cuprite
       end
 
       def network_traffic(type = nil)
-        case type
+        case type.to_s
         when "all"
           @network_traffic
         when "blocked"
-          @network_traffic # when request blocked
+          @network_traffic.select { |r| r.response.nil? } # when request blocked
         else
-          @network_traffic # when not request blocked
+          @network_traffic.select { |r| r.response } # when request isn't blocked
         end
       end
 
@@ -274,10 +279,6 @@ module Capybara::Cuprite
           end
         end
 
-        @client.subscribe("Network.requestIntercepted") do |params|
-          @client.command("Network.continueInterceptedRequest", interceptionId: params["interceptionId"], errorReason: "Aborted")
-        end
-
         @client.subscribe("Log.entryAdded") do |params|
           source = params.dig("entry", "source")
           level = params.dig("entry", "level")
@@ -297,8 +298,9 @@ module Capybara::Cuprite
         command("Runtime.enable")
         command("Log.enable")
         command("Network.enable")
+
         if Capybara.save_path
-          command("Page.setDownloadBehavior", behavior: "allow", downloadPath: Capybara.save_path)
+          command("Page.setDownloadBehavior", behavior: "allow", downloadPath: Capybara.save_path.to_s)
         end
 
         @browser.extensions.each do |extension|
@@ -307,6 +309,13 @@ module Capybara::Cuprite
 
         inject_extensions
 
+        width, height = @browser.window_size
+        resize(width: width, height: height)
+
+        url_whitelist = Array(@browser.url_whitelist)
+        url_blacklist = Array(@browser.url_blacklist)
+        intercept_request("*") if !url_whitelist.empty? || !url_blacklist.empty?
+
         response = command("Page.getNavigationHistory")
         if response.dig("entries", 0, "transitionType") != "typed"
           # If we create page by clicking links, submiting forms and so on it

data/lib/capybara/cuprite/browser/process.rb

@@ -6,26 +6,47 @@ module Capybara::Cuprite
   class Browser
     class Process
       KILL_TIMEOUT = 2
-
       BROWSER_PATH = ENV["BROWSER_PATH"]
       BROWSER_HOST = "127.0.0.1"
       BROWSER_PORT = "0"
-
-      # Chromium command line options
-      # https://peter.sh/experiments/chromium-command-line-switches/
       DEFAULT_OPTIONS = {
         "headless" => nil,
         "disable-gpu" => nil,
         "hide-scrollbars" => nil,
         "mute-audio" => nil,
+        "enable-automation" => nil,
+        "disable-web-security" => nil,
+        "disable-session-crashed-bubble" => nil,
+        "disable-breakpad" => nil,
+        "disable-sync" => nil,
+        "no-first-run" => nil,
+        "use-mock-keychain" => nil,
+        "keep-alive-for-test" => nil,
+        "disable-popup-blocking" => nil,
+        "disable-extensions" => nil,
+        "disable-hang-monitor" => nil,
+        "disable-features" => "site-per-process,TranslateUI",
+        "disable-translate" => nil,
+        "disable-background-networking" => nil,
+        "enable-features" => "NetworkService,NetworkServiceInProcess",
+        "disable-background-timer-throttling" => nil,
+        "disable-backgrounding-occluded-windows" => nil,
+        "disable-client-side-phishing-detection" => nil,
+        "disable-default-apps" => nil,
+        "disable-dev-shm-usage" => nil,
+        "disable-ipc-flooding-protection" => nil,
+        "disable-prompt-on-repost" => nil,
+        "disable-renderer-backgrounding" => nil,
+        "force-color-profile" => "srgb",
+        "metrics-recording-only" => nil,
+        "safebrowsing-disable-auto-update" => nil,
+        "password-store" => "basic",
         # Note: --no-sandbox is not needed if you properly setup a user in the container.
         # https://github.com/ebidel/lighthouse-ci/blob/master/builder/Dockerfile#L35-L40
         # "no-sandbox" => nil,
-        "enable-automation" => nil,
-        "disable-web-security" => nil,
       }.freeze
 
-      attr_reader :host, :port, :ws_url, :pid, :path, :options
+      attr_reader :host, :port, :ws_url, :pid, :path, :options, :cmd
 
       def self.start(*args)
         new(*args).tap(&:start)
@@ -37,7 +58,7 @@ module Capybara::Cuprite
             if Capybara::Cuprite.windows?
               ::Process.kill("KILL", pid)
             else
-              ::Process.kill("TERM", pid)
+              ::Process.kill("USR1", pid)
               start = Time.now
               while ::Process.wait(pid, ::Process::WNOHANG).nil?
                 sleep 0.05
@@ -57,8 +78,8 @@ module Capybara::Cuprite
 
         detect_browser_path(options)
 
-        window_size = options.fetch(:window_size, [1024, 768])
-        @options.merge!("window-size" => window_size.join(","))
+        # Doesn't work on MacOS, so we need to set it by CDP as well
+        @options.merge!("window-size" => options[:window_size].join(","))
 
         port = options.fetch(:port, BROWSER_PORT)
         @options.merge!("remote-debugging-port" => port)
@@ -66,6 +87,8 @@ module Capybara::Cuprite
         host = options.fetch(:host, BROWSER_HOST)
         @options.merge!("remote-debugging-address" => host)
 
+        @options.merge!("user-data-dir" => Dir.mktmpdir)
+
         @options = DEFAULT_OPTIONS.merge(@options)
 
         unless options.fetch(:headless, true)
@@ -74,6 +97,8 @@ module Capybara::Cuprite
         end
 
         @options.merge!(options.fetch(:browser_options, {}))
+
+        @logger = options.fetch(:logger, nil)
       end
 
       def start
@@ -85,8 +110,8 @@ module Capybara::Cuprite
         end
 
         redirect_stdout(write_io) do
-          cmd = [@path] + @options.map { |k, v| v.nil? ? "--#{k}" : "--#{k}=#{v}" }
-          @pid = ::Process.spawn(*cmd, process_options)
+          @cmd = [@path] + @options.map { |k, v| v.nil? ? "--#{k}" : "--#{k}=#{v}" }
+          @pid = ::Process.spawn(*@cmd, process_options)
           ObjectSpace.define_finalizer(self, self.class.process_killer(@pid))
         end
 
@@ -118,7 +143,7 @@ module Capybara::Cuprite
                 "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
               ].find { |path| File.exist?(path) }
             else
-              %w[chromium google-chrome-unstable google-chrome-beta google-chrome chrome].reduce(nil) do |path, exe|
+              %w[chromium google-chrome-unstable google-chrome-beta google-chrome chrome chromium-browser].reduce(nil) do |path, exe|
                 path = Cliver.detect(exe)
                 break path if path
               end
@@ -126,7 +151,7 @@ module Capybara::Cuprite
           )
 
         unless @path
-          message = "Could not find an executable `#{exe}`. Try to make it " \
+          message = "Could not find an executable for chrome. Try to make it " \
                     "available on the PATH or set environment varible for " \
                     "example BROWSER_PATH=\"/Applications/Chromium.app/Contents/MacOS/Chromium\""
           raise Cliver::Dependency::NotFound.new(message)
@@ -167,7 +192,7 @@ module Capybara::Cuprite
             IO.select([read_io], nil, nil, max_time - now)
           else
             if output.match(regexp)
-              @ws_url = Addressable::URI.parse(output.match(regexp)[1])
+              @ws_url = Addressable::URI.parse(output.match(regexp)[1].strip)
               @host = @ws_url.host
               @port = @ws_url.port
               break
@@ -176,6 +201,7 @@ module Capybara::Cuprite
         end
 
         unless @ws_url
+          @logger.puts output if @logger
           raise "Chrome process did not produce websocket url within #{timeout} seconds"
         end
       end

data/lib/capybara/cuprite/browser/runtime.rb

@@ -132,15 +132,20 @@ module Capybara::Cuprite
 
           case response["subtype"]
           when "node"
-            node_id = command("DOM.requestNode", objectId: object_id)["nodeId"]
-            node = command("DOM.describeNode", nodeId: node_id)["node"].merge("nodeId" => node_id)
-            { "target_id" => target_id, "node" => node }
+            begin
+              node_id = command("DOM.requestNode", objectId: object_id)["nodeId"]
+              node = command("DOM.describeNode", nodeId: node_id)["node"].merge("nodeId" => node_id)
+              { "target_id" => target_id, "node" => node }
+            rescue BrowserError => e
+              # Node has disappeared while we were trying to get it
+              raise if e.message != "Could not find node with given id"
+            end
           when "array"
             reduce_props(object_id, []) do |memo, key, value|
               next(memo) unless (Integer(key) rescue nil)
               value = value["objectId"] ? handle(value) : value["value"]
               memo.insert(key.to_i, value)
-            end
+            end.compact
           when "date"
             response["description"]
           when "null"

data/lib/capybara/cuprite/driver.rb

@@ -129,8 +129,8 @@ module Capybara::Cuprite
 
     def reset!
       browser.reset
-      browser.url_blacklist = @options[:url_blacklist] if @options.key?(:url_blacklist)
-      browser.url_whitelist = @options[:url_whitelist] if @options.key?(:url_whitelist)
+      browser.url_blacklist = @options[:url_blacklist]
+      browser.url_whitelist = @options[:url_whitelist]
       @started = false
     end
 
@@ -190,11 +190,11 @@ module Capybara::Cuprite
       browser.clear_network_traffic
     end
 
-    # FIXME: check user/pass proxy auth
     def set_proxy(ip, port, type = "http", user = nil, password = nil, bypass = nil)
-      @options[:browser] ||= {}
-      @options[:browser].merge!("proxy-server" => "#{type}=#{ip}:#{port}")
-      @options[:browser].merge!("proxy-bypass-list" => bypass) if bypass
+      @options[:browser_options] ||= {}
+      @options[:browser_options].merge!("proxy-server" => "#{type}=#{ip}:#{port}")
+      @options[:browser_options].merge!("proxy-bypass-list" => bypass) if bypass
+      browser.proxy_authorize(user, password)
     end
 
     def headers
@@ -246,16 +246,10 @@ module Capybara::Cuprite
       browser.clear_memory_cache
     end
 
-    # * Browser with set settings does not send `Authorize` on POST request
-    # * With manually set header browser makes next request with
-    # `Authorization: Basic Og==` header when settings are empty and the
-    # response was `401 Unauthorized` (which means Base64.encode64(":")).
-    # Combining both methods to reach proper behavior.
     def basic_authorize(user, password)
-      browser.set_http_auth(user, password)
-      credentials = ["#{user}:#{password}"].pack("m*").strip
-      add_header("Authorization", "Basic #{credentials}")
+      browser.authorize(user, password)
     end
+    alias_method :authorize, :basic_authorize
 
     def pause
       # STDIN is not necessarily connected to a keyboard. It might even be closed.

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -208,6 +208,7 @@ files:
 - lib/capybara/cuprite/browser/input.json
 - lib/capybara/cuprite/browser/input.rb
 - lib/capybara/cuprite/browser/javascripts/index.js
+- lib/capybara/cuprite/browser/net.rb
 - lib/capybara/cuprite/browser/page.rb
 - lib/capybara/cuprite/browser/process.rb
 - lib/capybara/cuprite/browser/runtime.rb