From c3c349ec3e9a3990cac4d256c308b18fd35d9606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 19 Jul 2010 22:33:51 +0200
Subject: Remove assert_valid. It was already deprecated on Rails 2.3.

---
 actionpack/lib/action_dispatch/testing/assertions.rb  |  2 --
 .../lib/action_dispatch/testing/assertions/model.rb   | 19 -------------------
 .../test/controller/action_pack_assertions_test.rb    | 15 ---------------
 3 files changed, 36 deletions(-)
 delete mode 100644 actionpack/lib/action_dispatch/testing/assertions/model.rb

diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb
index 0e4a92048f..822150b768 100644
--- a/actionpack/lib/action_dispatch/testing/assertions.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions.rb
@@ -1,7 +1,6 @@
 module ActionDispatch
   module Assertions
     autoload :DomAssertions, 'action_dispatch/testing/assertions/dom'
-    autoload :ModelAssertions, 'action_dispatch/testing/assertions/model'
     autoload :ResponseAssertions, 'action_dispatch/testing/assertions/response'
     autoload :RoutingAssertions, 'action_dispatch/testing/assertions/routing'
     autoload :SelectorAssertions, 'action_dispatch/testing/assertions/selector'
@@ -11,7 +10,6 @@ module ActionDispatch
 
     included do
       include DomAssertions
-      include ModelAssertions
       include ResponseAssertions
       include RoutingAssertions
       include SelectorAssertions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/model.rb b/actionpack/lib/action_dispatch/testing/assertions/model.rb
deleted file mode 100644
index 46714418c6..0000000000
--- a/actionpack/lib/action_dispatch/testing/assertions/model.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module ActionDispatch
-  module Assertions
-    module ModelAssertions
-      # Ensures that the passed record is valid by Active Record standards and
-      # returns any error messages if it is not.
-      #
-      # ==== Examples
-      #
-      #   # assert that a newly created record is valid
-      #   model = Model.new
-      #   assert_valid(model)
-      #
-      def assert_valid(record)
-        ::ActiveSupport::Deprecation.warn("assert_valid is deprecated. Use assert record.valid? instead", caller)
-        assert record.valid?, record.errors.full_messages.join("\n")
-      end
-    end
-  end
-end
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 765e111226..53cdd358b4 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -482,21 +482,6 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     assert_redirected_to :controller => 'admin/user'
   end
 
-  def test_assert_valid
-    get :get_valid_record
-    assert_deprecated { assert_valid assigns('record') }
-  end
-
-  def test_assert_valid_failing
-    get :get_invalid_record
-
-    begin
-      assert_deprecated { assert_valid assigns('record') }
-      assert false
-    rescue ActiveSupport::TestCase::Assertion => e
-    end
-  end
-
   def test_assert_response_uses_exception_message
     @controller = AssertResponseWithUnexpectedErrorController.new
     get :index
-- 
cgit v1.2.3