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, 6 insertions, 0 deletions

diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index f7fd52c7d8..c3ea09d424 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -21,6 +21,12 @@ Rake::TestTask.new { |t|
   t.verbose = true
   t.warning = true
 }
+task :isolated_test do 
+  ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME'))
+  Dir['test/**/*_test.rb'].all? do |file|
+    system(ruby, '-Ilib:test', file)
+  end or raise "Failures"
+end
 
 # Create compressed packages
 dist_dirs = [ "lib", "test"]