Merge commit 'mainstream/master'

3 files changed, 6 insertions, 6 deletions

diff --git a/railties/test/gem_dependency_test.rb b/railties/test/gem_dependency_test.rb
index 189ad02b76..d9cd5148a3 100644
--- a/railties/test/gem_dependency_test.rb
+++ b/railties/test/gem_dependency_test.rb
@@ -18,7 +18,7 @@ class GemDependencyTest < Test::Unit::TestCase
   def test_configuration_adds_gem_dependency
     config = Rails::Configuration.new
     config.gem "xaws-s3x", :lib => "aws/s3", :version => "0.4.0"
-    assert_equal [["install", "xaws-s3x", "--version", '"= 0.4.0"']], config.gems.collect(&:install_command)
+    assert_equal [["install", "xaws-s3x", "--version", '"= 0.4.0"']], config.gems.collect { |g| g.install_command }
   end
 
   def test_gem_creates_install_command
diff --git a/railties/test/plugin_locator_test.rb b/railties/test/plugin_locator_test.rb
index 471d9fc7c3..855ac7d82f 100644
--- a/railties/test/plugin_locator_test.rb
+++ b/railties/test/plugin_locator_test.rb
@@ -42,15 +42,15 @@ class PluginFileSystemLocatorTest < Test::Unit::TestCase
   end
 
   def test_should_return_all_plugins_found_under_the_set_plugin_paths
-    assert_equal ["a", "acts_as_chunky_bacon", "engine", "gemlike", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map(&:name).sort
+    assert_equal ["a", "acts_as_chunky_bacon", "engine", "gemlike", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map { |p| p.name }.sort
   end
 
   def test_should_find_plugins_only_under_the_plugin_paths_set_in_configuration
     @configuration.plugin_paths = [File.join(plugin_fixture_root_path, "default")]
-    assert_equal ["acts_as_chunky_bacon", "gemlike", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map(&:name).sort
+    assert_equal ["acts_as_chunky_bacon", "gemlike", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map { |p| p.name }.sort
   
     @configuration.plugin_paths = [File.join(plugin_fixture_root_path, "alternate")]
-    assert_equal ["a"], @locator.plugins.map(&:name)
+    assert_equal ["a"], @locator.plugins.map { |p| p.name }
   end
 
   def test_should_not_raise_any_error_and_return_no_plugins_if_the_plugin_path_value_does_not_exist
diff --git a/railties/test/plugin_test_helper.rb b/railties/test/plugin_test_helper.rb
index f8c094d19f..93d50dc07f 100644
--- a/railties/test/plugin_test_helper.rb
+++ b/railties/test/plugin_test_helper.rb
@@ -24,6 +24,6 @@ class Test::Unit::TestCase
     end
     
     def assert_plugins(list_of_names, array_of_plugins, message=nil)
-      assert_equal list_of_names.map(&:to_s), array_of_plugins.map(&:name), message
+      assert_equal list_of_names.map { |n| n.to_s }, array_of_plugins.map { |p| p.name }, message
     end    
-end
\ No newline at end of file
+end