diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-19 23:29:39 +0200 |
| commit | 7f07cc364a7ee7ceae21b29b54467fde0db93389 (patch) | |
| tree | 7c9dd8aaeda68731756ee108a8318239b04c80f0 /railties/test/application/initializers/frameworks_test.rb | |
| parent | b9fcd8d71f94702463b97545bb70ce4727c5b47e (diff) | |
| parent | 61001e766de974a8864c0bc2cf915888d277a0ea (diff) | |
| download | rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.gz rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.tar.bz2 rails-7f07cc364a7ee7ceae21b29b54467fde0db93389.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/test/application/initializers/frameworks_test.rb')
| -rw-r--r-- | railties/test/application/initializers/frameworks_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index 8e57022e5b..fadcc4c025 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].rand } + assert_nothing_raised { [1,2,3].random_element } 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].rand } + assert_raises(NoMethodError) { [1,2,3].random_element } end end |