Adding support for more recent Capybara versions

Appraisals

@@ -12,4 +12,25 @@ when "2.2.5" then
   appraise "capybara-2.2-ruby#{RUBY_VERSION}" do
     gem "capybara", "~> 2.2.0"
   end
+
+  appraise "capybara-2.3-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.3.0'
+  end
+
+  appraise "capybara-2.4-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.4.0'
+  end
+
+  appraise "capybara-2.5-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.5.0'
+  end
+
+  appraise "capybara-2.6-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.6.0'
+  end
+
+  appraise "capybara-2.7-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.7.0'
+  end
 end
+

ae_page_objects.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
 
   s.files                     = `git ls-files -- lib`.split("\n")
 
-  s.add_dependency('capybara', ['>= 1.1', '< 2.3'])
+  s.add_dependency('capybara', ['>= 1.1', '< 2.8'])
 end
 

gemfiles/capybara_2.3_ruby2.2.5.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 0.5.1"
+gem "mocha", "= 0.13.3"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "gem-release", "0.7.4"
+gem "rake", "~> 11.0"
+gem "test-unit", "~> 3.0"
+gem "capybara", "~> 2.3.0"
+
+gemspec :path=>"../"

gemfiles/capybara_2.4_ruby2.2.5.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 0.5.1"
+gem "mocha", "= 0.13.3"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "gem-release", "0.7.4"
+gem "rake", "~> 11.0"
+gem "test-unit", "~> 3.0"
+gem "capybara", "~> 2.4.0"
+
+gemspec :path=>"../"

gemfiles/capybara_2.5_ruby2.2.5.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 0.5.1"
+gem "mocha", "= 0.13.3"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "gem-release", "0.7.4"
+gem "rake", "~> 11.0"
+gem "test-unit", "~> 3.0"
+gem "capybara", "~> 2.5.0"
+
+gemspec :path=>"../"

gemfiles/capybara_2.6_ruby2.2.5.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 0.5.1"
+gem "mocha", "= 0.13.3"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "gem-release", "0.7.4"
+gem "rake", "~> 11.0"
+gem "test-unit", "~> 3.0"
+gem "capybara", "~> 2.6.0"
+
+gemspec :path=>"../"

gemfiles/capybara_2.7_ruby2.2.5.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 0.5.1"
+gem "mocha", "= 0.13.3"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "gem-release", "0.7.4"
+gem "rake", "~> 11.0"
+gem "test-unit", "~> 3.0"
+gem "capybara", "~> 2.7.0"
+
+gemspec :path=>"../"

test/test_apps/4.2/Appraisals

@@ -13,4 +13,24 @@ when "2.2.5" then
     gem "capybara", "~> 2.2.0"
   end
 
+  appraise "capybara-2.3-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.3.0'
+  end
+
+  appraise "capybara-2.4-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.4.0'
+  end
+
+  appraise "capybara-2.5-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.5.0'
+  end
+
+  appraise "capybara-2.6-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.6.0'
+  end
+
+  appraise "capybara-2.7-ruby#{RUBY_VERSION}" do
+    gem 'capybara', '~> 2.7.0'
+  end
+
 end

test/test_apps/4.2/gemfiles/capybara_2.3_ruby2.2.5.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "sqlite3", "1.3.11"
+gem "sass-rails", "~> 4.0.2"
+gem "jquery-rails", "3.1.4"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "mocha", "0.13.3", :require=>false
+gem "appraisal", "~> 0.5.1"
+gem "ae_page_objects", :path=>"../../../.."
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.0.0"
+gem "turbolinks", "2.5.3"
+gem "jbuilder", "~> 1.2"
+gem "forum", :path=>"../engines"
+gem "capybara", "~> 2.3.0"
+

test/test_apps/4.2/gemfiles/capybara_2.4_ruby2.2.5.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "sqlite3", "1.3.11"
+gem "sass-rails", "~> 4.0.2"
+gem "jquery-rails", "3.1.4"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "mocha", "0.13.3", :require=>false
+gem "appraisal", "~> 0.5.1"
+gem "ae_page_objects", :path=>"../../../.."
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.0.0"
+gem "turbolinks", "2.5.3"
+gem "jbuilder", "~> 1.2"
+gem "forum", :path=>"../engines"
+gem "capybara", "~> 2.4.0"
+

test/test_apps/4.2/gemfiles/capybara_2.5_ruby2.2.5.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "sqlite3", "1.3.11"
+gem "sass-rails", "~> 4.0.2"
+gem "jquery-rails", "3.1.4"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "mocha", "0.13.3", :require=>false
+gem "appraisal", "~> 0.5.1"
+gem "ae_page_objects", :path=>"../../../.."
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.0.0"
+gem "turbolinks", "2.5.3"
+gem "jbuilder", "~> 1.2"
+gem "forum", :path=>"../engines"
+gem "capybara", "~> 2.5.0"
+

test/test_apps/4.2/gemfiles/capybara_2.6_ruby2.2.5.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "sqlite3", "1.3.11"
+gem "sass-rails", "~> 4.0.2"
+gem "jquery-rails", "3.1.4"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "mocha", "0.13.3", :require=>false
+gem "appraisal", "~> 0.5.1"
+gem "ae_page_objects", :path=>"../../../.."
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.0.0"
+gem "turbolinks", "2.5.3"
+gem "jbuilder", "~> 1.2"
+gem "forum", :path=>"../engines"
+gem "capybara", "~> 2.6.0"
+

test/test_apps/4.2/gemfiles/capybara_2.7_ruby2.2.5.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "sqlite3", "1.3.11"
+gem "sass-rails", "~> 4.0.2"
+gem "jquery-rails", "3.1.4"
+gem "selenium-webdriver", "~> 2.53.0"
+gem "mocha", "0.13.3", :require=>false
+gem "appraisal", "~> 0.5.1"
+gem "ae_page_objects", :path=>"../../../.."
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.0.0"
+gem "turbolinks", "2.5.3"
+gem "jbuilder", "~> 1.2"
+gem "forum", :path=>"../engines"
+gem "capybara", "~> 2.7.0"
+

test/test_apps/shared/test/selenium/page_object_integration_test.rb

@@ -351,7 +351,8 @@ def test_document_tracking__multiple_windows
 
     window1_authors_robert_row.show_in_new_window
 
-    Capybara.current_session.driver.within_window(author_path(authors(:robert)))
+    switch_to_window_with_url(author_path(authors(:robert)))
+
     window2_author_robert = PageObjects::Authors::ShowPage.new
 
     window2 = window2_author_robert.window
@@ -388,7 +389,7 @@ def test_document_tracking__multiple_windows
     window1_authors_robert_row = window1_authors.authors.first
     window1_authors_robert_row.show_in_new_window
 
-    Capybara.current_session.driver.within_window(author_path(authors(:robert)))
+    switch_to_window_with_url(author_path(authors(:robert)))
     window3_author_robert = PageObjects::Authors::ShowPage.new
     window3 = window3_author_robert.window
 
@@ -642,4 +643,14 @@ def assert_windows(*windows)
       assert_equal options[:current], AePageObjects.browser.windows.current_window
     end
   end
+
+  def switch_to_window_with_url(path)
+    if Gem::Requirement.new("< 2.3.0").satisfied_by?(Gem::Version.new(Capybara::VERSION))
+      Capybara.current_session.driver.within_window(path)
+    else
+      Capybara.current_session.switch_to_window do
+        Capybara.current_session.current_url =~ /#{path}$/
+      end
+    end
+  end
 end