aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/log_subscriber_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-19 07:51:11 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-19 07:51:11 -0700
commitbcdb68155a516ae9e80ddb9d58bf1adfbf63c9f1 (patch)
treeeeae7646be8593832d47e40100f7526cc23b04e9 /actionpack/test/controller/log_subscriber_test.rb
parent4cf4c7f4543f31d88793a4c9ead30161b7263bf2 (diff)
parent968596fa7f2cd3218f8361a1ef19b666439ce142 (diff)
downloadrails-bcdb68155a516ae9e80ddb9d58bf1adfbf63c9f1.tar.gz
rails-bcdb68155a516ae9e80ddb9d58bf1adfbf63c9f1.tar.bz2
rails-bcdb68155a516ae9e80ddb9d58bf1adfbf63c9f1.zip
Merge pull request #1151 from joshk/wrap_params_options_change
renamed the wrap_parameters :only and :except options to :include and :ex
Diffstat (limited to 'actionpack/test/controller/log_subscriber_test.rb')
-rw-r--r--actionpack/test/controller/log_subscriber_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 5d7a51e902..80c4fa2ee5 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -4,7 +4,7 @@ require "action_controller/log_subscriber"
module Another
class LogSubscribersController < ActionController::Base
- wrap_parameters :person, :only => :name, :format => :json
+ wrap_parameters :person, :include => :name, :format => :json
def show
render :nothing => true
@@ -34,11 +34,11 @@ module Another
cache_page("Super soaker", "/index.html")
render :nothing => true
end
-
+
def with_exception
raise Exception
end
-
+
end
end