Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/test/plugin_test_helper.rb b/railties/test/plugin_test_helper.rb
index f8c094d19f..55d1a1fa96 100644
--- a/railties/test/plugin_test_helper.rb
+++ b/railties/test/plugin_test_helper.rb
@@ -12,7 +12,7 @@ RAILS_ROOT = '.' unless defined?(RAILS_ROOT)
 class Test::Unit::TestCase
   private  
     def plugin_fixture_root_path
-      File.join(File.dirname(__FILE__), 'fixtures', 'plugins')
+      File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'plugins'))
     end
   
     def only_load_the_following_plugins!(plugins)
@@ -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