Allow strings in the controller test describe blocks

Allow controller tests using the spec DSL to match strings.
Add test coverage for the register_spec_type calls.

1 files changed, 92 insertions, 0 deletions

diff --git a/actionpack/test/controller/spec_style_test.rb b/actionpack/test/controller/spec_style_test.rb
index 96c08ac3b1..e118c584ca 100644
--- a/actionpack/test/controller/spec_style_test.rb
+++ b/actionpack/test/controller/spec_style_test.rb
@@ -37,6 +37,36 @@ describe ApplicationController, "unauthenticated user" do
   end
 end
 
+describe "ApplicationControllerTest" do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ApplicationController, @controller
+      end
+    end
+  end
+end
+
+describe "ApplicationControllerTest", :index do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ApplicationController, @controller
+      end
+    end
+  end
+end
+
+describe "ApplicationControllerTest", "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
@@ -68,6 +98,36 @@ describe ModelsController, "unauthenticated user" do
   end
 end
 
+describe "ModelsControllerTest" do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ModelsController, @controller
+      end
+    end
+  end
+end
+
+describe "ModelsControllerTest", :index do
+  describe "nested" do
+    describe "even deeper" do
+      it "exists" do
+        assert_kind_of ModelsController, @controller
+      end
+    end
+  end
+end
+
+describe "ModelsControllerTest", "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
@@ -114,3 +174,35 @@ describe Admin::WidgetsController, "unauthenticated users" do
     end
   end
 end
+
+describe "Admin::WidgetsController" do
+  describe "index" do
+    it "respond successful" do
+      assert_kind_of Admin::WidgetsController, @controller
+    end
+  end
+end
+
+describe "Admin::WidgetsControllerTest" 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
+
+describe "Admin::WidgetsControllerTest", "unauthenticated users" do
+  describe "index" do
+    it "respond successful" do
+      assert_kind_of Admin::WidgetsController, @controller
+    end
+  end
+end