Merge pull request #196 from rubycdp/fix-build-2

route · web-flow · commit 6dcb660bf842 · 2022-10-05T17:21:05.000+05:00
Fix build
diff --git a/.github/gemfiles/ferrum-master.gemfile b/.github/gemfiles/ferrum-master.gemfile
diff --git a/.github/gemfiles/websocket-driver-0.6.x.gemfile b/.github/gemfiles/websocket-driver-0.6.x.gemfile
@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "websocket-driver", ">= 0.6", "< 0.7"
-gem "capybara", "~> 3.35.0"
+gem "capybara", "~> 3.37.1"
+gem "matrix"
 
 gemspec path: "../../"
diff --git a/.github/gemfiles/websocket-driver-0.7.x.gemfile b/.github/gemfiles/websocket-driver-0.7.x.gemfile
@@ -2,6 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "capybara", "~> 3.35.0"
+gem "websocket-driver", ">= 0.7", "< 0.8"
+gem "capybara", "~> 3.37.1"
+gem "matrix"
 
 gemspec path: "../../"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,12 +11,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [capybara-3.x, websocket-driver-6.x, ferrum-master]
-        ruby: [2.6, 2.7, 3.0]
+        gemfile: [websocket-driver-0.6.x, websocket-driver-0.7.x]
+        ruby: [2.7, 3.0, 3.1]
     runs-on: ubuntu-latest
     env:
       FERRUM_PROCESS_TIMEOUT: 20
-      FERRUM_DEFAULT_TIMEOUT: 10
+      FERRUM_DEFAULT_TIMEOUT: 15
       BUNDLE_GEMFILE: .github/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
       - name: Checkout code
@@ -37,10 +37,6 @@ jobs:
 
       - name: Run tests
         run: bundle exec rake
-        if: |
-          matrix.gemfile != 'ferrum-master' ||
-            (matrix.gemfile == 'ferrum-master' &&
-              contains(github.event.pull_request.labels.*.name, 'master'))
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v2
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,3 @@ Gemfile.*
 pkg
 .idea
 .ruby-version
-save_path_tmp
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2021 Dmitry Vorotilin
+Copyright (c) 2018-2022 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/lib/capybara/cuprite/browser.rb b/lib/capybara/cuprite/browser.rb
@@ -187,7 +187,7 @@ def find_all(method, selector, within = nil)
                   evaluate("_cuprite.find(arguments[0], arguments[1])", method, selector)
                 end
 
-        nodes.map { |n| n.node? ? n : next }.compact
+        nodes.select(&:node?)
       rescue Ferrum::JavaScriptError => e
         raise InvalidSelector.new(e.response, method, selector) if e.class_name == "InvalidSelector"
 
diff --git a/lib/capybara/cuprite/page.rb b/lib/capybara/cuprite/page.rb
@@ -170,9 +170,9 @@ def prepare_page
             response = @modal_response || params["defaultPrompt"]
           else
             with_text = params["message"] ? "with text `#{params['message']}` " : ""
-            warn "Modal window #{with_text}has been opened, but you didn't wrap "\
-                 "your code into (`accept_prompt` | `dismiss_prompt` | "\
-                 "`accept_confirm` | `dismiss_confirm` | `accept_alert`), "\
+            warn "Modal window #{with_text}has been opened, but you didn't wrap " \
+                 "your code into (`accept_prompt` | `dismiss_prompt` | " \
+                 "`accept_confirm` | `dismiss_confirm` | `accept_alert`), " \
                  "accepting by default"
             options = { accept: true }
             response = params["defaultPrompt"]
diff --git a/spec/features/driver_spec.rb b/spec/features/driver_spec.rb
@@ -119,12 +119,12 @@ def session_url(path)
       end
 
       it "allows the page to be scrolled" do
-        @session.visit("/cuprite/long_page")
-        @driver.resize(10, 10)
-        @driver.scroll_to(200, 100)
+        @session.visit("/cuprite/scroll_long_page")
+        @driver.scroll_to(200, 500)
+
         expect(
           @driver.evaluate_script("[window.scrollX, window.scrollY]")
-        ).to eq([200, 100])
+        ).to eq([200, 500])
       end
 
       it "supports specifying viewport size with an option" do
@@ -154,7 +154,7 @@ def session_url(path)
           create_screenshot file, full: true
           File.open(file, "rb") do |f|
             expect(ImageSize.new(f.read).size).to eq(
-              @driver.evaluate_script("[document.documentElement.clientWidth, document.documentElement.clientHeight]")
+              @driver.evaluate_script("[document.documentElement.scrollWidth, document.documentElement.scrollHeight]")
             )
           end
         end
@@ -195,7 +195,7 @@ def session_url(path)
 
           File.open(file, "rb") do |f|
             expect(ImageSize.new(f.read).size).to eq(
-              @driver.evaluate_script("[document.documentElement.clientWidth, document.documentElement.clientHeight]")
+              @driver.evaluate_script("[document.documentElement.scrollWidth, document.documentElement.scrollHeight]")
             )
           end
         end
@@ -763,8 +763,7 @@ def create_screenshot(file, *args)
           resources_size = {
             %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$} => 2405
+            %r{/cuprite/test.js$} => File.size("#{CUPRITE_ROOT}/spec/support/public/test.js")
           }
 
           resources_size.each do |resource, size|
@@ -927,7 +926,7 @@ def create_screenshot(file, *args)
       it "allows the driver to have a custom host" do
         # Use custom host "pointing" to localhost, specified by BROWSER_TEST_HOST env var.
         # Use /etc/hosts or iptables for this: https://superuser.com/questions/516208/how-to-change-ip-address-to-point-to-localhost
-        host = ENV["BROWSER_TEST_HOST"]
+        host = ENV.fetch("BROWSER_TEST_HOST", nil)
 
         skip "BROWSER_TEST_HOST not set" if host.nil? # skip test if var is unspecified
 
diff --git a/spec/features/session_spec.rb b/spec/features/session_spec.rb
@@ -919,8 +919,8 @@
         @session.visit "/cuprite/with_js"
         expect(@session.driver.browser.page)
           .to receive(:warn).with(
-            "Modal window with text `{T}ext \\w|th [reg.exp] (chara©+er$)?` has been opened, "\
-            "but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` "\
+            "Modal window with text `{T}ext \\w|th [reg.exp] (chara©+er$)?` has been opened, " \
+            "but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` " \
             "| `dismiss_confirm` | `accept_alert`), accepting by default"
           )
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -14,10 +14,12 @@
 require "support/external_browser"
 
 puts ""
-command = Ferrum::Browser::Command.build({ window_size: [], ignore_default_browser_options: true }, nil)
-puts `#{command.to_a.first} --version`
+command = Ferrum::Browser::Command.build({ window_size: [] }, nil)
+puts `'#{command.path}' --version`
 puts ""
 
+Capybara.save_path = File.join(CUPRITE_ROOT, "spec", "tmp", "save_path")
+
 Capybara.register_driver(:cuprite) do |app|
   options = {}
   options.merge!(inspector: true) if ENV["INSPECTOR"]
@@ -61,6 +63,7 @@ module TestSessions
       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
+      node #shadow_root
       #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
@@ -79,20 +82,21 @@ module TestSessions
     REGEXP
 
     metadata[:skip] = true if metadata[:full_description].match(/#{regexes}/)
+    metadata[:skip] = true if metadata[:requires]&.include?(:active_element)
   end
 
   config.around do |example|
     remove_temporary_folders
 
-    if ENV["CI"]
+    if ENV.fetch("CI", nil)
       session = @session || TestSessions::Cuprite
       session.driver.browser.logger.truncate(0)
       session.driver.browser.logger.rewind
     end
 
     example.run
 
-    if ENV["CI"] && example.exception
+    if ENV.fetch("CI", nil) && example.exception
       session = @session || TestSessions::Cuprite
       save_exception_artifacts(session.driver.browser, example.metadata)
     end
@@ -126,7 +130,7 @@ def save_exception_log(browser, filename, line_number, timestamp)
   end
 
   def remove_temporary_folders
-    FileUtils.rm_rf("#{CUPRITE_ROOT}/screenshots")
-    FileUtils.rm_rf("#{CUPRITE_ROOT}/save_path_tmp")
+    FileUtils.rm_rf(File.join(CUPRITE_ROOT, "spec", "tmp", "screenshots"))
+    FileUtils.rm_rf(Capybara.save_path)
   end
 end
diff --git a/spec/support/views/scroll_long_page.erb b/spec/support/views/scroll_long_page.erb
