Merge pull request #209 from appfolio/wlTestAgainstRails6

Rails 6 support / Bump tested ruby versions / Clean up
appfolio · Apr 30, 2020 · f110dfb · f110dfb
2 parents 06a5287 + 75332d8
commit f110dfb
Show file tree

Hide file tree

Showing 203 changed files with 1,414 additions and 511 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.3
+2.7.1
diff --git a/.travis.yml b/.travis.yml
@@ -12,38 +12,24 @@ before_install:
   - mkdir geckodriver
   - tar -xzf geckodriver-v0.20.1-linux64.tar.gz -C geckodriver
   - export PATH=$PATH:$PWD/geckodriver
-  - gem install bundler -v 1.16.1
 
 before_script: "bundle exec rake test:ci:install"
 
 script: "bundle exec rake test:ci"
 
 ### Build Matrix
 
-max_ruby_version: &max_ruby 2.3.3
-
 rvm:
-  - 2.2.5
-  - *max_ruby
-  - ruby-head
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 
 global:
   gemfile:
     - Gemfile
 
-# Run unit tests across all Ruby versions
+# Run all tests across all Ruby versions
 env:
   - UNITS=true
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-
-  # Integration tests
-  include:
-    - env: RAILS_VERSION=4.2
-      rvm: *max_ruby
-
-    - env: RAILS_VERSION=5.0
-      rvm: *max_ruby
-
+  - RAILS_VERSION=5.2
+  - RAILS_VERSION=6.0
diff --git a/Appraisals b/Appraisals
@@ -1,12 +1,7 @@
 case(RUBY_VERSION)
 
-when "2.2.5" then
+when '2.5.8', '2.6.6', '2.7.1' then
   appraise "capybara-3.0-ruby#{RUBY_VERSION}" do
-    gem 'capybara', '~> 3.0.2'
-  end
-when "2.3.3" then
-  appraise "capybara-3.0-ruby#{RUBY_VERSION}" do
-    gem 'capybara', '~> 3.0.2'
+    gem 'capybara', '~> 3.0'
   end
 end
-
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'gem-release', '0.7.4'
 
 gemspec
 
-gem 'rake', '~> 11.0'
+gem 'rake', '~> 13.0'
 gem 'test-unit', '~> 3.0'
 
 if RUBY_VERSION =~ /\A1\.9/

diff --git a/README.md b/README.md
@@ -170,7 +170,7 @@ gem 'ae_page_objects'
 
 ### Rails
 
-AePageObjects is built to work with Rails (versions 3.X-5.0) out of the box. To use with Rails,
+AePageObjects is built to work with Rails out of the box. To use with Rails,
 add this line to your test helper:
 
 ```ruby

diff --git a/development.md b/development.md
@@ -49,11 +49,10 @@ in the gemspec.
 
 ### Supported Ruby versions
 
-AePageObjects supports the same minimum Ruby version as Capybara, which is currently 1.9.3. The minimum Ruby version
+AePageObjects supports the same minimum Ruby version as Capybara. The minimum Ruby version
 is specified in the gemspec.
 
-The test suite tests against the minimum version and a designated maximum version, specified in `.travis.yml`. The test
-suite also runs against `ruby-head`, though failures are ignored.
+The test suite tests against the minimum version and a designated maximum version, specified in `.travis.yml`.
 
 ### Supported Rails versions
 
@@ -117,11 +116,11 @@ that the stub/mock setup within the tests works across Capybara versions.
 Integration tests using page objects written via AePageObjects run against all versions of Capybara as well. These tests run using a Rails
 application, using the most recent version of Rails possible that supports the Ruby version that the version of Capybara under test supports.
 
-Today, all Capybara integration tests are run in the Rails 4.2 application using Ruby 2.2.5. To run these tests:
+To run these tests:
 
 ```
-RAILS_VERSION=4.2 rake test:integration:selenium:install
-RAILS_VERSION=4.2 rake test:integration:selenium
+RAILS_VERSION=6.0 rake test:integration:selenium:install
+RAILS_VERSION=6.0 rake test:integration:selenium
 ```
 
 
@@ -143,8 +142,8 @@ These tests use the most recent Ruby and Capybara versions possible for the vers
 To run the integration tests against a specific version of Rails: 
 
 ```
-RAILS_VERSION=4.0 rake test:integration:selenium:install
-RAILS_VERSION=4.0 rake test:integration:selenium
+RAILS_VERSION=6.0 rake test:integration:selenium:install
+RAILS_VERSION=6.0 rake test:integration:selenium
 ```
 
 ## CI

diff --git a/gemfiles/capybara_3.0_ruby2.2.5.gemfile → gemfiles/capybara_3.0_ruby2.5.8.gemfile b/gemfiles/capybara_3.0_ruby2.2.5.gemfile → gemfiles/capybara_3.0_ruby2.5.8.gemfile
@@ -6,8 +6,8 @@ gem "appraisal", "~> 2.0"
 gem "mocha", "= 0.13.3"
 gem "selenium-webdriver", "~> 3.11.0"
 gem "gem-release", "0.7.4"
-gem "rake", "~> 11.0"
+gem "rake", "~> 13.0"
 gem "test-unit", "~> 3.0"
-gem "capybara", "~> 3.0.2"
+gem "capybara", "~> 3.0"
 
 gemspec path: "../"
diff --git a/gemfiles/capybara_3.0_ruby2.3.3.gemfile → gemfiles/capybara_3.0_ruby2.6.6.gemfile b/gemfiles/capybara_3.0_ruby2.3.3.gemfile → gemfiles/capybara_3.0_ruby2.6.6.gemfile
@@ -6,8 +6,8 @@ gem "appraisal", "~> 2.0"
 gem "mocha", "= 0.13.3"
 gem "selenium-webdriver", "~> 3.11.0"
 gem "gem-release", "0.7.4"
-gem "rake", "~> 11.0"
+gem "rake", "~> 13.0"
 gem "test-unit", "~> 3.0"
-gem "capybara", "~> 3.0.2"
+gem "capybara", "~> 3.0"
 
 gemspec path: "../"
diff --git a/gemfiles/capybara_3.0_ruby2.7.1.gemfile b/gemfiles/capybara_3.0_ruby2.7.1.gemfile
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.0"
+gem "mocha", "= 0.13.3"
+gem "selenium-webdriver", "~> 3.11.0"
+gem "gem-release", "0.7.4"
+gem "rake", "~> 13.0"
+gem "test-unit", "~> 3.0"
+gem "capybara", "~> 3.0"
+
+gemspec path: "../"
diff --git a/lib/ae_page_objects/rails/application_router.rb b/lib/ae_page_objects/rails/application_router.rb
@@ -133,12 +133,12 @@ def generate_path(named_route, *args)
     private
 
     def recognizer
-      @recognizer ||= case ::Rails.version
-        when /\A3\.[01]/
+      @recognizer ||= case ::Rails.gem_version
+        when Gem::Requirement.new('>= 3.0', '< 3.2')
           Recognizer::Rails3.new
-        when /\A3\.2/
+        when Gem::Requirement.new('~> 3.2')
           Recognizer::Rails32.new
-        when /\A(4\.[012]|5\.0)/
+        when Gem::Requirement.new('>= 4.0', '< 7.0')
           Recognizer::Rails4Plus.new
         else
           warn "[WARNING]: AePageObjects is not tested against Rails #{::Rails.version} and may behave in an undefined manner."

diff --git a/test/test_apps/4.2/Appraisals b/test/test_apps/4.2/Appraisals
diff --git a/test/test_apps/4.2/Gemfile b/test/test_apps/4.2/Gemfile
diff --git a/test/test_apps/4.2/app/assets/javascripts/books.js b/test/test_apps/4.2/app/assets/javascripts/books.js
diff --git a/test/test_apps/4.2/app/assets/stylesheets/application.css b/test/test_apps/4.2/app/assets/stylesheets/application.css
diff --git a/test/test_apps/4.2/app/assets/stylesheets/authors.css.scss b/test/test_apps/4.2/app/assets/stylesheets/authors.css.scss
diff --git a/test/test_apps/4.2/app/assets/stylesheets/books.css.scss b/test/test_apps/4.2/app/assets/stylesheets/books.css.scss
diff --git a/test/test_apps/4.2/app/assets/stylesheets/scaffolds.css.scss b/test/test_apps/4.2/app/assets/stylesheets/scaffolds.css.scss
diff --git a/test/test_apps/4.2/app/controllers b/test/test_apps/4.2/app/controllers
diff --git a/test/test_apps/4.2/app/helpers/authors_helper.rb b/test/test_apps/4.2/app/helpers/authors_helper.rb
diff --git a/test/test_apps/4.2/app/helpers/books_helper.rb b/test/test_apps/4.2/app/helpers/books_helper.rb
diff --git a/test/test_apps/4.2/app/views b/test/test_apps/4.2/app/views
diff --git a/test/test_apps/4.2/bin/rails b/test/test_apps/4.2/bin/rails
diff --git a/test/test_apps/4.2/config/application.rb b/test/test_apps/4.2/config/application.rb
diff --git a/test/test_apps/4.2/config/boot.rb b/test/test_apps/4.2/config/boot.rb
diff --git a/test/test_apps/4.2/config/database.yml b/test/test_apps/4.2/config/database.yml
diff --git a/test/test_apps/4.2/config/environment.rb b/test/test_apps/4.2/config/environment.rb