Merge pull request #143 from rubycdp/fix-build

route · web-flow · commit d69a30ecbf3f · 2021-02-16T21:22:01.000+03:00
Fix build
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/gemfiles/capybara-2.x.gemfile b/.github/gemfiles/capybara-2.x.gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 2.0"
 
-gemspec path: "../"
+gemspec path: "../../"
diff --git a/.github/gemfiles/capybara-3.x.gemfile b/.github/gemfiles/capybara-3.x.gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "capybara", "~> 3.0"
 
-gemspec path: "../"
+gemspec path: "../../"
diff --git a/.github/gemfiles/ferrum-master.gemfile b/.github/gemfiles/ferrum-master.gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "ferrum", github: "route/ferrum"
 
-gemspec path: "../"
+gemspec path: "../../"
diff --git a/.github/gemfiles/websocket-driver-6.x.gemfile b/.github/gemfiles/websocket-driver-6.x.gemfile
@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "websocket-driver", ">= 0.6", "< 0.7"
 
-gemspec path: "../"
+gemspec path: "../../"
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -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
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.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: 20
+      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/
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2020 Dmitry Vorotilin
+Copyright (c) 2018-2021 Dmitry Vorotilin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -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
diff --git a/spec/integration/driver_spec.rb b/spec/integration/driver_spec.rb
@@ -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|
diff --git a/spec/integration/session_spec.rb b/spec/integration/session_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
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -59,8 +59,10 @@ module TestSessions
     node Element#drop can drop multiple files
     node Element#drop can drop strings
     node Element#drop can drop multiple strings
+    node Element#drop can drop a pathname
     node #visible? details non-summary descendants should be non-visible
     node #visible? works when details is toggled open and closed
+    node #path reports when element in shadow dom
     #all with obscured filter should only find nodes on top in the viewport when false
     #all with obscured filter should not find nodes on top outside the viewport when false
     #all with obscured filter should find top nodes outside the viewport when true
@@ -75,6 +77,7 @@ module TestSessions
     #find with spatial filters should find an element "near" another element
     #has_css? with spatial requirements accepts spatial options
     #has_css? with spatial requirements supports spatial sugar
+    #fill_in should fill in a textarea in a reasonable time by default
     REGEXP
 
     metadata[:skip] = true if metadata[:full_description].match(/#{regexes}/)
@@ -104,11 +107,10 @@ def save_exception_aftifacts(browser, meta)
     timestamp = "#{time_now.strftime('%Y-%m-%d-%H-%M-%S.')}#{'%03d' % (time_now.usec/1000).to_i}"
 
     screenshot_name = "screenshot-#{filename}-#{line_number}-#{timestamp}.png"
-    screenshot_path = "#{ENV["CIRCLE_ARTIFACTS"]}/screenshots/#{screenshot_name}"
+    screenshot_path = "/tmp/cuprite/#{screenshot_name}"
     browser.screenshot(path: screenshot_path, full: true)
 
-    log_name = "cuprite-#{filename}-#{line_number}-#{timestamp}.txt"
-    log_path = "#{ENV["CIRCLE_ARTIFACTS"]}/logs/#{log_name}"
-    File.open(log_path, 'wb') { |file| file.write(browser.logger.string) }
+    log_name = "logfile-#{filename}-#{line_number}-#{timestamp}.txt"
+    File.open("/tmp/cuprite/#{log_name}", "wb") { |f| f.write(browser.logger.string) }
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://rubygems.org"`
`4`	`4`
`5`	`5`	`gem "capybara", "~> 2.0"`
`6`	`6`
`7`		`-gemspec path: "../"`
	`7`	`+gemspec path: "../../"`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://rubygems.org"`
`4`	`4`
`5`	`5`	`gem "capybara", "~> 3.0"`
`6`	`6`
`7`		`-gemspec path: "../"`
	`7`	`+gemspec path: "../../"`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://rubygems.org"`
`4`	`4`
`5`	`5`	`gem "ferrum", github: "route/ferrum"`
`6`	`6`
`7`		`-gemspec path: "../"`
	`7`	`+gemspec path: "../../"`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://rubygems.org"`
`4`	`4`
`5`	`5`	`gem "websocket-driver", ">= 0.6", "< 0.7"`
`6`	`6`
`7`		`-gemspec path: "../"`
	`7`	`+gemspec path: "../../"`
Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ def create_screenshot(file, *args)`
`783`	`783`	`%r{/cuprite/jquery.min.js$} => File.size(CUPRITE_ROOT + "/spec/support/public/jquery-1.11.3.min.js"),`
`784`	`784`	`%r{/cuprite/jquery-ui.min.js$} => File.size(CUPRITE_ROOT + "/spec/support/public/jquery-ui-1.11.4.min.js"),`
`785`	`785`	`%r{/cuprite/test.js$} => File.size(CUPRITE_ROOT + "/spec/support/public/test.js"),`
`786`		`- %r{/cuprite/with_js$} => 2329`
	`786`	`+ %r{/cuprite/with_js$} => 2405`
`787`	`787`	`}`
`788`	`788`
`789`	`789`	`resources_size.each do \|resource, size\|`