diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-17 12:53:15 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-17 12:53:15 -0700 |
| commit | 8f15565de879bd40c8390884d1d31e52de240323 (patch) | |
| tree | c6c30c4a07a5d11f46d50853613b909ee0e8c6ae /actionview | |
| parent | 9f6e82ee4783e491c20f5244a613fdeb4024beb5 (diff) | |
| parent | e158ee50e64e2ae2460cd26be53039922f588300 (diff) | |
| download | rails-8f15565de879bd40c8390884d1d31e52de240323.tar.gz rails-8f15565de879bd40c8390884d1d31e52de240323.tar.bz2 rails-8f15565de879bd40c8390884d1d31e52de240323.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/test/activerecord/controller_runtime_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionview/test/activerecord/controller_runtime_test.rb b/actionview/test/activerecord/controller_runtime_test.rb index 368bec1c70..b5bfcf12a3 100644 --- a/actionview/test/activerecord/controller_runtime_test.rb +++ b/actionview/test/activerecord/controller_runtime_test.rb @@ -8,8 +8,6 @@ ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime class ControllerRuntimeLogSubscriberTest < ActionController::TestCase class LogSubscriberController < ActionController::Base - respond_to :html - def show render :inline => "<%= Project.all %>" end @@ -21,7 +19,7 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase def create ActiveRecord::LogSubscriber.runtime += 100 project = Project.last - respond_with(project, location: url_for(action: :show)) + redirect_to "/" end def redirect |