Skip to content

Commit

Permalink
Upgrade to Rails 7.1. (#2)
Browse files Browse the repository at this point in the history 
* Fixed test failures.
* Update defaults to rails 7.1.
  • Loading branch information
@jamesiarmes
jamesiarmes authored Jun 4, 2024
1 parent 64186cf commit 7a51dd4
Show file tree
Hide file tree
Showing 20 changed files with 266 additions and 182 deletions.
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ gem 'bootsnap', '~> 1.12', require: false
gem 'chartkick'
gem 'chronic', '~> 0.10.2'
gem 'csv', '~> 3.2.0'
gem 'devise', github: 'heartcombo/devise', ref: 'f8d1ea90bc3'
gem 'devise', '~> 4.9'
gem 'friendly_id', '~> 5.4.0'
gem 'health-monitor-rails', '~> 9.3'
gem 'importmap-rails', '~> 1.1'
gem 'jbuilder', '~> 2.11'
gem 'kaminari', '~> 1.2'
gem 'mutex_m', '~> 0.2'
gem 'paper_trail', '~> 12.3'
gem 'paper_trail', '~> 15.0'
gem 'pg', '~> 1.4'
gem 'pg_search', '~> 2.3'
gem 'puma', '~> 5.6'
gem 'rack', '~> 2.0'
gem 'rails', '~> 7.0.0', '>= 7.0.2.3'
gem 'rails', '~> 7.1.0'
gem 'seed_dump', '~> 3.3'
gem 'sprockets-rails', '~> 3.4'
gem 'stimulus-rails', '~> 1.1'
gem 'tailwindcss-rails', '2.0.12'
gem 'tailwindcss-rails', '~> 2.6'
gem 'turbo-rails', '~> 1.1'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

Expand All @@ -42,7 +42,7 @@ group :development, :test do
gem 'faker', '~> 2.21'
gem 'pry', '~> 0.14'
gem 'rspec-github', '~> 2.3'
gem 'rspec-rails', '~> 5.1'
gem 'rspec-rails', '~> 6.1'
end

group :development do
Expand Down
220 changes: 116 additions & 104 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,90 @@
GIT
remote: https://github.com/heartcombo/devise.git
revision: f8d1ea90bc328012f178b8a6616a89b73f2546a4
ref: f8d1ea90bc3
specs:
devise (4.8.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)

GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.8.3)
actionpack (= 7.0.8.3)
activesupport (= 7.0.8.3)
actioncable (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.3)
actionpack (= 7.0.8.3)
activejob (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.3)
actionpack (= 7.0.8.3)
actionview (= 7.0.8.3)
activejob (= 7.0.8.3)
activesupport (= 7.0.8.3)
actionmailer (7.1.3.3)
actionpack (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activesupport (= 7.1.3.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8.3)
actionview (= 7.0.8.3)
activesupport (= 7.0.8.3)
rack (~> 2.0, >= 2.2.4)
rails-dom-testing (~> 2.2)
actionpack (7.1.3.3)
actionview (= 7.1.3.3)
activesupport (= 7.1.3.3)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8.3)
actionpack (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.3)
actionpack (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8.3)
activesupport (= 7.0.8.3)
actionview (7.1.3.3)
activesupport (= 7.1.3.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
active_storage_validations (0.9.8)
activejob (>= 5.2.0)
activemodel (>= 5.2.0)
activestorage (>= 5.2.0)
activesupport (>= 5.2.0)
activejob (7.0.8.3)
activesupport (= 7.0.8.3)
activejob (7.1.3.3)
activesupport (= 7.1.3.3)
globalid (>= 0.3.6)
activemodel (7.0.8.3)
activesupport (= 7.0.8.3)
activerecord (7.0.8.3)
activemodel (= 7.0.8.3)
activesupport (= 7.0.8.3)
activestorage (7.0.8.3)
actionpack (= 7.0.8.3)
activejob (= 7.0.8.3)
activerecord (= 7.0.8.3)
activesupport (= 7.0.8.3)
activemodel (7.1.3.3)
activesupport (= 7.1.3.3)
activerecord (7.1.3.3)
activemodel (= 7.1.3.3)
activesupport (= 7.1.3.3)
timeout (>= 0.4.0)
activestorage (7.1.3.3)
actionpack (= 7.1.3.3)
activejob (= 7.1.3.3)
activerecord (= 7.1.3.3)
activesupport (= 7.1.3.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8.3)
activesupport (7.1.3.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.937.0)
aws-partitions (1.938.0)
aws-record (2.13.0)
aws-sdk-dynamodb (~> 1, >= 1.85.0)
aws-sdk-core (3.196.1)
Expand Down Expand Up @@ -159,6 +156,7 @@ GEM
chronic (0.10.2)
coderay (1.1.3)
concurrent-ruby (1.3.1)
connection_pool (2.4.1)
crack (1.0.0)
bigdecimal
rexml
Expand All @@ -172,7 +170,14 @@ GEM
debug (1.9.2)
irb (~> 1.10)
reline (>= 0.3.8)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.5.1)
drb (2.2.1)
erubi (1.12.0)
factory_bot (6.4.6)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -259,9 +264,9 @@ GEM
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
paper_trail (12.3.0)
activerecord (>= 5.2)
request_store (~> 1.1)
paper_trail (15.1.0)
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.24.0)
parser (3.3.2.0)
ast (~> 2.4.1)
Expand All @@ -284,34 +289,38 @@ GEM
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8.3)
actioncable (= 7.0.8.3)
actionmailbox (= 7.0.8.3)
actionmailer (= 7.0.8.3)
actionpack (= 7.0.8.3)
actiontext (= 7.0.8.3)
actionview (= 7.0.8.3)
activejob (= 7.0.8.3)
activemodel (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.3.3)
actioncable (= 7.1.3.3)
actionmailbox (= 7.1.3.3)
actionmailer (= 7.1.3.3)
actionpack (= 7.1.3.3)
actiontext (= 7.1.3.3)
actionview (= 7.1.3.3)
activejob (= 7.1.3.3)
activemodel (= 7.1.3.3)
activerecord (= 7.1.3.3)
activestorage (= 7.1.3.3)
activesupport (= 7.1.3.3)
bundler (>= 1.15.0)
railties (= 7.0.8.3)
railties (= 7.1.3.3)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.8.3)
actionpack (= 7.0.8.3)
activesupport (= 7.0.8.3)
method_source
railties (7.1.3.3)
actionpack (= 7.1.3.3)
activesupport (= 7.1.3.3)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rdoc (6.7.0)
Expand All @@ -336,14 +345,14 @@ GEM
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (5.1.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-rails (6.1.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.13)
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.64.1)
json (~> 2.3)
Expand All @@ -370,7 +379,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (2.29.2)
rubocop-rspec (2.30.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
Expand All @@ -397,16 +406,18 @@ GEM
railties (>= 6.0.0)
stringio (3.1.0)
strscan (3.1.0)
tailwindcss-rails (2.0.12)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-aarch64-linux)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-x86_64-linux)
railties (>= 6.0.0)
tailwindcss-rails (2.6.0)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-aarch64-linux)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-arm-linux)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-arm64-darwin)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-x86_64-darwin)
railties (>= 7.0.0)
tailwindcss-rails (2.6.0-x86_64-linux)
railties (>= 7.0.0)
thor (1.3.1)
timeout (0.4.1)
turbo-rails (1.5.0)
Expand All @@ -433,6 +444,7 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
Expand Down Expand Up @@ -465,7 +477,7 @@ DEPENDENCIES
csv (~> 3.2.0)
database_cleaner-active_record (~> 2.0)
debug (~> 1.6)
devise!
devise (~> 4.9)
factory_bot_rails (~> 6.2)
faker (~> 2.21)
friendly_id (~> 5.4.0)
Expand All @@ -476,15 +488,15 @@ DEPENDENCIES
letter_opener (~> 1.8)
mutex_m (~> 0.2)
nokogiri (~> 1.13)
paper_trail (~> 12.3)
paper_trail (~> 15.0)
pg (~> 1.4)
pg_search (~> 2.3)
pry (~> 0.14)
puma (~> 5.6)
rack (~> 2.0)
rails (~> 7.0.0, >= 7.0.2.3)
rails (~> 7.1.0)
rspec-github (~> 2.3)
rspec-rails (~> 5.1)
rspec-rails (~> 6.1)
rubocop (~> 1.32)
rubocop-performance (~> 1.14)
rubocop-rails (~> 2.15)
Expand All @@ -493,7 +505,7 @@ DEPENDENCIES
selenium-webdriver (~> 4.3)
sprockets-rails (~> 3.4)
stimulus-rails (~> 1.1)
tailwindcss-rails (= 2.0.12)
tailwindcss-rails (~> 2.6)
turbo-rails (~> 1.1)
tzinfo-data
vcr (~> 6.1)
Expand Down
1 change: 0 additions & 1 deletion app/models/field.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class Field < ApplicationRecord
scope :classified, -> { joins(:classifications).distinct }
scope :not_classified, -> { where.missing(:classifications).distinct }
scope :mapped, -> { where("fields.common_type IS NOT NULL AND fields.common_type != ''") }
scope :with_values, -> { where(common_type: VALUE_TYPES) }
scope :without_values, -> { where.not(common_type: VALUE_TYPES) }

def classified?
Expand Down
Loading

0 comments on commit 7a51dd4

Please sign in to comment.