aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/initializer
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/initializer')
-rw-r--r--railties/test/initializer/check_ruby_version_test.rb4
-rw-r--r--railties/test/initializer/path_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/initializer/check_ruby_version_test.rb b/railties/test/initializer/check_ruby_version_test.rb
index a2c07ece75..311f19a28a 100644
--- a/railties/test/initializer/check_ruby_version_test.rb
+++ b/railties/test/initializer/check_ruby_version_test.rb
@@ -19,14 +19,14 @@ module InitializerTests
def assert_rails_boots
assert_nothing_raised "It appears that rails does not boot" do
- require "rails"
+ require "rails/all"
end
end
def assert_rails_does_not_boot
$stderr = File.open("/dev/null", "w")
assert_raises(SystemExit) do
- require "rails"
+ require "rails/all"
end
end
end
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
index 73d1b1a125..26663d0f47 100644
--- a/railties/test/initializer/path_test.rb
+++ b/railties/test/initializer/path_test.rb
@@ -14,7 +14,7 @@ module InitializerTests
end
RUBY
use_frameworks [:action_controller, :action_view, :action_mailer, :active_record]
- require "rails"
+ require "rails/all"
require "#{app_path}/config/environment"
@paths = Rails.application.config.paths
end