Hide the deprecated methods from the docs

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1190 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 31 insertions, 31 deletions

diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index ff6d88fcb2..38d551bca2 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -59,8 +59,8 @@ module Test #:nodoc:
         end
       end
 
-      # Asserts that the request was rendered with the appropriate template file
-      def assert_template(expected=nil, message=nil)
+      # Asserts that the request was rendered with the appropriate template file.
+      def assert_template(expected = nil, message=nil)
         rendered = expected ? @response.rendered_file(!expected.include?('/')) : @response.rendered_file
         msg = build_message(message, "expecting <?> but rendering with <?>", expected, rendered)
         assert_block(msg) do
@@ -72,10 +72,6 @@ module Test #:nodoc:
         end
       end
 
-      alias_method :assert_rendered_file, :assert_template #:nodoc:
-      
-      # -- routing assertions --------------------------------------------------
-
       # Asserts that the routing of the given path is handled correctly and that the parsed options match.
       def assert_recognizes(expected_options, path, extras={}, message=nil)
         # Load routes.rb if it hasn't been loaded.
diff --git a/actionpack/lib/action_controller/deprecated_assertions.rb b/actionpack/lib/action_controller/deprecated_assertions.rb
index 37505d571c..dd94f4cee8 100644
--- a/actionpack/lib/action_controller/deprecated_assertions.rb
+++ b/actionpack/lib/action_controller/deprecated_assertions.rb
@@ -4,41 +4,45 @@ require 'rexml/document'
 
 module Test #:nodoc:
   module Unit #:nodoc:
-    module Assertions #:nodoc:
-      def assert_success(message=nil)
+    module Assertions
+      def assert_success(message=nil) #:nodoc:
         assert_response(:success, message)
       end
 
-      def assert_redirect(message=nil)
+      def assert_redirect(message=nil) #:nodoc:
         assert_response(:redirect, message)
       end
 
+      def assert_rendered_file(expected=nil, message=nil) #:nodoc:
+        assert_template(expected, message)
+      end
+
       # ensure that the session has an object with the specified name
-      def assert_session_has(key=nil, message=nil)
+      def assert_session_has(key=nil, message=nil) #:nodoc:
         msg = build_message(message, "<?> is not in the session <?>", key, @response.session)
         assert_block(msg) { @response.has_session_object?(key) }
       end
 
       # ensure that the session has no object with the specified name
-      def assert_session_has_no(key=nil, message=nil)
+      def assert_session_has_no(key=nil, message=nil) #:nodoc:
         msg = build_message(message, "<?> is in the session <?>", key, @response.session)
         assert_block(msg) { !@response.has_session_object?(key) }
       end
 
-      def assert_session_equal(expected = nil, key = nil, message = nil)
+      def assert_session_equal(expected = nil, key = nil, message = nil) #:nodoc:
         msg = build_message(message, "<?> expected in session['?'] but was <?>", expected, key, @response.session[key])
         assert_block(msg) { expected == @response.session[key] }
       end
 
       # -- cookie assertions ---------------------------------------------------
 
-      def assert_no_cookie(key = nil, message = nil)
+      def assert_no_cookie(key = nil, message = nil) #:nodoc:
         actual = @response.cookies[key]
         msg = build_message(message, "<?> not expected in cookies['?']", actual, key)
         assert_block(msg) { actual.nil? or actual.empty? }
       end
     
-      def assert_cookie_equal(expected = nil, key = nil, message = nil)
+      def assert_cookie_equal(expected = nil, key = nil, message = nil) #:nodoc:
         actual = @response.cookies[key]
         actual = actual.first if actual
         msg = build_message(message, "<?> expected in cookies['?'] but was <?>", expected, key, actual)
@@ -48,56 +52,56 @@ module Test #:nodoc:
       # -- flash assertions ---------------------------------------------------
 
       # ensure that the flash has an object with the specified name
-      def assert_flash_has(key=nil, message=nil)
+      def assert_flash_has(key=nil, message=nil) #:nodoc:
         msg = build_message(message, "<?> is not in the flash <?>", key, @response.flash)
         assert_block(msg) { @response.has_flash_object?(key) }
       end
 
       # ensure that the flash has no object with the specified name
-      def assert_flash_has_no(key=nil, message=nil)
+      def assert_flash_has_no(key=nil, message=nil) #:nodoc:
         msg = build_message(message, "<?> is in the flash <?>", key, @response.flash)
         assert_block(msg) { !@response.has_flash_object?(key) }
       end
 
       # ensure the flash exists
-      def assert_flash_exists(message=nil)
+      def assert_flash_exists(message=nil) #:nodoc:
         msg = build_message(message, "the flash does not exist <?>", @response.session['flash'] )
         assert_block(msg) { @response.has_flash? }
       end
 
       # ensure the flash does not exist
-      def assert_flash_not_exists(message=nil)
+      def assert_flash_not_exists(message=nil) #:nodoc:
         msg = build_message(message, "the flash exists <?>", @response.flash)
         assert_block(msg) { !@response.has_flash? }
       end
     
       # ensure the flash is empty but existent
-      def assert_flash_empty(message=nil)
+      def assert_flash_empty(message=nil) #:nodoc:
         msg = build_message(message, "the flash is not empty <?>", @response.flash)
         assert_block(msg) { !@response.has_flash_with_contents? }
       end
 
       # ensure the flash is not empty
-      def assert_flash_not_empty(message=nil)
+      def assert_flash_not_empty(message=nil) #:nodoc:
         msg = build_message(message, "the flash is empty")
         assert_block(msg) { @response.has_flash_with_contents? }
       end
     
-      def assert_flash_equal(expected = nil, key = nil, message = nil)
+      def assert_flash_equal(expected = nil, key = nil, message = nil) #:nodoc:
         msg = build_message(message, "<?> expected in flash['?'] but was <?>", expected, key, @response.flash[key])
         assert_block(msg) { expected == @response.flash[key] }
       end
     
 
       # ensure our redirection url is an exact match
-      def assert_redirect_url(url=nil, message=nil)
+      def assert_redirect_url(url=nil, message=nil) #:nodoc:
         assert_redirect(message)
         msg = build_message(message, "<?> is not the redirected location <?>", url, @response.redirect_url)
         assert_block(msg) { @response.redirect_url == url }
       end
 
       # ensure our redirection url matches a pattern
-      def assert_redirect_url_match(pattern=nil, message=nil)
+      def assert_redirect_url_match(pattern=nil, message=nil) #:nodoc:
         assert_redirect(message)
         msg = build_message(message, "<?> was not found in the location: <?>", pattern, @response.redirect_url)
         assert_block(msg) { @response.redirect_url_match?(pattern) }
@@ -107,19 +111,19 @@ module Test #:nodoc:
       # -- template assertions ------------------------------------------------
 
       # ensure that a template object with the given name exists
-      def assert_template_has(key=nil, message=nil)
+      def assert_template_has(key=nil, message=nil) #:nodoc:
         msg = build_message(message, "<?> is not a template object", key )
         assert_block(msg) { @response.has_template_object?(key) }
       end
 
       # ensure that a template object with the given name does not exist
-      def assert_template_has_no(key=nil,message=nil)
+      def assert_template_has_no(key=nil,message=nil) #:nodoc:
         msg = build_message(message, "<?> is a template object <?>", key, @response.template_objects[key])
         assert_block(msg) { !@response.has_template_object?(key) }
       end
 
       # ensures that the object assigned to the template on +key+ is equal to +expected+ object.
-      def assert_template_equal(expected = nil, key = nil, message = nil)
+      def assert_template_equal(expected = nil, key = nil, message = nil) #:nodoc:
         msg = build_message(message, "<?> expected in assigns['?'] but was <?>", expected, key, @response.template.assigns[key.to_s])
         assert_block(msg) { expected == @response.template.assigns[key.to_s] }
       end
@@ -127,7 +131,7 @@ module Test #:nodoc:
 
       # Asserts that the template returns the +expected+ string or array based on the XPath +expression+.
       # This will only work if the template rendered a valid XML document.
-      def assert_template_xpath_match(expression=nil, expected=nil, message=nil)
+      def assert_template_xpath_match(expression=nil, expected=nil, message=nil) #:nodoc:
         xml, matches = REXML::Document.new(@response.body), []
         xml.elements.each(expression) { |e| matches << e.text }
         if matches.empty? then
@@ -143,21 +147,21 @@ module Test #:nodoc:
       end
 
       # Assert the template object with the given name is an Active Record descendant and is valid.
-      def assert_valid_record(key = nil, message = nil)
+      def assert_valid_record(key = nil, message = nil) #:nodoc:
         record = find_record_in_template(key)
         msg = build_message(message, "Active Record is invalid <?>)", record.errors.full_messages)
         assert_block(msg) { record.valid? }
       end
 
       # Assert the template object with the given name is an Active Record descendant and is invalid.
-      def assert_invalid_record(key = nil, message = nil)
+      def assert_invalid_record(key = nil, message = nil) #:nodoc:
         record = find_record_in_template(key)
         msg = build_message(message, "Active Record is valid)")
         assert_block(msg) { !record.valid? }
       end
 
       # Assert the template object with the given name is an Active Record descendant and the specified column(s) are valid.
-      def assert_valid_column_on_record(key = nil, columns = "", message = nil)
+      def assert_valid_column_on_record(key = nil, columns = "", message = nil) #:nodoc:
         record = find_record_in_template(key)
         record.send(:validate)
 
@@ -168,7 +172,7 @@ module Test #:nodoc:
       end
 
       # Assert the template object with the given name is an Active Record descendant and the specified column(s) are invalid.
-      def assert_invalid_column_on_record(key = nil, columns = "", message = nil)
+      def assert_invalid_column_on_record(key = nil, columns = "", message = nil) #:nodoc:
         record = find_record_in_template(key)
         record.send(:validate)