Skip to content

Commit

Permalink
Merge pull request #986 from thecartercenter/infrastructure/rails7
Browse files Browse the repository at this point in the history
first phase rails upgrade
  • Loading branch information
cooperka authored Apr 18, 2024
2 parents 41e05d9 + 18a5c91 commit 7983832
Show file tree
Hide file tree
Showing 27 changed files with 2,121 additions and 1,777 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,15 @@ jobs:
LINT_RESULT=$?
yarn run test
JEST_RESULT=$?
bundle exec rspec --format RSpec::Github::Formatter --format documentation
bundle exec rspec --tag ~flapping --format RSpec::Github::Formatter --format documentation
RSPEC_RESULT=$?
bundle exec rspec --tag flapping --format RSpec::Github::Formatter --format documentation
RSPEC_FLAPPING_RESULT=$?
echo
echo "Final results:"
echo "LINT_RESULT: $LINT_RESULT"
echo "JEST_RESULT: $JEST_RESULT"
echo "RSPEC_RESULT: $RSPEC_RESULT"
echo "RSPEC_FLAPPING_RESULT: $RSPEC_FLAPPING_RESULT"
# Square each result to make sure they're all positive (and don't cancel each other out).
exit `expr $LINT_RESULT '*' $LINT_RESULT + $RSPEC_RESULT '*' $RSPEC_RESULT + $JEST_RESULT '*' $JEST_RESULT`
11 changes: 5 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "http://rubygems.org"

gem "rails", "~> 6.1.7"
gem "rails", "~> 7.1.0"

# Misc
gem "attribute_normalizer", "~> 1.2"
Expand Down Expand Up @@ -107,7 +107,7 @@ gem "whenever", "~> 1.0", require: false
gem "i18n-country-translations", "~> 1.0"
gem "i18n-js", "~> 3.0"
gem "iso-639", "~> 0.3.5"
gem "rails-i18n", "~> 6.0"
gem "rails-i18n", "~> 7.0"

# Analytics
gem "scout_apm", "~> 5.0"
Expand All @@ -131,7 +131,7 @@ group :development do
gem "rails-erd", "~> 1.6"

# N+1 detection. Config is in environments/development.rb
gem "bullet", "~> 6.1"
gem "bullet", "~> 7.1"

# Great for debugging i18n paths (uncomment temporarily when needed).
# gem "i18n-debug", "~> 1.1"
Expand All @@ -145,10 +145,9 @@ end

group :development, :test do
# Test framework
gem "jasmine-rails", "~> 0.15.0" # Deprecated: Barely used.
gem "rails-controller-testing", "~> 1.0" # Deprecated: Use request or feature specs instead.
gem "rspec-collection_matchers", "~> 1.1"
gem "rspec-rails", "~> 3.9"
gem "rspec-rails", "~> 6.0"

# Mocking/stubbing/factories
gem "factory_bot_rails", "~> 4.11"
Expand Down Expand Up @@ -176,7 +175,7 @@ group :development, :test do
gem "annotate", "~> 3.1"
gem "assert_difference", "~> 1.0" # Deprecated: Barely used, convert usage to something else.
gem "awesome_print", "~> 1.6"
gem "database_cleaner", "~> 1.7"
gem "database_cleaner", "~> 2.0"
gem "db-query-matchers", "~> 0.10"
gem "rubocop", "1.22.3" # Hound supported versions: http://help.houndci.com/en/articles/2461415-supported-linters
gem "rubocop-rails", "~> 2.8"
Expand Down
Loading

0 comments on commit 7983832

Please sign in to comment.