Skip to content

Commit 2da5439

Browse files
committed
Fix test name and test 6.1 default
1 parent c26b653 commit 2da5439

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

railties/test/application/configuration_test.rb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2312,7 +2312,7 @@ class ::DummySerializer < ActiveJob::Serializers::ObjectSerializer; end
23122312
assert_equal :lax, Rails.application.config.action_dispatch.cookies_same_site_protection
23132313
end
23142314

2315-
test "ActionView::Template.finalize_compiled_template_methods can be configured via config.action_view.finalize_compiled_template_methods" do
2315+
test "Rails.application.config.action_dispatch.cookies_same_site_protection is :lax can be overriden" do
23162316
app_file "config/environments/production.rb", <<~RUBY
23172317
Rails.application.configure do
23182318
config.action_dispatch.cookies_same_site_protection = :strict
@@ -2324,6 +2324,15 @@ class ::DummySerializer < ActiveJob::Serializers::ObjectSerializer; end
23242324
assert_equal :strict, Rails.application.config.action_dispatch.cookies_same_site_protection
23252325
end
23262326

2327+
test "Rails.application.config.action_dispatch.cookies_same_site_protection is :lax in 6.1 defaults" do
2328+
remove_from_config '.*config\.load_defaults.*\n'
2329+
add_to_config 'config.load_defaults "6.1"'
2330+
2331+
app "development"
2332+
2333+
assert_equal :lax, Rails.application.config.action_dispatch.cookies_same_site_protection
2334+
end
2335+
23272336
test "ActiveStorage.queues[:analysis] is :active_storage_analysis by default" do
23282337
app "development"
23292338

0 commit comments

Comments
 (0)