Merge remote branch 'mainstream/master'

1 files changed, 0 insertions, 51 deletions

diff --git a/actionpack/test/controller/filter_params_test.rb b/actionpack/test/controller/filter_params_test.rb
deleted file mode 100644
index 45949636c3..0000000000
--- a/actionpack/test/controller/filter_params_test.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'abstract_unit'
-
-class FilterParamController < ActionController::Base
-  def payment
-    head :ok
-  end
-end
-
-class FilterParamTest < ActionController::TestCase
-  tests FilterParamController
-
-  def test_filter_parameters_must_have_one_word
-    assert_raises RuntimeError do
-      FilterParamController.filter_parameter_logging
-    end
-  end
-
-  def test_filter_parameters
-    assert FilterParamController.respond_to?(:filter_parameter_logging)
-
-    test_hashes = [
-    [{'foo'=>'bar'},{'foo'=>'bar'},%w'food'],
-    [{'foo'=>'bar'},{'foo'=>'[FILTERED]'},%w'foo'],
-    [{'foo'=>'bar', 'bar'=>'foo'},{'foo'=>'[FILTERED]', 'bar'=>'foo'},%w'foo baz'],
-    [{'foo'=>'bar', 'baz'=>'foo'},{'foo'=>'[FILTERED]', 'baz'=>'[FILTERED]'},%w'foo baz'],
-    [{'bar'=>{'foo'=>'bar','bar'=>'foo'}},{'bar'=>{'foo'=>'[FILTERED]','bar'=>'foo'}},%w'fo'],
-    [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana'],
-    [{'baz'=>[{'foo'=>'baz'}]}, {'baz'=>[{'foo'=>'[FILTERED]'}]}, %w(foo)]]
-
-    test_hashes.each do |before_filter, after_filter, filter_words|
-      FilterParamController.filter_parameter_logging(*filter_words)
-      assert_equal after_filter, @controller.__send__(:filter_parameters, before_filter)
-
-      filter_words.push('blah')
-      FilterParamController.filter_parameter_logging(*filter_words) do |key, value|
-        value.reverse! if key =~ /bargain/
-      end
-
-      before_filter['barg'] = {'bargain'=>'gain', 'blah'=>'bar', 'bar'=>{'bargain'=>{'blah'=>'foo'}}}
-      after_filter['barg'] = {'bargain'=>'niag', 'blah'=>'[FILTERED]', 'bar'=>{'bargain'=>{'blah'=>'[FILTERED]'}}}
-
-      assert_equal after_filter, @controller.__send__(:filter_parameters, before_filter)
-    end
-  end
-
-  def test_filter_parameters_is_protected
-    FilterParamController.filter_parameter_logging(:foo)
-    assert !FilterParamController.action_methods.include?('filter_parameters')
-    assert_raise(NoMethodError) { @controller.filter_parameters([{'password' => '[FILTERED]'}]) }
-  end
-end