Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor

Action controller refactor - remove Compatibility module

1 files changed, 10 insertions, 13 deletions

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 34b06df8d8..caf76c7e61 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'active_support/ordered_hash'
 
-class TestTest < ActionController::TestCase
+class TestCaseTest < ActionController::TestCase
   class TestController < ActionController::Base
     def no_op
       render :text => 'dummy'
@@ -124,9 +124,6 @@ XML
     end
 
     private
-      def rescue_action(e)
-        raise e
-      end
 
       def generate_url(opts)
         url_for(opts.merge(:action => "test_uri"))
@@ -174,7 +171,7 @@ XML
 
   def test_document_body_and_params_with_post
     post :test_params, :id => 1
-    assert_equal("{\"id\"=>\"1\", \"controller\"=>\"test_test/test\", \"action\"=>\"test_params\"}", @response.body)
+    assert_equal("{\"id\"=>\"1\", \"controller\"=>\"test_case_test/test\", \"action\"=>\"test_params\"}", @response.body)
   end
 
   def test_document_body_with_post
@@ -247,18 +244,18 @@ XML
 
   def test_process_with_request_uri_with_no_params
     process :test_uri
-    assert_equal "/test_test/test/test_uri", @response.body
+    assert_equal "/test_case_test/test/test_uri", @response.body
   end
 
   def test_process_with_request_uri_with_params
     process :test_uri, "GET", :id => 7
-    assert_equal "/test_test/test/test_uri/7", @response.body
+    assert_equal "/test_case_test/test/test_uri/7", @response.body
   end
 
   def test_process_with_old_api
     assert_deprecated do
       process :test_uri, :id => 7
-      assert_equal "/test_test/test/test_uri/7", @response.body
+      assert_equal "/test_case_test/test/test_uri/7", @response.body
     end
   end
 
@@ -542,7 +539,7 @@ XML
     get :test_params, :page => {:name => "Page name", :month => '4', :year => '2004', :day => '6'}
     parsed_params = eval(@response.body)
     assert_equal(
-      {'controller' => 'test_test/test', 'action' => 'test_params',
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
        'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
       parsed_params
     )
@@ -552,7 +549,7 @@ XML
     get :test_params, :page => {:name => "Page name", :month => 4, :year => 2004, :day => 6}
     parsed_params = eval(@response.body)
     assert_equal(
-      {'controller' => 'test_test/test', 'action' => 'test_params',
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
        'page' => {'name' => "Page name", 'month' => '4', 'year' => '2004', 'day' => '6'}},
       parsed_params
     )
@@ -564,7 +561,7 @@ XML
     end
     parsed_params = eval(@response.body)
     assert_equal(
-      {'controller' => 'test_test/test', 'action' => 'test_params',
+      {'controller' => 'test_case_test/test', 'action' => 'test_params',
        'frozen' => 'icy', 'frozens' => ['icy']},
       parsed_params
     )
@@ -584,7 +581,7 @@ XML
   def test_array_path_parameter_handled_properly
     with_routing do |set|
       set.draw do
-        match 'file/*path', :to => 'test_test/test#test_params'
+        match 'file/*path', :to => 'test_case_test/test#test_params'
         match ':controller/:action'
       end
 
@@ -719,7 +716,7 @@ XML
   end
 
   def test_fixture_path_is_accessed_from_self_instead_of_active_support_test_case
-    TestTest.stubs(:fixture_path).returns(FILES_DIR)
+    TestCaseTest.stubs(:fixture_path).returns(FILES_DIR)
 
     uploaded_file = fixture_file_upload('/mona_lisa.jpg', 'image/png')
     assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read