2 files changed, 7 insertions, 39 deletions
diff --git a/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb b/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb
deleted file mode 100644
index 0ecd16b051..0000000000
--- a/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/module/attr_accessor_with_default'
-
-class AttrAccessorWithDefaultTest < ActiveSupport::TestCase
-  def setup
-    @target = Class.new do
-      def helper
-        'helper'
-      end
-    end
-    @instance = @target.new
-  end
-
-  def test_default_arg
-    assert_deprecated do
-      @target.attr_accessor_with_default :foo, :bar
-    end
-    assert_equal(:bar, @instance.foo)
-    @instance.foo = nil
-    assert_nil(@instance.foo)
-  end
-
-  def test_default_proc
-    assert_deprecated do
-      @target.attr_accessor_with_default(:foo) {helper.upcase}
-    end
-    assert_equal('HELPER', @instance.foo)
-    @instance.foo = nil
-    assert_nil(@instance.foo)
-  end
-
-  def test_invalid_args
-    assert_raise(ArgumentError) do
-      assert_deprecated do
-        @target.attr_accessor_with_default :foo
-      end
-    end
-  end
-end
diff --git a/activesupport/test/core_ext/module/attribute_accessor_test.rb b/activesupport/test/core_ext/module/attribute_accessor_test.rb
index 118fb070a0..29889b51e0 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_test.rb
@@ -7,6 +7,7 @@ class ModuleAttributeAccessorTest < Test::Unit::TestCase
       mattr_accessor :foo
       mattr_accessor :bar, :instance_writer => false
       mattr_reader   :shaq, :instance_reader => false
+      mattr_accessor :camp, :instance_accessor => false
     end
     @class = Class.new
     @class.instance_eval { include m }
@@ -37,4 +38,10 @@ class ModuleAttributeAccessorTest < Test::Unit::TestCase
     assert_respond_to @module, :shaq
     assert !@object.respond_to?(:shaq)
   end
+
+  def test_should_not_create_instance_accessors
+    assert_respond_to @module, :camp
+    assert !@object.respond_to?(:camp)
+    assert !@object.respond_to?(:camp=)
+  end
 end