aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/log_subscriber_test.rb
diff options
context:
space:
mode:
authorMehmet Emin İNAÇ <mehmetemininac@gmail.com>2015-05-28 15:13:32 +0300
committerMehmet Emin İNAÇ <mehmetemininac@gmail.com>2015-05-28 15:13:32 +0300
commit44781b6e9790d90b4f8b9a41d2b2c114b1a582ee (patch)
treeaa55b3f69aee623a1088398f2bbb1f4b191f20a4 /actionpack/test/controller/log_subscriber_test.rb
parent7cc9754209c0ae00d70bdd629fa4a81a1c74cc6f (diff)
downloadrails-44781b6e9790d90b4f8b9a41d2b2c114b1a582ee.tar.gz
rails-44781b6e9790d90b4f8b9a41d2b2c114b1a582ee.tar.bz2
rails-44781b6e9790d90b4f8b9a41d2b2c114b1a582ee.zip
Deprecate `:nothing` option for render method
`head` method works similar to `render` method with `:nothing` option
Diffstat (limited to 'actionpack/test/controller/log_subscriber_test.rb')
-rw-r--r--actionpack/test/controller/log_subscriber_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 03a4ad7823..4ae1b20d43 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -19,7 +19,7 @@ module Another
end
def show
- render :nothing => true
+ head :ok
end
def redirector
@@ -170,7 +170,7 @@ class ACLogSubscriberTest < ActionController::TestCase
def test_process_action_with_view_runtime
get :show
wait
- assert_match(/\(Views: [\d.]+ms\)/, logs[1])
+ assert_match /Completed 200 OK in [\d]ms/, logs[1]
end
def test_append_info_to_payload_is_called_even_with_exception