3 files changed, 26 insertions, 26 deletions
diff --git a/actionpack/test/controller/parameters/parameters_taint_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index 9e8444c897..f143e22d2e 100644
--- a/actionpack/test/controller/parameters/parameters_taint_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'action_controller/metal/strong_parameters'
 
-class ParametersTaintTest < ActiveSupport::TestCase
+class ParametersPermitTest < ActiveSupport::TestCase
   setup do
     @params = ActionController::Parameters.new({ person: { 
       age: "32", name: { first: "David", last: "Heinemeier Hansson" }
diff --git a/actionpack/test/controller/permitted_params_test.rb b/actionpack/test/controller/permitted_params_test.rb
new file mode 100644
index 0000000000..f46249d712
--- /dev/null
+++ b/actionpack/test/controller/permitted_params_test.rb
@@ -0,0 +1,25 @@
+require 'abstract_unit'
+
+class PeopleController < ActionController::Base
+  def create
+    render text: params[:person].permitted? ? "permitted" : "forbidden"
+  end
+
+  def create_with_permit
+    render text: params[:person].permit(:name).permitted? ? "permitted" : "forbidden"
+  end
+end
+
+class ActionControllerPermittedParamsTest < ActionController::TestCase
+  tests PeopleController
+
+  test "parameters are forbidden" do
+    post :create, { person: { name: "Mjallo!" } }
+    assert_equal "forbidden", response.body
+  end
+
+  test "parameters can be permitted and are then not forbidden" do
+    post :create_with_permit, { person: { name: "Mjallo!" } }
+    assert_equal "permitted", response.body
+  end
+end
diff --git a/actionpack/test/controller/tainted_params_test.rb b/actionpack/test/controller/tainted_params_test.rb
deleted file mode 100644
index 881b9d40fa..0000000000
--- a/actionpack/test/controller/tainted_params_test.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'abstract_unit'
-
-class PeopleController < ActionController::Base
-  def create
-    render text: params[:person].permitted? ? "untainted" : "tainted"
-  end
-
-  def create_with_permit
-    render text: params[:person].permit(:name).permitted? ? "untainted" : "tainted"
-  end
-end
-
-class ActionControllerTaintedParamsTest < ActionController::TestCase
-  tests PeopleController
-
-  test "parameters are tainted" do
-    post :create, { person: { name: "Mjallo!" } }
-    assert_equal "tainted", response.body
-  end
-
-  test "parameters can be permitted and are then not tainted" do
-    post :create_with_permit, { person: { name: "Mjallo!" } }
-    assert_equal "untainted", response.body
-  end
-end