mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
906aebceed
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0:2259ecf368
AR not available * This will be reimplemented with ActionORM or equivalent06182ea02e
implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically893e9eb995
Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated:199e750d46
3942cb406e
f8ea9f85d4
e3b166aab3
ae9f258e03
44423126c6
0cb020b4d6
workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change.8c5cc66a83
make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base.87e8b16246
fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
107 lines
4.5 KiB
Ruby
107 lines
4.5 KiB
Ruby
require 'abstract_unit'
|
|
|
|
class JavaScriptHelperTest < ActionView::TestCase
|
|
tests ActionView::Helpers::JavaScriptHelper
|
|
|
|
attr_accessor :formats, :output_buffer
|
|
|
|
def setup
|
|
super
|
|
@template = self
|
|
end
|
|
|
|
def test_escape_javascript
|
|
assert_equal '', escape_javascript(nil)
|
|
assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
|
|
assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) )
|
|
assert_equal %(dont <\\/close> tags), escape_javascript(%(dont </close> tags))
|
|
end
|
|
|
|
def test_link_to_function
|
|
assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
|
|
link_to_function("Greeting", "alert('Hello world!')")
|
|
end
|
|
|
|
def test_link_to_function_with_existing_onclick
|
|
assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>),
|
|
link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
|
|
end
|
|
|
|
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("header", "\\u003Ch1\\u003EGreetings\\u003C/h1\\u003E");; 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("header", "\\u003Ch1\\u003EGreetings\\u003C/h1\\u003E");; return false;">Greet me!</a>), html
|
|
end
|
|
|
|
def test_link_to_function_with_href
|
|
assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
|
|
link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
|
|
end
|
|
|
|
def test_button_to_function
|
|
assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
|
|
button_to_function("Greeting", "alert('Hello world!')")
|
|
end
|
|
|
|
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("header", "\\u003Ch1\\u003EGreetings\\u003C/h1\\u003E");;" 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("header", "\\u003Ch1\\u003EGreetings\\u003C\/h1\\u003E");;" value="Greet me!" />), html
|
|
end
|
|
|
|
def test_button_to_function_with_onclick
|
|
assert_dom_equal "<input onclick=\"alert('Goodbye World :('); alert('Hello world!');\" type=\"button\" value=\"Greeting\" />",
|
|
button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
|
|
end
|
|
|
|
def test_button_to_function_without_function
|
|
assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
|
|
button_to_function("Greeting")
|
|
end
|
|
|
|
def test_javascript_tag
|
|
self.output_buffer = 'foo'
|
|
|
|
assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
|
|
javascript_tag("alert('hello')")
|
|
|
|
assert_equal 'foo', output_buffer, 'javascript_tag without a block should not concat to output_buffer'
|
|
end
|
|
|
|
def test_javascript_tag_with_options
|
|
assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
|
|
javascript_tag("alert('hello')", :id => "the_js_tag")
|
|
end
|
|
|
|
def test_javascript_tag_with_block_in_erb
|
|
__in_erb_template = ''
|
|
javascript_tag { concat "alert('hello')" }
|
|
assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", output_buffer
|
|
end
|
|
|
|
def test_javascript_tag_with_block_and_options_in_erb
|
|
__in_erb_template = ''
|
|
javascript_tag(:id => "the_js_tag") { concat "alert('hello')" }
|
|
assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", output_buffer
|
|
end
|
|
|
|
def test_javascript_cdata_section
|
|
assert_dom_equal "\n//<![CDATA[\nalert('hello')\n//]]>\n", javascript_cdata_section("alert('hello')")
|
|
end
|
|
end
|