diff options
| author | Arthur Nogueira Neves <arthurnn@gmail.com> | 2015-02-06 21:44:47 -0500 |
|---|---|---|
| committer | Arthur Nogueira Neves <arthurnn@gmail.com> | 2015-02-06 21:44:47 -0500 |
| commit | cdd3961e2b9990745a1aaf07e9a6981cd183b820 (patch) | |
| tree | c8ea812fc30399bf77acec6705746c4c9e562718 | |
| parent | 5f5f3a8216f5c8f2c484f80eec6ee69cd28d5977 (diff) | |
| parent | 37b36a48b9956afebb030bdffdf42e0e20f92aff (diff) | |
| download | rails-cdd3961e2b9990745a1aaf07e9a6981cd183b820.tar.gz rails-cdd3961e2b9990745a1aaf07e9a6981cd183b820.tar.bz2 rails-cdd3961e2b9990745a1aaf07e9a6981cd183b820.zip | |
Merge pull request #18837 from y-yagi/fix-deprecation-warning-in-render-test
use kwargs instead of xhr method. refs #18771.
| -rw-r--r-- | actionview/test/actionpack/controller/render_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb index 0a8842b527..fe4cf3688a 100644 --- a/actionview/test/actionpack/controller/render_test.rb +++ b/actionview/test/actionpack/controller/render_test.rb @@ -968,12 +968,12 @@ class RenderTest < ActionController::TestCase end def test_should_implicitly_render_html_template_from_xhr_request - xhr :get, :render_implicit_html_template_from_xhr_request + get :render_implicit_html_template_from_xhr_request, xhr: true assert_equal "XHR!\nHello HTML!", @response.body end def test_should_implicitly_render_js_template_without_layout - xhr :get, :render_implicit_js_template_without_layout, :format => :js + get :render_implicit_js_template_without_layout, format: :js, xhr: true assert_no_match %r{<html>}, @response.body end |