diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-11 12:45:26 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-11 12:45:26 -0700 |
| commit | 6694bd46f59eb9b9b23afbd0d9484fd87e8fe350 (patch) | |
| tree | 1ddeef04f0a15bd0d8957646f6d4b441df13bec8 /actionpack/test | |
| parent | 94ee9d245289a36207847a684b51dbd1c7a6a4eb (diff) | |
| download | rails-6694bd46f59eb9b9b23afbd0d9484fd87e8fe350.tar.gz rails-6694bd46f59eb9b9b23afbd0d9484fd87e8fe350.tar.bz2 rails-6694bd46f59eb9b9b23afbd0d9484fd87e8fe350.zip | |
Aliased AbstractController::ActionNotFound to ActionController::UnknownAction
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/abstract_unit2.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 5 |
2 files changed, 3 insertions, 5 deletions
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 |