Merge pull request #2785 from franzliedke/patch-1

pirj · JonRowe · commit e332def2132d · 2024-09-02T11:45:37.000+01:00
rails_helper template: Restore old order of support files
diff --git a/lib/generators/rspec/install/templates/spec/rails_helper.rb b/lib/generators/rspec/install/templates/spec/rails_helper.rb
@@ -20,7 +20,7 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Rails.root.glob('spec/support/**/*.rb').sort.each { |f| require f }
+# Rails.root.glob('spec/support/**/*.rb').sort_by(&:to_s).each { |f| require f }
 
 <% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>
 # Checks for pending migrations and applies them before tests are run.

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	# directory. Alternatively, in the individual `*_spec.rb` files, manually
`21`	`21`	`# require only the support files necessary.`
`22`	`22`	`#`
`23`		`-# Rails.root.glob('spec/support/*/.rb').sort.each { \|f\| require f }`
	`23`	`+# Rails.root.glob('spec/support/*/.rb').sort_by(&:to_s).each { \|f\| require f }`
`24`	`24`
`25`	`25`	`<% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>`
`26`	`26`	`# Checks for pending migrations and applies them before tests are run.`