Fix build

Author: route

.circleci/config.yml

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 2.0"
 
-gemspec path: "../"
+gemspec path: "../../"

gemfiles/capybara-2.x.gemfile renamed to .github/gemfiles/capybara-2.x.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 3.0"
 
-gemspec path: "../"
+gemspec path: "../../"

gemfiles/capybara-3.x.gemfile renamed to .github/gemfiles/capybara-3.x.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "ferrum", github: "route/ferrum"
 
-gemspec path: "../"
+gemspec path: "../../"

gemfiles/ferrum-master.gemfile renamed to .github/gemfiles/ferrum-master.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "websocket-driver", ">= 0.6", "< 0.7"
 
-gemspec path: "../"
+gemspec path: "../../"

gemfiles/websocket-driver-6.x.gemfile renamed to .github/gemfiles/websocket-driver-6.x.gemfile

@@ -0,0 +1,28 @@
+name: Linter
+on: [push]
+
+# jobs:
+#   linters:
+#     name: Linters
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v2
+
+#       - name: Setup Ruby
+#         uses: ruby/setup-ruby@v1
+#       - name: Ruby gem cache
+#         uses: actions/cache@v1
+#         with:
+#           path: vendor/bundle
+#           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+#           restore-keys: |
+#             ${{ runner.os }}-gems-
+#       - name: Install gems
+#         run: |
+#           bundle config path vendor/bundle
+#           bundle install --jobs 4 --retry 3
+
+#       - name: Run linters
+#         run: |
+#           bin/rubocop --parallel

.github/workflows/linter.yml

@@ -0,0 +1,38 @@
+name: Tests
+on: [push]
+
+jobs:
+  tests:
+    name: Tests
+
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [capybara-2.x, capybara-3.x, ferrum-master, websocket-driver-6.x]
+        ruby: [2.5, 2.6, 2.7]
+
+    runs-on: ubuntu-latest
+    env:
+      FERRUM_PROCESS_TIMEOUT: 10
+      BUNDLE_GEMFILE: .github/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: mkdir -p /tmp/cuprite
+
+      - name: Run tests
+        run: bundle exec rake
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: footprints
+          path: /tmp/cuprite/

.github/workflows/tests.yml

@@ -1,7 +1,5 @@
 # Cuprite - Headless Chrome driver for Capybara
 
-[![CircleCI](https://circleci.com/gh/rubycdp/cuprite.svg?style=shield)](https://circleci.com/gh/rubycdp/cuprite)
-
 Cuprite is a pure Ruby driver (read as _no_ Selenium/WebDriver/ChromeDriver
 dependency) for [Capybara](https://github.com/teamcapybara/capybara). It allows
 you to run Capybara tests on a headless Chrome or Chromium. Under the hood it

README.md

@@ -783,7 +783,7 @@ def create_screenshot(file, *args)
           %r{/cuprite/jquery.min.js$}    => File.size(CUPRITE_ROOT + "/spec/support/public/jquery-1.11.3.min.js"),
           %r{/cuprite/jquery-ui.min.js$} => File.size(CUPRITE_ROOT + "/spec/support/public/jquery-ui-1.11.4.min.js"),
           %r{/cuprite/test.js$}          => File.size(CUPRITE_ROOT + "/spec/support/public/test.js"),
-          %r{/cuprite/with_js$}          => 2329
+          %r{/cuprite/with_js$}          => 2405
         }
 
         resources_size.each do |resource, size|

spec/integration/driver_spec.rb

@@ -1016,11 +1016,28 @@
     context "in threadsafe mode" do
       before do
         skip "No threadsafe mode in this version" unless Capybara.respond_to?(:threadsafe)
-        Capybara::SpecHelper.reset_threadsafe(true, @session) if Capybara.respond_to?(:threadsafe)
+
+        if Capybara.respond_to?(:threadsafe)
+          parameters = Capybara::SpecHelper.method(:reset_threadsafe).parameters
+
+          if parameters[0][0] == :opt
+            Capybara::SpecHelper.reset_threadsafe(true, @session)
+          else
+            Capybara::SpecHelper.reset_threadsafe(bool: true, session: @session)
+          end
+        end
       end
 
       after do
-        Capybara::SpecHelper.reset_threadsafe(false, @session) if Capybara.respond_to?(:threadsafe)
+        if Capybara.respond_to?(:threadsafe)
+          parameters = Capybara::SpecHelper.method(:reset_threadsafe).parameters
+
+          if parameters[0][0] == :opt
+            Capybara::SpecHelper.reset_threadsafe(false, @session)
+          else
+            Capybara::SpecHelper.reset_threadsafe(bool: false, session: @session)
+          end
+        end
       end
 
       it "uses per session wait setting" do