aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/assertions.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/assertions.rb')
-rw-r--r--actionpack/lib/action_controller/assertions.rb8
1 files changed, 2 insertions, 6 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.