Merge pull request #167 from rubycdp/fix-build

route · web-flow · commit b5fe32f3ff66 · 2021-10-26T16:19:12.000+03:00
Fix build
diff --git a/.github/gemfiles/capybara-2.x.gemfile b/.github/gemfiles/capybara-2.x.gemfile
diff --git a/.github/gemfiles/capybara-3.x.gemfile b/.github/gemfiles/capybara-3.x.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "capybara", "~> 3.0"
+gem "capybara", "~> 3.35.0"
 
 gemspec path: "../../"
diff --git a/.github/gemfiles/ferrum-master.gemfile b/.github/gemfiles/ferrum-master.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "ferrum", github: "route/ferrum"
+gem "capybara", "~> 3.35.0"
 
 gemspec path: "../../"
diff --git a/.github/gemfiles/websocket-driver-6.x.gemfile b/.github/gemfiles/websocket-driver-6.x.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "websocket-driver", ">= 0.6", "< 0.7"
+gem "capybara", "~> 3.35.0"
 
 gemspec path: "../../"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [capybara-2.x, capybara-3.x, ferrum-master, websocket-driver-6.x]
+        gemfile: [capybara-3.x, websocket-driver-6.x, ferrum-master]
         ruby: [2.5, 2.6, 2.7]
 
     runs-on: ubuntu-latest
@@ -30,6 +30,11 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Setup Chrome
+        uses: browser-actions/setup-chrome@latest
+        with:
+          chrome-version: stable
+
       - run: mkdir -p /tmp/cuprite
 
       - name: Run tests
diff --git a/cuprite.gemspec b/cuprite.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.5.0"
 
-  s.add_runtime_dependency "capybara", ">= 2.1", "< 4"
+  s.add_runtime_dependency "capybara", "~> 3.0"
   s.add_runtime_dependency "ferrum",   "~> 0.11.0"
 
   s.add_development_dependency "image_size", "~> 3.0"
diff --git a/lib/capybara/cuprite/browser.rb b/lib/capybara/cuprite/browser.rb
@@ -79,14 +79,6 @@ def window_handles
     def within_window(locator = nil, &block)
       original = window_handle
 
-      if Capybara::VERSION.to_f < 3.0
-        target_id = window_handles.find do |target_id|
-          page = attach_page(target_id)
-          locator == page.frame_name
-        end
-        locator = target_id if target_id
-      end
-
       if window_handles.include?(locator)
         switch_to_window(locator)
         yield
diff --git a/lib/capybara/cuprite/driver.rb b/lib/capybara/cuprite/driver.rb
@@ -10,7 +10,13 @@ class Driver < Capybara::Driver::Base
 
     extend Forwardable
 
-    delegate %i(restart quit status_code timeout timeout=) => :browser
+    delegate %i(restart quit status_code timeout timeout= current_url title body
+                window_handles close_window switch_to_window within_window window_handle
+                back forward refresh wait_for_reload) => :browser
+    alias_method :html, :body
+    alias_method :current_window_handle, :window_handle
+    alias_method :go_back, :back
+    alias_method :go_forward, :forward
 
     attr_reader :app, :options, :screen_size
 
@@ -43,35 +49,14 @@ def visit(url)
       browser.visit(url)
     end
 
-    def current_url
-      if Capybara::VERSION.to_f < 3.0
-        frame_url
-      else
-        browser.current_url
-      end
-    end
-
     def frame_url
       evaluate_script("window.location.href")
     end
 
-    def html
-      browser.body
-    end
-    alias_method :body, :html
-
     def source
       browser.source.to_s
     end
 
-    def title
-      if Capybara::VERSION.to_f < 3.0
-        frame_title
-      else
-        browser.title
-      end
-    end
-
     def frame_title
       evaluate_script("document.title")
     end
@@ -118,33 +103,13 @@ def switch_to_frame(locator)
       browser.switch_to_frame(handle)
     end
 
-    def current_window_handle
-      browser.window_handle
-    end
-
-    def window_handles
-      browser.window_handles
-    end
-
-    def close_window(handle)
-      browser.close_window(handle)
-    end
-
     def open_new_window
       target = browser.default_context.create_target
       target.maybe_sleep_if_new_window
       target.page = Page.new(target.id, browser)
       target.page
     end
 
-    def switch_to_window(handle)
-      browser.switch_to_window(handle)
-    end
-
-    def within_window(name, &block)
-      browser.within_window(name, &block)
-    end
-
     def no_such_window_error
       Ferrum::NoSuchPageError
     end
@@ -368,22 +333,6 @@ def invalid_element_errors
        Ferrum::NodeNotFoundError]
     end
 
-    def go_back
-      browser.back
-    end
-
-    def go_forward
-      browser.forward
-    end
-
-    def refresh
-      browser.refresh
-    end
-
-    def wait_for_reload(*args)
-      browser.wait_for_reload(*args)
-    end
-
     def accept_modal(type, options = {})
       case type
       when :alert, :confirm
diff --git a/lib/capybara/cuprite/node.rb b/lib/capybara/cuprite/node.rb
@@ -54,15 +54,11 @@ def all_text
     end
 
     def visible_text
-      if Capybara::VERSION.to_f < 3.0
-        filter_text(command(:visible_text))
-      else
-        command(:visible_text).to_s
-                              .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
-                              .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
-                              .gsub(/\n+/, "\n")
-                              .tr("\u00a0", " ")
-      end
+      command(:visible_text).to_s
+                            .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
+                            .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
+                            .gsub(/\n+/, "\n")
+                            .tr("\u00a0", " ")
     end
 
     def property(name)
@@ -236,15 +232,11 @@ def prepare_and_click(mode, name, keys, options)
     end
 
     def filter_text(text)
-      if Capybara::VERSION.to_f < 3
-        Capybara::Helpers.normalize_whitespace(text.to_s)
-      else
-        text.gsub(/[\u200b\u200e\u200f]/, "")
-            .gsub(/[\ \n\f\t\v\u2028\u2029]+/, " ")
-            .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
-            .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
-            .tr("\u00a0", " ")
-      end
+      text.gsub(/[\u200b\u200e\u200f]/, "")
+          .gsub(/[\ \n\f\t\v\u2028\u2029]+/, " ")
+          .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
+          .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
+          .tr("\u00a0", " ")
     end
 
     def scroll_element_to_location(element, location)
diff --git a/spec/features/driver_spec.rb b/spec/features/driver_spec.rb
@@ -792,7 +792,7 @@ def create_screenshot(file, *args)
       end
     end
 
-    it "can clear memory cache" do
+    it "can clear memory cache", skip: "Fixed in ferrum master" do
       @driver.clear_memory_cache
 
       @session.visit("/cuprite/cacheable")
@@ -1561,12 +1561,7 @@ def create_screenshot(file, *args)
 
       @session.within_frame(0) do
         expect(@session.driver.frame_url).to end_with("/cuprite/slow")
-        if Capybara::VERSION.to_f < 3.0
-          expect(@session.driver.current_url).to end_with("/cuprite/slow")
-        else
-          # current_url is required to return the top level browsing context in Capybara 3
           expect(@session.driver.current_url).to end_with("/cuprite/frames")
-        end
       end
       expect(@session.driver.frame_url).to end_with("/cuprite/frames")
       expect(@session.driver.current_url).to end_with("/cuprite/frames")
diff --git a/spec/features/session_spec.rb b/spec/features/session_spec.rb
@@ -532,16 +532,9 @@
       end
     end
 
-    if Capybara::VERSION.to_f < 3.0
-      it "returns BR as a space in #text" do
-        @session.visit "/cuprite/simple"
-        expect(@session.find(:css, "#break").text).to eq("Foo Bar")
-      end
-    else
-      it "returns BR as new line in #text" do
-        @session.visit "/cuprite/simple"
-        expect(@session.find(:css, "#break").text).to eq("Foo\nBar")
-      end
+    it "returns BR as new line in #text" do
+      @session.visit "/cuprite/simple"
+      expect(@session.find(:css, "#break").text).to eq("Foo\nBar")
     end
 
     it "handles hash changes" do
@@ -871,22 +864,12 @@
         expect(@session.find(:css, "#bar").text).to eq "bar"
       end
 
-      if Capybara::VERSION.to_f < 3.0
-        it "gets text stripped whitespace and nbsp" do
-          expect(@session.find(:css, "#baz").text).to eq "baz"
-        end
-
-        it "gets text stripped whitespace, nbsp and unicode whitespace" do
-          expect(@session.find(:css, "#qux").text).to eq "qux"
-        end
-      else
-        it "gets text stripped whitespace and then converts nbsp to space" do
-          expect(@session.find(:css, "#baz").text).to eq " baz    "
-        end
+      it "gets text stripped whitespace and then converts nbsp to space" do
+        expect(@session.find(:css, "#baz").text).to eq " baz    "
+      end
 
-        it "gets text stripped whitespace" do
-          expect(@session.find(:css, "#qux").text).to eq "  \u3000 qux \u3000  "
-        end
+      it "gets text stripped whitespace" do
+        expect(@session.find(:css, "#qux").text).to eq "  \u3000 qux \u3000  "
       end
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -13,20 +13,16 @@
 require "support/test_app"
 require "support/external_browser"
 
+puts ""
+puts `#{Ferrum::Browser::Command.build({ window_size: [], ignore_default_browser_options: true }, nil).to_a.first} --version`
+puts ""
+
 Capybara.register_driver(:cuprite) do |app|
   options = {}
   options.merge!(inspector: true) if ENV["INSPECTOR"]
   options.merge!(logger: StringIO.new) if ENV["CI"]
-  driver = Capybara::Cuprite::Driver.new(app, options)
-  process = driver.browser.process
-
-  puts ""
-  puts "Browser: #{process.browser_version}"
-  puts "Protocol: #{process.protocol_version}"
-  puts "V8: #{process.v8_version}"
-  puts "Webkit: #{process.webkit_version}"
-
-  driver
+  options.merge!(headless: false) if ENV["HEADLESS"] == "false"
+  Capybara::Cuprite::Driver.new(app, options)
 end
 
 module TestSessions
