aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/filter_params_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 14:44:21 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 14:44:21 -0800
commit5012a1558dd1483df525f1fac1e649e089be886a (patch)
tree983136a50ee7bb135768038e33c9c226a3a167ed /actionpack/test/controller/filter_params_test.rb
parent1cd949006a419807d5ae3400442942b752780ca2 (diff)
parent12e43494a748e0144195be12dc19161cc3e4d39f (diff)
downloadrails-5012a1558dd1483df525f1fac1e649e089be886a.tar.gz
rails-5012a1558dd1483df525f1fac1e649e089be886a.tar.bz2
rails-5012a1558dd1483df525f1fac1e649e089be886a.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/filter_params_test.rb')
-rw-r--r--actionpack/test/controller/filter_params_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/filter_params_test.rb b/actionpack/test/controller/filter_params_test.rb
index 43bef34885..420ebeacf4 100644
--- a/actionpack/test/controller/filter_params_test.rb
+++ b/actionpack/test/controller/filter_params_test.rb
@@ -70,9 +70,9 @@ class FilterParamTest < ActionController::TestCase
FilterParamController.filter_parameter_logging(:lifo, :amount)
get :payment, :lifo => 'Pratik', :amount => '420', :step => '1'
+ ActiveSupport::Notifications.notifier.wait
filtered_params_logs = logs.detect {|l| l =~ /\AParameters/ }
-
assert filtered_params_logs.index('"amount"=>"[FILTERED]"')
assert filtered_params_logs.index('"lifo"=>"[FILTERED]"')
assert filtered_params_logs.index('"step"=>"1"')