diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-10-10 02:10:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 02:10:20 -0300 |
| commit | 0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3 (patch) | |
| tree | 0d0363ee64c840cadf9e0e0d7e32de95633287ae /actionview/test | |
| parent | 034e4d38b508cbf2a8eaa9742df3e1948e482827 (diff) | |
| parent | de9542acd56f60d281465a59eac11e15ca8b3323 (diff) | |
| download | rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.gz rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.bz2 rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.zip | |
Merge pull request #26746 from rails/deprecations
Remove all deprecations from Action Pack
Diffstat (limited to 'actionview/test')
| -rw-r--r-- | actionview/test/template/log_subscriber_test.rb | 2 | ||||
| -rw-r--r-- | actionview/test/template/test_case_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb index ece059484c..7f358add7e 100644 --- a/actionview/test/template/log_subscriber_test.rb +++ b/actionview/test/template/log_subscriber_test.rb @@ -55,7 +55,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def test_render_text_template Rails.stub(:root, File.expand_path(FIXTURE_LOAD_PATH)) do - @view.render(text: "TEXT") + @view.render(plain: "TEXT") wait assert_equal 2, @logger.logged(:info).size diff --git a/actionview/test/template/test_case_test.rb b/actionview/test/template/test_case_test.rb index 3f51636603..41225000f0 100644 --- a/actionview/test/template/test_case_test.rb +++ b/actionview/test/template/test_case_test.rb @@ -285,7 +285,7 @@ module ActionView class AssertionsTest < ActionView::TestCase def render_from_helper form_tag("/foo") do - safe_concat render(text: "<ul><li>foo</li></ul>") + safe_concat render(plain: "<ul><li>foo</li></ul>") end end helper_method :render_from_helper |