Drop capybara 2 support

Author: route

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

@@ -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

.github/workflows/tests.yml

@@ -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"

cuprite.gemspec

@@ -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

lib/capybara/cuprite/browser.rb

@@ -44,11 +44,7 @@ def visit(url)
     end
 
     def current_url
-      if Capybara::VERSION.to_f < 3.0
-        frame_url
-      else
-        browser.current_url
-      end
+      browser.current_url
     end
 
     def frame_url
@@ -65,11 +61,7 @@ def source
     end
 
     def title
-      if Capybara::VERSION.to_f < 3.0
-        frame_title
-      else
-        browser.title
-      end
+      browser.title
     end
 
     def frame_title

lib/capybara/cuprite/driver.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)

lib/capybara/cuprite/node.rb

@@ -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")

spec/features/driver_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