Skip to content

Commit

Permalink
sort grape paths
Browse files Browse the repository at this point in the history
  • Loading branch information
zvkemp committed Jan 8, 2024
1 parent d70a94b commit f075ba3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gemfiles/ams-0.10.x/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions spec/integration/grape_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand All @@ -107,7 +107,7 @@ def category
"/sub_ns/test(.:format)",
"/test(.:format)",
"/inherited/inherited_ns/test(.:format)"
]
].sort
)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/integration/initialization_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit f075ba3

Please sign in to comment.