aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/assertions
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2008-12-26 23:16:52 -0800
committerYehuda Katz <wycats@gmail.com>2008-12-26 23:16:52 -0800
commit5da3ba12159d2c4fc0680efcf0cad8a31f725122 (patch)
tree171025033fbebe6d9a16102647bac659a612334b /actionpack/lib/action_controller/assertions
parent9b2da52914720d87d2c6d6d94f7fab6a86a70daf (diff)
parentf4f8923cf0ef5bd31f9e98cecf4603d0c4bde296 (diff)
downloadrails-5da3ba12159d2c4fc0680efcf0cad8a31f725122.tar.gz
rails-5da3ba12159d2c4fc0680efcf0cad8a31f725122.tar.bz2
rails-5da3ba12159d2c4fc0680efcf0cad8a31f725122.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
-rw-r--r--actionpack/lib/action_controller/assertions/selector_assertions.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb
index 248ca85994..7f8fe9ab19 100644
--- a/actionpack/lib/action_controller/assertions/selector_assertions.rb
+++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb
@@ -402,6 +402,7 @@ module ActionController
if rjs_type
if rjs_type == :insert
position = args.shift
+ id = args.shift
insertion = "insert_#{position}".to_sym
raise ArgumentError, "Unknown RJS insertion type #{position}" unless RJS_STATEMENTS[insertion]
statement = "(#{RJS_STATEMENTS[insertion]})"