Merge pull request #18 from dbalatero/fix-repo-issues

Fix repo issues

Author: dbalatero

.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.5

.travis.yml

@@ -1,11 +1,7 @@
 sudo: false
 language: ruby
 addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
+  chrome: stable
 rvm:
-  - 2.4.1
+  - 2.6.5
 before_install: gem install bundler -v 1.16.0

Gemfile.lock

@@ -10,8 +10,6 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    archive-zip (0.11.0)
-      io-like (~> 0.3.0)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -21,28 +19,24 @@ GEM
       xpath (>= 2.0, < 4.0)
     childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (1.2.0)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
     coderay (1.1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
     ffi (1.9.21)
     gem-release (2.0.1)
-    io-like (0.3.0)
     method_source (0.9.0)
     mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rack (2.0.4)
+    rack (2.0.8)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -62,6 +56,10 @@ GEM
       rubyzip (~> 1.2)
     stub_server (0.2.1)
       rack
+    webdrivers (4.1.2)
+      nokogiri (~> 1.6)
+      rubyzip (~> 1.0)
+      selenium-webdriver (>= 3.0, < 4.0)
     xpath (3.0.0)
       nokogiri (~> 1.8)
 
@@ -71,13 +69,13 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   capybara-chromedriver-logger!
-  chromedriver-helper
   gem-release
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   selenium-webdriver
   stub_server
+  webdrivers (~> 4.0)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

README.md

@@ -36,10 +36,12 @@ You'll want to modify your `spec_helper.rb` file to configure Capybara correctly
 
 ```ruby
 Capybara.register_driver(:chrome) do |app|
-  # Turn on browser logs
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    loggingPrefs: {
-      browser: 'ALL'
+  # option 1:
+  # This wraps Selenium::WebDriver::Remote::Capabilities.chrome() with the
+  # correct settings for logging.
+  capabilities = Capybara::Chromedriver::Logger.build_capabilities(
+    chromeOptions: {
+      args: %w[headless]
     }
   )
 
@@ -65,6 +67,29 @@ RSpec.configure do |config|
 end
 ```
 
+If you don't want to use the capability wrapper above for any reason, you can
+still manually configure things:
+
+```ruby
+# option 2: manual setup
+# Turn on browser logs
+capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+  chromeOptions: {
+    args: %w[headless],
+    # required for Chrome 75+
+    w3c: false
+  },
+  # For up to Chrome 74
+  loggingPrefs: {
+    browser: 'ALL'
+  }
+  # for Chrome 75+
+  "goog:loggingPrefs" => {
+    browser: 'ALL'
+  }
+)
+```
+
 ## Configuration
 
 Here are examples of the supported configuration options:

capybara-chromedriver-logger.gemspec

@@ -33,11 +33,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colorize"
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "chromedriver-helper"
   spec.add_development_dependency "gem-release"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "selenium-webdriver"
   spec.add_development_dependency "stub_server"
+  spec.add_development_dependency 'webdrivers', '~> 4.0'
 end

lib/capybara/chromedriver/logger.rb

@@ -12,6 +12,31 @@ module Chromedriver
     module Logger
       extend self
 
+      def build_capabilities(loggingPrefs: { browser: 'ALL' }, **options)
+        options[:chromeOptions] ||= {}
+
+        if options[:chromeOptions][:w3c]
+          warn "warning: Setting chromeOptions.w3c to true makes it not "\
+            "possible to get console.log messages from Chrome.\n\n"\
+            "Please see: https://github.com/SeleniumHQ/selenium/issues/7270"
+        else
+          options[:chromeOptions][:w3c] = false
+        end
+
+        if loggingPrefs[:browser] != 'ALL'
+          warn "warning: loggingPrefs needs to contain { browser: 'ALL' } "\
+            "when using Logger#build_capabilities"
+        end
+
+        options[:loggingPrefs] = loggingPrefs
+
+        # Support Chrome 75+
+        # see: https://github.com/SeleniumHQ/selenium/issues/7342
+        options["goog:loggingPrefs"] = loggingPrefs
+
+        ::Selenium::WebDriver::Remote::Capabilities.chrome(options)
+      end
+
       def filters
         @filters || []
       end

spec/spec_helper.rb

@@ -1,4 +1,6 @@
+require "pry"
 require "bundler/setup"
+require "webdrivers/chromedriver"
 require "capybara/chromedriver/logger"
 
 Dir.glob("spec/support/**/*.rb") { |f| require_relative "../#{f}" }

spec/support/capybara.rb

@@ -20,12 +20,9 @@
     --window-size=1600,1200
   ]
 
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+  capabilities = Capybara::Chromedriver::Logger.build_capabilities(
     chromeOptions: {
       args: args
-    },
-    loggingPrefs: {
-      browser: 'ALL'
     }
   )