Skip to content

Commit

Permalink
Add Appraisal for Rails 6.1 (#1418)
Browse files Browse the repository at this point in the history
* Add Appraisal for Rails 6.1

* Upgrade Rails

* fix: standardize error message of association matcher

* Bump listen version to v3.5.1

* Fix the wrong number of arguments (given 2, expected 1)

* Remove deprecated method

* Update Rails to 6.1.3.2

* Remove test for ActiveModel::Errors#generate_message

* Missing ':through' option for has_many association.

* Fix the actual_foreign_key method that is returning a string instead of an array of foreign keys

* Fix Bundler::GemNotFound: Could not find gem 'puma (~> 5.0)'

* Fix Bundler::GemNotFound: Could not find gem 'rack-mini-profiler (~> 2.0)'

* Bump rspec-rails to 4.1.2

* Fix 'rails generate' not working with Rails 6.1
  • Loading branch information
vsppedro committed Jun 3, 2021
1 parent 3da0956 commit d396851
Show file tree
Hide file tree
Showing 13 changed files with 416 additions and 59 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Expand Up @@ -31,6 +31,7 @@ jobs:
- 2.7.3
- 2.6.7
appraisal:
- rails_6_1
- rails_6_0
- rails_5_2
adapter:
Expand Down
26 changes: 26 additions & 0 deletions Appraisals
Expand Up @@ -69,3 +69,29 @@ appraise 'rails_6_0' do
gem 'pg', '>= 0.18', '< 2.0'
gem 'sqlite3', '~> 1.4'
end

appraise 'rails_6_1' do
instance_eval(&shared_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '6.1.3.2'
gem 'puma', '~> 5.0'
gem 'bootsnap', '>= 1.4.2', require: false
gem 'sass-rails', '>= 6'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.7'
gem 'bcrypt', '~> 3.1.7'
gem 'capybara', '>= 2.15'
gem 'listen', '>= 3.0.5', '< 3.6'
gem 'rack-mini-profiler', '~> 2.0.0'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'selenium-webdriver'
gem 'webdrivers'

# Other dependencies
gem 'actiontext', '~> 6.1.3.2'

# Database adapters
gem 'pg', '>= 0.18', '< 2.0'
gem 'sqlite3', '~> 1.4'
end
6 changes: 3 additions & 3 deletions gemfiles/rails_5_2.gemfile.lock
Expand Up @@ -93,11 +93,11 @@ GEM
marcel (1.0.1)
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.5.1)
mini_portile2 (2.5.3)
minitest (5.14.4)
msgpack (1.4.2)
nio4r (2.5.7)
nokogiri (1.11.3)
nokogiri (1.11.6)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.20.1)
Expand Down Expand Up @@ -165,7 +165,7 @@ GEM
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-rails (4.0.2)
rspec-rails (4.1.2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_6_0.gemfile.lock
Expand Up @@ -101,11 +101,11 @@ GEM
marcel (1.0.1)
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.5.1)
mini_portile2 (2.5.3)
minitest (5.14.4)
msgpack (1.4.2)
nio4r (2.5.7)
nokogiri (1.11.3)
nokogiri (1.11.6)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
parallel (1.20.1)
Expand Down Expand Up @@ -176,7 +176,7 @@ GEM
rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-rails (4.0.2)
rspec-rails (4.1.2)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
Expand Down
40 changes: 40 additions & 0 deletions gemfiles/rails_6_1.gemfile
@@ -0,0 +1,40 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal", "2.2.0"
gem "bundler", "~> 1.1"
gem "pry"
gem "pry-byebug"
gem "rake", "13.0.1"
gem "rspec", "~> 3.9"
gem "rubocop", require: false
gem "rubocop-packaging", require: false
gem "rubocop-rails", require: false
gem "warnings_logger"
gem "zeus", require: false
gem "fssm"
gem "redcarpet"
gem "rouge"
gem "yard"
gem "spring"
gem "spring-commands-rspec"
gem "rspec-rails", "~> 4.0"
gem "shoulda-context", "~> 1.2.0"
gem "rails-controller-testing", ">= 1.0.1"
gem "rails", "6.1.3.2"
gem "puma", "~> 5.0"
gem "bootsnap", ">= 1.4.2", require: false
gem "sass-rails", ">= 6"
gem "turbolinks", "~> 5"
gem "jbuilder", "~> 2.7"
gem "bcrypt", "~> 3.1.7"
gem "capybara", ">= 2.15"
gem "listen", ">= 3.0.5", "< 3.6"
gem "rack-mini-profiler", "~> 2.0.0"
gem "spring-watcher-listen", "~> 2.0.0"
gem "selenium-webdriver"
gem "webdrivers"
gem "actiontext", "~> 6.1.3.2"
gem "pg", ">= 0.18", "< 2.0"
gem "sqlite3", "~> 1.4"

0 comments on commit d396851

Please sign in to comment.