Changeset 6861

Timestamp:

05/26/07 17:29:23 (2 years ago)

Author:

marcel

Message:

Add support for assert_select_rjs with :show and :hide. #7780 [dchelimsky]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add support for assert_select_rjs with :show and :hide. #7780 [dchelimsky]
-
-* Make assert_select's failure messages clearer about what failed. #7779 [dchelimsky]

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

@@ -326 +326 @@
-      #
-      # Use the first argument to narrow down assertions to only statements
-remove+ and
-
+show+,
+hide+, +:toggle+, +:remove+ and +:
-      #
-      # Use the argument +:insert+ followed by an insertion position to narrow
@@ -415 +415 @@
-            when :chained_replace, :chained_replace_html
-              Regexp.new("\\$\\(\"#{id}\"\\)#{statement}\\(#{RJS_PATTERN_HTML}\\)", Regexp::MULTILINE)
-
+, :show, :hide, :toggle
-              Regexp.new("#{statement}\\(\"#{id}\"\\)")
-            else
@@ -424 +424 @@
-        matches = nil
-        case rjs_type
-
+, :show, :hide, :toggle
-            matches = @response.body.match(pattern)
-          else
@@ -435 +435 @@
-        end
-        if matches
-rjs_type != :remove
+!([:remove, :show, :hide, :toggle].include? rjs_type)
-            begin
-              in_scope, @selected = @selected, matches
@@ -542 +542 @@
-            :chained_replace_html => /\.update/,
-            :remove               => /Element\.remove/,
+            :show                 => /Element\.show/,
+            :hide                 => /Element\.hide/,
+            :toggle                 => /Element\.toggle/
-          }
-          RJS_INSERTIONS = [:top, :bottom, :before, :after]

trunk/actionpack/test/controller/assert_select_test.rb

@@ -453 +453 @@
-  end
-
+  # Simple show
+  def test_assert_select_rjs_for_show
+    render_rjs do |page|
+      page.show "test1"
+    end
+
+    assert_select_rjs :show, "test1"
+  end
+
+  def test_assert_select_rjs_for_show_ignores_block
+    render_rjs do |page|
+      page.show "test1"
+    end
+
+    assert_nothing_raised do
+      assert_select_rjs :show, "test1" do
+        assert_select "p"
+      end
+    end
+  end
+  
+  # Simple hide
+  def test_assert_select_rjs_for_hide
+    render_rjs do |page|
+      page.hide "test1"
+    end
+
+    assert_select_rjs :hide, "test1"
+  end
+
+  def test_assert_select_rjs_for_hide_ignores_block
+    render_rjs do |page|
+      page.hide "test1"
+    end
+
+    assert_nothing_raised do
+      assert_select_rjs :hide, "test1" do
+        assert_select "p"
+      end
+    end
+  end
+  
+  # Simple toggle
+  def test_assert_select_rjs_for_toggle
+    render_rjs do |page|
+      page.toggle "test1"
+    end
+
+    assert_select_rjs :toggle, "test1"
+  end
+
+  def test_assert_select_rjs_for_toggle_ignores_block
+    render_rjs do |page|
+      page.toggle "test1"
+    end
+
+    assert_nothing_raised do
+      assert_select_rjs :toggle, "test1" do
+        assert_select "p"
+      end
+    end
+  end
+  
-  # Non-positioned insert.
-  def test_assert_select_rjs_for_nonpositioned_insert
@@ -499 +562 @@
-    end
-  end
-
-
+
-  # Simple selection from a single result.
-  def test_nested_assert_select_rjs_with_single_result