From 6694bd46f59eb9b9b23afbd0d9484fd87e8fe350 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Mon, 11 May 2009 12:45:26 -0700 Subject: Aliased AbstractController::ActionNotFound to ActionController::UnknownAction --- actionpack/test/abstract_unit2.rb | 3 --- actionpack/test/controller/render_test.rb | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/abstract_unit2.rb b/actionpack/test/abstract_unit2.rb index b95bfa0202..680043fab0 100644 --- a/actionpack/test/abstract_unit2.rb +++ b/actionpack/test/abstract_unit2.rb @@ -57,9 +57,6 @@ module ActionController class UnknownController < ActionControllerError #:nodoc: end - class UnknownAction < ActionControllerError #:nodoc: - end - class MissingFile < ActionControllerError #:nodoc: end diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 635b0f5342..414b84c029 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -1680,11 +1680,12 @@ class EtagRenderTest < ActionController::TestCase @request.if_none_match = expected_etag get :render_hello_world_from_variable - assert_equal "304 Not Modified", @response.status + assert_equal 304, @response.status.to_i + @response = ActionController::TestResponse.new @request.if_none_match = "\"diftag\"" get :render_hello_world_from_variable - assert_equal "200 OK", @response.status + assert_equal 200, @response.status.to_i end def render_with_404_shouldnt_have_etag -- cgit v1.2.3