diff --git a/gemfiles/ams-0.10.x/Gemfile b/gemfiles/ams-0.10.x/Gemfile index 7295955b..06f82d22 100644 --- a/gemfiles/ams-0.10.x/Gemfile +++ b/gemfiles/ams-0.10.x/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gemspec path: "../.." # TODO: Check if we need Rails -gem "rails", "~> 6.1.0" +gem "rails", "~> 7.1.0" gem "sqlite3" gem "active_model_serializers", "~> 0.10.12" diff --git a/spec/integration/grape_spec.rb b/spec/integration/grape_spec.rb index a0eea8cd..5ce5d50f 100644 --- a/spec/integration/grape_spec.rb +++ b/spec/integration/grape_spec.rb @@ -98,7 +98,7 @@ def category paths = MyApp.routes.map(&:path) # sanity check - expect(paths).to eq( + expect(paths.sort).to eq( [ # main app "/test(.:format)", @@ -107,7 +107,7 @@ def category "/sub_ns/test(.:format)", "/test(.:format)", "/inherited/inherited_ns/test(.:format)" - ] + ].sort ) end diff --git a/spec/integration/initialization_spec.rb b/spec/integration/initialization_spec.rb index e9b63ee1..a53c8ef5 100644 --- a/spec/integration/initialization_spec.rb +++ b/spec/integration/initialization_spec.rb @@ -77,7 +77,7 @@ def boot(debug: true) # This deprecation is not our fault output.reject! { |l| l.include?("Rack::File is deprecated") } - _, i = cache_deprecation_warning = output.to_enum.with_index.find do |l, _| + _, i = output.to_enum.with_index.find do |l, _| # In rails 7.1, This is both a default value set on ActiveSupport::Cache, and is deprecated # (requires a positive opt-in for the newer version). It's better for us not to set it # to anything other than the default, so we can just ignore this multi-line deprecation warning.