Changeset 5110

Timestamp:

09/14/06 17:50:46 (2 years ago)

Author:

rick

Message:

Add chained replace/update support for assert_select_rjs [Rick Olson]

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*
+
+* Add chained replace/update support for assert_select_rjs [Rick Olson]
+
+    Given RJS like...
+
+      page['test1'].replace "<div id=\"1\">foo</div>"
+      page['test2'].replace_html "<div id=\"2\">foo</div>"
+
+    Test it with...
+
+      assert_select_rjs :chained_replace
+      assert_select_rjs :chained_replace, "test1"
+
+      assert_select_rjs :chained_replace_html
+      assert_select_rjs :chained_replace_html, "test2"
-
-* Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 [choonkeat@gmail.com]

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

@@ -344 +344 @@
-      # === Examples
-      #
-
-
+
+
+
+
+
+
+
-      #
-      #   # Inserting into the element bar, top position.
- rjs,
+_rjs
-      #
-      #   # Changing the element foo, with an image.
@@ -363 +368 @@
-      #   assert_select "ol>li", 4
-      def assert_select_rjs(*args, &block)
-
+
+
-
-        # If the first argument is a symbol, it's the type of RJS statement we're looking
@@ -369 +375 @@
-        # any RJS statement.
-        if arg.is_a?(Symbol)
-
+
+
-            arg = args.shift
-            insertion = "insert_#{arg}".to_sym
@@ -375 +382 @@
-            statement = "(#{RJS_STATEMENTS[insertion]})"
-          else
-arg}" unless RJS_STATEMENTS[arg
-arg
+rjs_type}" unless RJS_STATEMENTS[rjs_type
+rjs_type
-          end
-          arg = args.shift
@@ -392 +399 @@
-        end
-
-
+
+
+
+
+
+
+
-          
-        # Duplicate the body since the next step involves destroying it.
@@ -508 +521 @@
-        unless const_defined?(:RJS_STATEMENTS)
-          RJS_STATEMENTS = {
-
-
+
+
+
+
-          }
-          RJS_INSERTIONS = [:top, :bottom, :before, :after]

trunk/actionpack/test/controller/assert_select_test.rb

@@ -341 +341 @@
-  end
-
+  def test_assert_select_rjs_for_chained_replace
+    render_rjs do |page|
+      page['test1'].replace "<div id=\"1\">foo</div>"
+      page['test2'].replace_html "<div id=\"2\">foo</div>"
+      page.insert_html :top, "test3", "<div id=\"3\">foo</div>"
+    end
+    # Replace.
+    assert_select_rjs :chained_replace do
+      assert_select "div", 1
+      assert_select "#1"
+    end
+    assert_select_rjs :chained_replace, "test1" do
+      assert_select "div", 1
+      assert_select "#1"
+    end
+    assert_raises(AssertionFailedError) { assert_select_rjs :chained_replace, "test2" }
+    # Replace HTML.
+    assert_select_rjs :chained_replace_html do
+      assert_select "div", 1
+      assert_select "#2"
+    end
+    assert_select_rjs :chained_replace_html, "test2" do
+      assert_select "div", 1
+      assert_select "#2"
+    end
+    assert_raises(AssertionFailedError) { assert_select_rjs :replace_html, "test1" }
+  end
-
-  def test_assert_select_rjs_for_insert