aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-26 18:37:48 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-26 18:40:23 -0300
commit297bff7f8f01fbda2a6bacaed4afb3d060292b9f (patch)
tree06eeda209052a224a91f1dffc05b9e5d71999dc1 /railties
parentbc90ea63e9937d2eee3da7dce022bf4bed10e49a (diff)
downloadrails-297bff7f8f01fbda2a6bacaed4afb3d060292b9f.tar.gz
rails-297bff7f8f01fbda2a6bacaed4afb3d060292b9f.tar.bz2
rails-297bff7f8f01fbda2a6bacaed4afb3d060292b9f.zip
Make sure Active Support configurations are applied correctly
Before this patch configuration set using config.active_support would not be set. Closes #15364
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/configuration_test.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index eb16713455..626dd64ea6 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -454,6 +454,18 @@ module ApplicationTests
assert ActionView::Resolver.caching?
end
+ test "configure Active Support using config.active_support" do
+ add_to_config <<-RUBY
+ config.active_support.escape_html_entities_in_json = true
+ RUBY
+
+ require 'active_support/json'
+ require "#{app_path}/config/environment"
+
+ assert ActiveSupport.escape_html_entities_in_json
+ assert ActiveSupport::JSON::Encoding.escape_html_entities_in_json
+ end
+
test "config.action_dispatch.show_exceptions is sent in env" do
make_basic_app do |app|
app.config.action_dispatch.show_exceptions = true