2 files changed, 0 insertions, 27 deletions
diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index 25eb4860e3..e9cb5ccc96 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/activemodel/test/cases/attribute_methods_test.rb
@@ -202,17 +202,6 @@ class AttributeMethodsTest < ActiveModel::TestCase
     assert_equal 'bar', m.foo_test
   end
 
-  test 'explicitly specifying an empty prefix/suffix is deprecated' do
-    klass = Class.new(ModelWithAttributes)
-
-    assert_deprecated { klass.attribute_method_suffix '' }
-    assert_deprecated { klass.attribute_method_prefix '' }
-
-    klass.define_attribute_methods(:foo)
-
-    assert_equal 'value of foo', klass.new.foo
-  end
-
   test 'should not interfere with method_missing if the attr has a private/protected method' do
     m = ModelWithAttributes2.new
     m.attributes = { 'private_method' => '<3', 'protected_method' => 'O_o' }
diff --git a/activemodel/test/cases/deprecated_mass_assignment_security_test.rb b/activemodel/test/cases/deprecated_mass_assignment_security_test.rb
deleted file mode 100644
index c1fe8822cd..0000000000
--- a/activemodel/test/cases/deprecated_mass_assignment_security_test.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'cases/helper'
-require 'models/project'
-
-class DeprecatedMassAssignmentSecurityTest < ActiveModel::TestCase
-  def test_attr_accessible_raise_error
-    assert_raise RuntimeError, /protected_attributes/ do
-      Project.attr_accessible :username
-    end
-  end
-
-  def test_attr_protected_raise_error
-    assert_raise RuntimeError, /protected_attributes/ do
-      Project.attr_protected :username
-    end
-  end
-end