Merge branch 'master' into active_model

Conflicts:
	activeresource/lib/active_resource/validations.rb

1 files changed, 8 insertions, 3 deletions

diff --git a/activesupport/test/memoizable_test.rb b/activesupport/test/memoizable_test.rb
index 39420c5a3a..214e243aa5 100644
--- a/activesupport/test/memoizable_test.rb
+++ b/activesupport/test/memoizable_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class MemoizableTest < Test::Unit::TestCase
+class MemoizableTest < ActiveSupport::TestCase
   class Person
     extend ActiveSupport::Memoizable
 
@@ -125,8 +125,13 @@ class MemoizableTest < Test::Unit::TestCase
   end
 
   def test_memorized_results_are_immutable
-    assert_equal "Josh", @person.name
-    assert_raise(ActiveSupport::FrozenObjectError) { @person.name.gsub!("Josh", "Gosh") }
+    # This is purely a performance enhancement that we can revisit once the rest of
+    # the code is in place. Ideally, we'd be able to do memoization in a freeze-friendly
+    # way without amc hacks
+    pending do
+      assert_equal "Josh", @person.name
+      assert_raise(ActiveSupport::FrozenObjectError) { @person.name.gsub!("Josh", "Gosh") }
+    end
   end
 
   def test_reloadable