diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-01 12:39:03 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-01 12:39:03 -0300 |
| commit | bdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97 (patch) | |
| tree | 8a0579453f36b82ec8c18a99cf3cb71029dbed55 /actionpack/lib/action_dispatch | |
| parent | bd83caa66680380685a3961339c81b77ab1e85ff (diff) | |
| parent | ca83436d1b3b6cedd1eca2259f65661e69b01909 (diff) | |
| download | rails-bdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97.tar.gz rails-bdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97.tar.bz2 rails-bdfc662a1195d13e3ef78cc8e79df8a8a2e3ca97.zip | |
Merge pull request #20138 from tgxworld/deprecated_assert_template
Deprecate `assert_template` and `assigns()`.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/test_process.rb | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb index ce03164ca9..a42cf72f60 100644 --- a/actionpack/lib/action_dispatch/routing.rb +++ b/actionpack/lib/action_dispatch/routing.rb @@ -232,7 +232,6 @@ module ActionDispatch # def send_to_jail # get '/jail' # assert_response :success - # assert_template "jail/front" # end # # def goes_to_login diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index dff809f6cd..dc664d5540 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -429,7 +429,6 @@ module ActionDispatch # reset the html_document variable, except for cookies/assigns calls unless method == 'cookies' || method == 'assigns' @html_document = nil - reset_template_assertion end integration_session.__send__(method, *args).tap do diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb index 630e6a9b78..415ef80cd2 100644 --- a/actionpack/lib/action_dispatch/testing/test_process.rb +++ b/actionpack/lib/action_dispatch/testing/test_process.rb @@ -5,9 +5,9 @@ require 'active_support/core_ext/hash/indifferent_access' module ActionDispatch module TestProcess def assigns(key = nil) - assigns = {}.with_indifferent_access - @controller.view_assigns.each { |k, v| assigns.regular_writer(k, v) } - key.nil? ? assigns : assigns[key] + raise NoMethodError, + "assigns has been extracted to a gem. To continue using it, + add `gem 'rails-controller-testing'` to your Gemfile." end def session |