Changeset 5202

Timestamp:

09/29/06 07:39:31 (2 years ago)

Author:

bitsweat

Message:

assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them. Closes #6240.

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them.  #6240 [japgolly]
-
-* Deprecation: @request will be removed after 1.2. Use the request method instead.  [Jeremy Kemper]

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

@@ -25 +25 @@
-    #     for example for dealing with feed item descriptions.
-    # * #assert_select_email    -- Assertions on the HTML body of an e-mail.
- 
+
-    # Also see HTML::Selector for learning how to use selectors.
-    module SelectorAssertions
@@ -80 +80 @@
-          when Array
-            selector = HTML::Selector.new(*arg)
- 
+
-            selector = arg
-          else raise ArgumentError, "Expecting a selector as the first argument"
-        end
-
-  
+
-      end
-
@@ -145 +145 @@
-      #
-      # === Examples
- 
+
-      #   # At least one form element
-      #   assert_select "form"
@@ -201 +201 @@
-          when Array
-            selector = HTML::Selector.new(*arg)
- 
+
-            selector = arg
-          else raise ArgumentError, "Expecting a selector as the first argument"
@@ -243 +243 @@
-        end
-
-  
+
-        # Equality test.
-        equals.each do |type, value|
@@ -406 +406 @@
-              Regexp.new("#{statement}\\(\"#{id}\", #{RJS_PATTERN_HTML}\\)", Regexp::MULTILINE)
-          end
-
+
-        # Duplicate the body since the next step involves destroying it.
-        matches = nil
-        @response.body.gsub(pattern) do |match|
-
-
-
-
+
-          matches ||= []
-          matches.concat HTML::Document.new(html).root.children.select { |n| n.tag? }
@@ -450 +447 @@
-      #
-      #   assert_select_feed :rss, 2.0 do
- 
+
-      #     assert_select "channel>item>description" do
-      #       # Run assertions on the encoded elements.
@@ -537 +534 @@
-          RJS_PATTERN_EVERYTHING = Regexp.new("#{RJS_STATEMENTS[:any]}\\(\"([^\"]*)\", #{RJS_PATTERN_HTML}\\)",
-                                              Regexp::MULTILINE)
+          RJS_PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
-        end
-
@@ -548 +546 @@
-            while true
-              next if body.sub!(RJS_PATTERN_EVERYTHING) do |match|
-
-
-
-
+
-                matches = HTML::Document.new(html).root.children.select { |n| n.tag? }
-                root.children.concat matches
@@ -563 +558 @@
-          end
-        end
+
+        # Unescapes a RJS string.
+        def unescape_rjs(rjs_string)
+          # RJS encodes double quotes and line breaks.
+          unescaped= rjs_string.gsub('\"', '"')
+          unescaped.gsub!('\n', "\n")
+          # RJS encodes non-ascii characters.
+          unescaped.gsub!(RJS_PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
+          unescaped
+        end
+
-    end
-  end

trunk/actionpack/test/controller/assert_select_test.rb

@@ -289 +289 @@
-  end
-
+  def test_assert_select_rjs_with_unicode
+    # Test that non-ascii characters (which are converted into \uXXXX in RJS) are decoded correctly.
+    render_rjs do |page|
+      page.replace "test", "<div id=\"1\">\343\203\201\343\202\261\343\203\203\343\203\210</div>"
+    end
+    assert_select_rjs do
+      assert_select "#1", :text => "\343\203\201\343\202\261\343\203\203\343\203\210"
+      assert_select "#1", "\343\203\201\343\202\261\343\203\203\343\203\210"
+      assert_select "#1", Regexp.new("\343\203\201..\343\203\210",0,'U')
+      assert_raises(AssertionFailedError) { assert_select "#1", Regexp.new("\343\203\201.\343\203\210",0,'U') }
+    end
+  end
-
-  def test_assert_select_rjs_with_id