aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/configuration_test.rb1
-rw-r--r--railties/test/application/route_inspect_test.rb4
2 files changed, 1 insertions, 4 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index f356805d6e..f37a024a0b 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -524,6 +524,7 @@ module ApplicationTests
assert_equal app.env_config['action_dispatch.parameter_filter'], app.config.filter_parameters
assert_equal app.env_config['action_dispatch.secret_token'], app.config.secret_token
assert_equal app.env_config['action_dispatch.show_exceptions'], app.config.action_dispatch.show_exceptions
+ assert_equal app.env_config['action_dispatch.logger'], Rails.logger
end
end
end
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index 130d4e52f8..2ad5ee6c4c 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -11,8 +11,6 @@ module ApplicationTests
end
def test_displaying_routes_for_engines
- ENV["ENGINES"] = "true"
-
engine = Class.new(Rails::Engine) do
def self.to_s
"Blog::Engine"
@@ -35,8 +33,6 @@ module ApplicationTests
"cart GET /cart(.:format) cart#show"
]
assert_equal expected, output
- ensure
- ENV["ENGINES"] = nil
end
def test_cart_inspect