Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix test cases to match new json output. Closes #8371

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6894 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 32b307bc32e12626b0e6ae493cc3ab34b4c5ea37 1 parent 0345c97
risk danger olson technoweenie authored
2  actionpack/lib/action_controller/assertions/selector_assertions.rb
View
@@ -586,6 +586,8 @@ def unescape_rjs(rjs_string)
# RJS encodes double quotes and line breaks.
unescaped= rjs_string.gsub('\"', '"')
unescaped.gsub!('\n', "\n")
+ unescaped.gsub!('\076', '>')
+ unescaped.gsub!('\074', '<')
# RJS encodes non-ascii characters.
unescaped.gsub!(RJS_PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
unescaped
8 actionpack/test/template/javascript_helper_test.rb
View
@@ -36,14 +36,14 @@ def test_link_to_function_with_rjs_block
html = link_to_function( "Greet me!" ) do |page|
page.replace_html 'header', "<h1>Greetings</h1>"
end
- assert_dom_equal %(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);; return false;">Greet me!</a>), html
+ assert_dom_equal %(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;\\074h1\\076Greetings\\074/h1\\076&quot;);; return false;">Greet me!</a>), html
end
def test_link_to_function_with_rjs_block_and_options
html = link_to_function( "Greet me!", :class => "updater" ) do |page|
page.replace_html 'header', "<h1>Greetings</h1>"
end
- assert_dom_equal %(<a href="#" class="updater" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);; return false;">Greet me!</a>), html
+ assert_dom_equal %(<a href="#" class="updater" onclick="Element.update(&quot;header&quot;, &quot;\\074h1\\076Greetings\\074/h1\\076&quot;);; return false;">Greet me!</a>), html
end
def test_button_to_function
@@ -55,13 +55,13 @@ def test_button_to_function_with_rjs_block
html = button_to_function( "Greet me!" ) do |page|
page.replace_html 'header', "<h1>Greetings</h1>"
end
- assert_dom_equal %(<input type="button" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);;" value="Greet me!" />), html
+ assert_dom_equal %(<input type="button" onclick="Element.update(&quot;header&quot;, &quot;\\074h1\\076Greetings\\074/h1\\076&quot;);;" value="Greet me!" />), html
end
def test_button_to_function_with_rjs_block_and_options
html = button_to_function( "Greet me!", :class => "greeter" ) do |page|
page.replace_html 'header', "<h1>Greetings</h1>"
end
- assert_dom_equal %(<input type="button" class="greeter" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);;" value="Greet me!" />), html
+ assert_dom_equal %(<input type="button" class="greeter" onclick="Element.update(&quot;header&quot;, &quot;\\074h1\\076Greetings\\074/h1\\076&quot;);;" value="Greet me!" />), html
end
end
18 actionpack/test/template/prototype_helper_test.rb
View
@@ -232,23 +232,23 @@ def setup
end
def test_insert_html_with_string
- assert_equal 'new Insertion.Top("element", "<p>This is a test</p>");',
+ assert_equal 'new Insertion.Top("element", "\\074p\\076This is a test\\074/p\\076");',
@generator.insert_html(:top, 'element', '<p>This is a test</p>')
- assert_equal 'new Insertion.Bottom("element", "<p>This is a test</p>");',
+ assert_equal 'new Insertion.Bottom("element", "\\074p\076This is a test\\074/p\076");',
@generator.insert_html(:bottom, 'element', '<p>This is a test</p>')
- assert_equal 'new Insertion.Before("element", "<p>This is a test</p>");',
+ assert_equal 'new Insertion.Before("element", "\\074p\076This is a test\\074/p\076");',
@generator.insert_html(:before, 'element', '<p>This is a test</p>')
- assert_equal 'new Insertion.After("element", "<p>This is a test</p>");',
+ assert_equal 'new Insertion.After("element", "\\074p\076This is a test\\074/p\076");',
@generator.insert_html(:after, 'element', '<p>This is a test</p>')
end
def test_replace_html_with_string
- assert_equal 'Element.update("element", "<p>This is a test</p>");',
+ assert_equal 'Element.update("element", "\\074p\\076This is a test\\074/p\\076");',
@generator.replace_html('element', '<p>This is a test</p>')
end
def test_replace_element_with_string
- assert_equal 'Element.replace("element", "<div id=\"element\"><p>This is a test</p></div>");',
+ assert_equal 'Element.replace("element", "\\074div id=\"element\"\\076\\074p\\076This is a test\\074/p\\076\\074/div\\076");',
@generator.replace('element', '<div id="element"><p>This is a test</p></div>')
end
@@ -304,10 +304,10 @@ def test_to_s
@generator.replace_html('baz', '<p>This is a test</p>')
assert_equal <<-EOS.chomp, @generator.to_s
-new Insertion.Top("element", "<p>This is a test</p>");
-new Insertion.Bottom("element", "<p>This is a test</p>");
+new Insertion.Top("element", "\\074p\\076This is a test\\074/p\\076");
+new Insertion.Bottom("element", "\\074p\\076This is a test\\074/p\\076");
["foo", "bar"].each(Element.remove);
-Element.update("baz", "<p>This is a test</p>");
+Element.update("baz", "\\074p\\076This is a test\\074/p\\076");
EOS
end
Please sign in to comment.
Something went wrong with that request. Please try again.