2 files changed, 121 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index bb693c6494..b9d8d39c9c 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -347,9 +347,9 @@ module ActionController
   #  assert_redirected_to page_url(:title => 'foo')
   class TestCase < ActiveSupport::TestCase
 
-    # Use AS::TestCase for the base class when describing a model
+    # Use AC::TestCase for the base class when describing a controller
     register_spec_type(self) do |desc|
-      Class === desc && desc < ActionController::Base
+      Class === desc && desc < ActionController::Metal
     end
 
     module Behavior
@@ -391,7 +391,9 @@ module ActionController
         end
 
         def determine_default_controller_class(name)
-          name.sub(/Test$/, '').safe_constantize
+          determine_constant_from_test_name(name) do |constant|
+            Class === constant && constant < ActionController::Metal
+          end
         end
 
         def prepare_controller_class(new_class)
diff --git a/actionpack/test/controller/spec_style_test.rb b/actionpack/test/controller/spec_style_test.rb
new file mode 100644
index 0000000000..96c08ac3b1
--- /dev/null
+++ b/actionpack/test/controller/spec_style_test.rb
@@ -0,0 +1,116 @@
+require "abstract_unit"
+
+class ApplicationController < ActionController::Base; end
+class ModelsController      < ApplicationController;  end
+module Admin
+  class WidgetsController < ApplicationController; end
+end
+
+# ApplicationController
+describe ApplicationController do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ApplicationController, @controller
+      end
+    end
+  end
+end
+
+describe ApplicationController, :index do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ApplicationController, @controller
+      end
+    end
+  end
+end
+
+describe ApplicationController, "unauthenticated user" do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ApplicationController, @controller
+      end
+    end
+  end
+end
+
+# ModelsController
+describe ModelsController do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ModelsController, @controller
+      end
+    end
+  end
+end
+
+describe ModelsController, :index do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ModelsController, @controller
+      end
+    end
+  end
+end
+
+describe ModelsController, "unauthenticated user" do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ModelsController, @controller
+      end
+    end
+  end
+end
+
+# Nested Admin::WidgetsControllerTest
+module Admin
+  class WidgetsControllerTest < ActionController::TestCase
+    test "exists" do
+      assert_kind_of Admin::WidgetsController, @controller
+    end
+  end
+
+  describe WidgetsController do
+    describe "index" do
+      it "respond successful" do
+        assert_kind_of Admin::WidgetsController, @controller
+      end
+    end
+  end
+
+  describe WidgetsController, "unauthenticated users" do
+    describe "index" do
+      it "respond successful" do
+        assert_kind_of Admin::WidgetsController, @controller
+      end
+    end
+  end
+end
+
+class Admin::WidgetsControllerTest < ActionController::TestCase
+  test "exists here too" do
+    assert_kind_of Admin::WidgetsController, @controller
+  end
+end
+
+describe Admin::WidgetsController do
+  describe "index" do
+    it "respond successful" do
+      assert_kind_of Admin::WidgetsController, @controller
+    end
+  end
+end
+
+describe Admin::WidgetsController, "unauthenticated users" do
+  describe "index" do
+    it "respond successful" do
+      assert_kind_of Admin::WidgetsController, @controller
+    end
+  end
+end