Merge branch 'master' of git://github.com/rails/rails

2 files changed, 7 insertions, 4 deletions

diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index fadcc4c025..35ea2729d3 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -47,7 +47,7 @@ module ApplicationTests
     test "if there's no config.active_support.bare, all of ActiveSupport is required" do
       use_frameworks []
       require "#{app_path}/config/environment"
-      assert_nothing_raised { [1,2,3].random_element }
+      assert_nothing_raised { [1,2,3].sample }
     end
 
     test "config.active_support.bare does not require all of ActiveSupport" do
@@ -57,7 +57,7 @@ module ApplicationTests
 
       Dir.chdir("#{app_path}/app") do
         require "#{app_path}/config/environment"
-        assert_raises(NoMethodError) { [1,2,3].random_element }
+        assert_raises(NoMethodError) { [1,2,3].sample }
       end
     end
 
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index d8bdb344f2..4a5a9b2932 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -1,4 +1,6 @@
 require 'abstract_unit'
+require 'rails/generators'
+require 'rails/generators/test_case'
 
 module Rails
   def self.root
@@ -8,8 +10,9 @@ end
 Rails.application.config.root = Rails.root
 Rails.application.config.generators.templates = [File.join(Rails.root, "lib", "templates")]
 
-require 'rails/generators'
-require 'rails/generators/test_case'
+# Call configure to load the settings from
+# Rails.application.config.generators to Rails::Generators
+Rails::Generators.configure!
 
 require 'active_record'
 require 'action_dispatch'