From 1f8933077d1a1235dccba2f30fe5961607b89835 Mon Sep 17 00:00:00 2001
From: Guo Xiang <tgx_world@hotmail.com>
Date: Sat, 3 May 2014 23:55:23 -0700
Subject: [PATCH] Remove tests method for test cases when controller can be
 inferred.

---
 actionpack/test/controller/force_ssl_test.rb      | 15 +--------------
 .../test/controller/mime/accept_format_test.rb    |  2 --
 .../test/controller/mime/respond_to_test.rb       |  2 --
 .../test/controller/mime/respond_with_test.rb     |  2 --
 actionpack/test/controller/send_file_test.rb      |  1 -
 5 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 3655b90e32..00d4612ac9 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -93,8 +93,6 @@ def cheeseburger
 end
 
 class ForceSSLControllerLevelTest < ActionController::TestCase
-  tests ForceSSLControllerLevel
-
   def test_banana_redirects_to_https
     get :banana
     assert_response 301
@@ -115,8 +113,6 @@ def test_cheeseburger_redirects_to_https
 end
 
 class ForceSSLCustomOptionsTest < ActionController::TestCase
-  tests ForceSSLCustomOptions
-
   def setup
     @request.env['HTTP_HOST'] = 'www.example.com:80'
   end
@@ -189,8 +185,6 @@ def test_redirect_to_custom_notice
 end
 
 class ForceSSLOnlyActionTest < ActionController::TestCase
-  tests ForceSSLOnlyAction
-
   def test_banana_not_redirects_to_https
     get :banana
     assert_response 200
@@ -204,8 +198,6 @@ def test_cheeseburger_redirects_to_https
 end
 
 class ForceSSLExceptActionTest < ActionController::TestCase
-  tests ForceSSLExceptAction
-
   def test_banana_not_redirects_to_https
     get :banana
     assert_response 200
@@ -219,8 +211,6 @@ def test_cheeseburger_redirects_to_https
 end
 
 class ForceSSLIfConditionTest < ActionController::TestCase
-  tests ForceSSLIfCondition
-
   def test_banana_not_redirects_to_https
     get :banana
     assert_response 200
@@ -234,8 +224,6 @@ def test_cheeseburger_redirects_to_https
 end
 
 class ForceSSLFlashTest < ActionController::TestCase
-  tests ForceSSLFlash
-
   def test_cheeseburger_redirects_to_https
     get :set_flash
     assert_response 302
@@ -315,7 +303,6 @@ def test_force_ssl_redirects_to_same_format
 end
 
 class RedirectToSSLTest < ActionController::TestCase
-  tests RedirectToSSL
   def test_banana_redirects_to_https_if_not_https
     get :banana
     assert_response 301
@@ -334,4 +321,4 @@ def test_banana_does_not_redirect_if_already_https
     assert_response 200
     assert_equal 'ihaz', response.body
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/controller/mime/accept_format_test.rb b/actionpack/test/controller/mime/accept_format_test.rb
index c03c7edeb8..811c507af2 100644
--- a/actionpack/test/controller/mime/accept_format_test.rb
+++ b/actionpack/test/controller/mime/accept_format_test.rb
@@ -9,8 +9,6 @@ def index
 end
 
 class StarStarMimeControllerTest < ActionController::TestCase
-  tests StarStarMimeController
-
   def test_javascript_with_format
     @request.accept = "text/javascript"
     get :index, :format => 'js'
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb
index ce6d135d92..41503e11a8 100644
--- a/actionpack/test/controller/mime/respond_to_test.rb
+++ b/actionpack/test/controller/mime/respond_to_test.rb
@@ -258,8 +258,6 @@ def set_layout
 end
 
 class RespondToControllerTest < ActionController::TestCase
-  tests RespondToController
-
   def setup
     super
     @request.host = "www.example.com"
diff --git a/actionpack/test/controller/mime/respond_with_test.rb b/actionpack/test/controller/mime/respond_with_test.rb
index a70592fa1b..416b3b81a5 100644
--- a/actionpack/test/controller/mime/respond_with_test.rb
+++ b/actionpack/test/controller/mime/respond_with_test.rb
@@ -138,8 +138,6 @@ def index
 end
 
 class RespondWithControllerTest < ActionController::TestCase
-  tests RespondWithController
-
   def setup
     super
     @request.host = "www.example.com"
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 4df2f8b98d..b0983a5252 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -30,7 +30,6 @@ class SendFileWithActionControllerLive < SendFileController
 end
 
 class SendFileTest < ActionController::TestCase
-  tests SendFileController
   include TestFileUtils
 
   Mime::Type.register "image/png", :png unless defined? Mime::PNG
-- 
GitLab