<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -402,6 +402,7 @@ module ActionController
         if rjs_type
           if rjs_type == :insert
             position  = args.shift
+            id = args.shift
             insertion = &quot;insert_#{position}&quot;.to_sym
             raise ArgumentError, &quot;Unknown RJS insertion type #{position}&quot; unless RJS_STATEMENTS[insertion]
             statement = &quot;(#{RJS_STATEMENTS[insertion]})&quot;</diff>
      <filename>actionpack/lib/action_controller/assertions/selector_assertions.rb</filename>
    </modified>
    <modified>
      <diff>@@ -248,6 +248,14 @@ class AssertSelectTest &lt; ActionController::TestCase
     end
   end
 
+  def test_assert_select_rjs_for_positioned_insert_should_fail_when_mixing_arguments
+    render_rjs do |page|
+      page.insert_html :top, &quot;test1&quot;, &quot;&lt;div id=\&quot;1\&quot;&gt;foo&lt;/div&gt;&quot;
+      page.insert_html :bottom, &quot;test2&quot;, &quot;&lt;div id=\&quot;2\&quot;&gt;foo&lt;/div&gt;&quot;
+    end
+    assert_raises(Assertion) {assert_select_rjs :insert, :top, &quot;test2&quot;}
+  end
+
   #
   # Test css_select.
   #</diff>
      <filename>actionpack/test/controller/assert_select_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d7b6e48c70076a7760e22c381e48834ecddfa6e3</id>
    </parent>
  </parents>
  <author>
    <name>Frederick Cheung</name>
    <email>frederick.cheung@gmail.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/dce0da77e7ef602f7420f43c0d1aba5a99a00bdb</url>
  <id>dce0da77e7ef602f7420f43c0d1aba5a99a00bdb</id>
  <committed-date>2008-12-26T10:25:32-08:00</committed-date>
  <authored-date>2008-12-25T03:11:00-08:00</authored-date>
  <message>Fix assert_select_rjs not checking id for inserts [#540 state:resolved]</message>
  <tree>d917bf9cd17da1575ea6ad3c97c8311ddc3ad2a6</tree>
  <committer>
    <name>Frederick Cheung</name>
    <email>frederick.cheung@gmail.com</email>
  </committer>
</commit>
