diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-17 08:13:08 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-17 08:13:08 -0700 |
| commit | a2194990fa68ca1d1102da4fcd46e29bff34b1ae (patch) | |
| tree | 1afc4746271d1b59cb09127c20abe217e34370f5 /actionpack/test | |
| parent | d9f936e61b15ae163e92ca92822b242baeec986d (diff) | |
| parent | de1060f4e02925c12004f2ae4dd3f28cdb6a8e04 (diff) | |
| download | rails-a2194990fa68ca1d1102da4fcd46e29bff34b1ae.tar.gz rails-a2194990fa68ca1d1102da4fcd46e29bff34b1ae.tar.bz2 rails-a2194990fa68ca1d1102da4fcd46e29bff34b1ae.zip | |
Merge pull request #7669 from guilleiguaran/rename-rb-handler
Rename .rb template handler to .ruby to avoid conflicts with mustache classes
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/fixtures/ruby_template.ruby (renamed from actionpack/test/fixtures/ruby_template.rb) | 0 | ||||
| -rw-r--r-- | actionpack/test/template/render_test.rb | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/fixtures/ruby_template.rb b/actionpack/test/fixtures/ruby_template.ruby index 5097bce47c..5097bce47c 100644 --- a/actionpack/test/fixtures/ruby_template.rb +++ b/actionpack/test/fixtures/ruby_template.ruby diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index 16a43fa0df..ddf5c6a1b3 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -97,12 +97,12 @@ module RenderTestCases assert_equal %q;Here are some characters: !@#$%^&*()-="'}{`; + "\n", @view.render(:template => "plain_text_with_characters") end - def test_render_rb_template_with_handlers + def test_render_ruby_template_with_handlers assert_equal "Hello from Ruby code", @view.render(:template => "ruby_template") end - def test_render_rb_template_inline - assert_equal '4', @view.render(:inline => "(2**2).to_s", :type => :rb) + def test_render_ruby_template_inline + assert_equal '4', @view.render(:inline => "(2**2).to_s", :type => :ruby) end def test_render_file_with_localization_on_context_level |