diff options
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/abstract_unit.rb | 2 | ||||
-rw-r--r-- | railties/test/application/generators_test.rb | 2 | ||||
-rw-r--r-- | railties/test/initializer/check_ruby_version_test.rb | 4 | ||||
-rw-r--r-- | railties/test/initializer/path_test.rb | 2 | ||||
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 | ||||
-rw-r--r-- | railties/test/plugins/configuration_test.rb | 2 | ||||
-rw-r--r-- | railties/test/plugins/framework_extension_test.rb | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 66ab5a08c3..2d6983076a 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -20,7 +20,7 @@ require 'active_support/core_ext/logger' require 'active_support/test_case' require 'action_controller' -require 'rails' +require 'rails/all' # TODO: Remove these hacks class TestApp < Rails::Application diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb index 7b27c780aa..0c858d6394 100644 --- a/railties/test/application/generators_test.rb +++ b/railties/test/application/generators_test.rb @@ -14,7 +14,7 @@ module ApplicationTests end def with_config - require "rails" + require "rails/all" require "rails/generators" yield app_const.config end 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 diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index ee0a812b47..dc5fddb19d 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -207,6 +207,6 @@ Module.new do `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}` File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f| f.puts "require '#{environment}'" if require_environment - f.puts "require 'rails'" + f.puts "require 'rails/all'" end end diff --git a/railties/test/plugins/configuration_test.rb b/railties/test/plugins/configuration_test.rb index 5786316d1d..9616d1b2d0 100644 --- a/railties/test/plugins/configuration_test.rb +++ b/railties/test/plugins/configuration_test.rb @@ -5,7 +5,7 @@ module PluginsTest def setup build_app boot_rails - require "rails" + require "rails/all" end test "config is available to plugins" do diff --git a/railties/test/plugins/framework_extension_test.rb b/railties/test/plugins/framework_extension_test.rb index a6c7b753f8..86e5cebfcd 100644 --- a/railties/test/plugins/framework_extension_test.rb +++ b/railties/test/plugins/framework_extension_test.rb @@ -7,7 +7,7 @@ module PluginsTest def setup build_app boot_rails - require "rails" + require "rails/all" end test "rake_tasks block is executed when MyApp.load_tasks is called" do |