Remove deprecated assertions.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jan 28, 2007 · dde5274 · dde5274
1 parent b7df916
commit dde5274
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 453 deletions.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Remove deprecated assertions.  [Jeremy Kemper]
+
 * Change session restoration to allow namespaced models to be autoloaded. Closes #6348. [Nicholas Seckar]
 
 * Fix doubly appearing parameters due to string and symbol mixups. Closes #2551. [aeden]

diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
@@ -52,7 +52,6 @@ def self.included(klass)
         include ActionController::Assertions::TagAssertions
         include ActionController::Assertions::DomAssertions
         include ActionController::Assertions::ModelAssertions
-        include ActionController::Assertions::DeprecatedAssertions
       end
     end
 
@@ -71,12 +70,11 @@ def clean_backtrace(&block)
 require File.dirname(__FILE__) + '/assertions/dom_assertions'
 require File.dirname(__FILE__) + '/assertions/routing_assertions'
 require File.dirname(__FILE__) + '/assertions/model_assertions'
-require File.dirname(__FILE__) + '/assertions/deprecated_assertions'
 
 module Test #:nodoc:
   module Unit #:nodoc:
     class TestCase #:nodoc:
       include ActionController::Assertions
     end
   end
-end
+end
diff --git a/actionpack/lib/action_controller/assertions/deprecated_assertions.rb b/actionpack/lib/action_controller/assertions/deprecated_assertions.rb
diff --git a/actionpack/test/activerecord/active_record_assertions_test.rb b/actionpack/test/activerecord/active_record_assertions_test.rb