Skip to content

Commit

Permalink
chore: Update Rails versions (#1591)
Browse files Browse the repository at this point in the history 
* chore: Update Rails versions

* fix: Remove composite foreign_key specs

This commit removes the specs for composite foreign keys. This is
because Rails never supported passing arrays to `foreign_key` modifier
and it will raise an error on Rails 7.1.2+.

Check the following commit for more information:
rails/rails@529d1f5
  • Loading branch information
@matsales28
matsales28 authored Dec 20, 2023
1 parent 5d26d0d commit 3821caa
Show file tree
Hide file tree
Showing 8 changed files with 215 additions and 247 deletions.
6 changes: 3 additions & 3 deletions Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ appraise 'rails_6_1' do
instance_eval(&shared_spring_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '6.1.7.2'
gem 'rails', '6.1.7.6'
gem 'puma', '~> 5.0'
gem 'sass-rails', '>= 6'
gem 'turbolinks', '~> 5'
Expand Down Expand Up @@ -45,7 +45,7 @@ appraise 'rails_7_0' do
instance_eval(&shared_spring_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '7.0.4.2'
gem 'rails', '7.0.8'
gem 'sprockets-rails'
gem 'puma', '~> 5.0'
gem 'importmap-rails'
Expand Down Expand Up @@ -73,7 +73,7 @@ appraise 'rails_7_1' do
instance_eval(&shared_spring_dependencies)
instance_eval(&controller_test_dependency)

gem 'rails', '7.1.0'
gem 'rails', '7.1.2'
gem 'sprockets-rails'
gem 'puma', '~> 6.0'
gem 'importmap-rails'
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_1.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ gem "yard"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
gem "rails-controller-testing", ">= 1.0.1"
gem "rails", "6.1.7.2"
gem "rails", "6.1.7.6"
gem "puma", "~> 5.0"
gem "sass-rails", ">= 6"
gem "turbolinks", "~> 5"
Expand Down
160 changes: 82 additions & 78 deletions gemfiles/rails_6_1.gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
actioncable (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
actionmailbox (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (>= 2.7.1)
actionmailer (6.1.7.2)
actionpack (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activesupport (= 6.1.7.2)
actionmailer (6.1.7.6)
actionpack (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.2)
actionview (= 6.1.7.2)
activesupport (= 6.1.7.2)
actionpack (6.1.7.6)
actionview (= 6.1.7.6)
activesupport (= 6.1.7.6)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.2)
actionpack (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
actiontext (6.1.7.6)
actionpack (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
nokogiri (>= 1.8.5)
actionview (6.1.7.2)
activesupport (= 6.1.7.2)
actionview (6.1.7.6)
activesupport (= 6.1.7.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.2)
activesupport (= 6.1.7.2)
activejob (6.1.7.6)
activesupport (= 6.1.7.6)
globalid (>= 0.3.6)
activemodel (6.1.7.2)
activesupport (= 6.1.7.2)
activerecord (6.1.7.2)
activemodel (= 6.1.7.2)
activesupport (= 6.1.7.2)
activestorage (6.1.7.2)
actionpack (= 6.1.7.2)
activejob (= 6.1.7.2)
activerecord (= 6.1.7.2)
activesupport (= 6.1.7.2)
activemodel (6.1.7.6)
activesupport (= 6.1.7.6)
activerecord (6.1.7.6)
activemodel (= 6.1.7.6)
activesupport (= 6.1.7.6)
activestorage (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activesupport (= 6.1.7.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.2)
activesupport (6.1.7.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -72,7 +72,7 @@ GEM
msgpack (~> 1.2)
builder (3.2.4)
byebug (11.1.3)
capybara (3.36.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
Expand All @@ -85,13 +85,13 @@ GEM
coderay (1.1.3)
concurrent-ruby (1.2.0)
crass (1.0.6)
date (3.3.3)
date (3.3.4)
diff-lcs (1.5.0)
erubi (1.12.0)
ffi (1.15.5)
fssm (0.2.10)
globalid (1.1.0)
activesupport (>= 5.0)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jbuilder (2.11.5)
Expand All @@ -101,9 +101,9 @@ GEM
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.19.1)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
Expand All @@ -113,10 +113,9 @@ GEM
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
msgpack (1.6.0)
net-imap (0.3.4)
net-imap (0.4.8)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -126,8 +125,9 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
parallel (1.22.1)
parser (3.2.0.0)
Expand All @@ -149,33 +149,35 @@ GEM
rack (>= 1.2.0)
rack-test (2.0.2)
rack (>= 1.3)
rails (6.1.7.2)
actioncable (= 6.1.7.2)
actionmailbox (= 6.1.7.2)
actionmailer (= 6.1.7.2)
actionpack (= 6.1.7.2)
actiontext (= 6.1.7.2)
actionview (= 6.1.7.2)
activejob (= 6.1.7.2)
activemodel (= 6.1.7.2)
activerecord (= 6.1.7.2)
activestorage (= 6.1.7.2)
activesupport (= 6.1.7.2)
rails (6.1.7.6)
actioncable (= 6.1.7.6)
actionmailbox (= 6.1.7.6)
actionmailer (= 6.1.7.6)
actionpack (= 6.1.7.6)
actiontext (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activemodel (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
bundler (>= 1.15.0)
railties (= 6.1.7.2)
railties (= 6.1.7.6)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (6.1.7.2)
actionpack (= 6.1.7.2)
activesupport (= 6.1.7.2)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -200,14 +202,14 @@ GEM
rspec-mocks (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.1)
rspec-rails (6.1.0)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.11)
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-core (~> 3.12)
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.0)
rubocop (1.43.0)
json (~> 2.3)
Expand All @@ -223,7 +225,7 @@ GEM
parser (>= 3.1.1.0)
rubocop-packaging (0.5.2)
rubocop (>= 1.33, < 2.0)
rubocop-rails (2.17.4)
rubocop-rails (2.22.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
Expand Down Expand Up @@ -255,7 +257,8 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.6.0-x86_64-linux)
sqlite3 (1.6.9-arm64-darwin)
sqlite3 (1.6.9-x86_64-linux)
thor (1.2.1)
tilt (2.0.11)
timeout (0.3.1)
Expand All @@ -266,12 +269,12 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
warnings_logger (0.1.1)
webdrivers (5.2.0)
webdrivers (5.3.1)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0)
selenium-webdriver (~> 4.0, < 4.11)
webrick (1.7.0)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
Expand All @@ -283,6 +286,7 @@ GEM
method_source (>= 0.6.7)

PLATFORMS
arm64-darwin-22
x86_64-linux

DEPENDENCIES
Expand All @@ -301,7 +305,7 @@ DEPENDENCIES
psych (~> 3.0)
puma (~> 5.0)
rack-mini-profiler (~> 2.0.0)
rails (= 6.1.7.2)
rails (= 6.1.7.6)
rails-controller-testing (>= 1.0.1)
rake (= 13.0.1)
redcarpet
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7_0.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ gem "yard"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
gem "rails-controller-testing", ">= 1.0.1"
gem "rails", "7.0.4.2"
gem "rails", "7.0.8"
gem "sprockets-rails"
gem "puma", "~> 5.0"
gem "importmap-rails"
Expand Down
Loading

0 comments on commit 3821caa

Please sign in to comment.