Changeset 5525

Timestamp:

11/15/06 12:45:52 (2 years ago)

Author:

bitsweat

Message:

assert_select_rjs :remove

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/assertions/selector_assertions.rb (modified) (6 diffs)
• trunk/actionpack/test/controller/assert_select_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* assert_select_rjs :remove.  [Dylan Egan]
-
-* Always clear model associations from session.  #4795 [sd@notso.net, andylien@gmail.com]

trunk/actionpack/lib/action_controller/assertions/selector_assertions.rb

@@ -318 +318 @@
-      #
-      # Use the first argument to narrow down assertions to only statements
-
+, +:remove+
-      # +:insert_html+.
-      #
@@ -324 +324 @@
-      # down the assertion to only statements that insert elements in that
-      # position. Possible values are +:top+, +:bottom+, +:before+ and +:after+.
+      #
+      # Using the +:remove+ statement, you will be able to pass a block, but it will
+      # be ignored as there is no HTML passed for this statement.
-      #
-      # === Using blocks
@@ -352 +355 @@
-      #   # Inserting into the element bar, top position.
-      #   assert_select_rjs :insert, :top, "bar"
+      #
+      #   # Remove the element bar
+      #   assert_select_rjs :remove, "bar"
-      #
-      #   # Changing the element foo, with an image.
@@ -401 +407 @@
-            when :chained_replace, :chained_replace_html
-              Regexp.new("\\$\\(\"#{id}\"\\)#{statement}\\(#{RJS_PATTERN_HTML}\\)", Regexp::MULTILINE)
+            when :remove
+              Regexp.new("#{statement}\\(\"#{id}\"\\)")
-            else
-              Regexp.new("#{statement}\\(\"#{id}\", #{RJS_PATTERN_HTML}\\)", Regexp::MULTILINE)
@@ -407 +415 @@
-        # Duplicate the body since the next step involves destroying it.
-        matches = nil
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        end
-        if matches
-
+ && rjs_type != :remove
-            begin
-              in_scope, @selected = @selected, matches
@@ -520 +533 @@
-            :chained_replace      => /\.replace/,
-            :chained_replace_html => /\.update/,
+            :remove               => /Element\.remove/,
-          }
-          RJS_INSERTIONS = [:top, :bottom, :before, :after]

trunk/actionpack/test/controller/assert_select_test.rb

@@ -407 +407 @@
-    end
-    assert_raises(AssertionFailedError) { assert_select_rjs :replace_html, "test1" }
+  end
+
+  # Simple remove
+  def test_assert_select_rjs_for_remove
+    render_rjs do |page|
+      page.remove "test1"
+    end
+
+    assert_select_rjs :remove, "test1"
+  end
+
+  def test_assert_select_rjs_for_remove_ignores_block
+    render_rjs do |page|
+      page.remove "test1"
+    end
+
+    assert_nothing_raised do
+      assert_select_rjs :remove, "test1" do
+        assert_select "p"
+      end
+    end
-  end
-