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.rb3
-rw-r--r--railties/test/application/initializer_test.rb4
2 files changed, 4 insertions, 3 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index ece41f9de8..a7df1e09ab 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -75,10 +75,11 @@ module ApplicationTests
test "the application can be marked as threadsafe when there are no frameworks" do
FileUtils.rm_rf("#{app_path}/config/environments")
add_to_config <<-RUBY
- config.frameworks = []
config.threadsafe!
RUBY
+ use_frameworks []
+
assert_nothing_raised do
require "#{app_path}/config/application"
end
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 42fc416faa..e03f9ffb00 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -7,7 +7,6 @@ module ApplicationTests
def setup
build_app
boot_rails
- require "rails"
end
test "initializing an application adds the application paths to the load path" do
@@ -51,8 +50,9 @@ module ApplicationTests
assert_nothing_raised NameError do
add_to_config <<-RUBY
config.root = "#{app_path}"
- config.frameworks = []
RUBY
+
+ use_frameworks []
require "#{app_path}/config/environment"
end
end