diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-28 09:23:51 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-05-28 09:23:51 -0300 |
| commit | 172e452e0a0147701d08b85573fbabe22f2d9274 (patch) | |
| tree | df1d43df102bb584ac8a10891cb546862516b403 /actionpack/test/controller/log_subscriber_test.rb | |
| parent | 207f8fc7debec1e9173f797e5208527e97235af3 (diff) | |
| parent | 44781b6e9790d90b4f8b9a41d2b2c114b1a582ee (diff) | |
| download | rails-172e452e0a0147701d08b85573fbabe22f2d9274.tar.gz rails-172e452e0a0147701d08b85573fbabe22f2d9274.tar.bz2 rails-172e452e0a0147701d08b85573fbabe22f2d9274.zip | |
Merge pull request #20336 from vngrs/deprecate_nothing_option_for_render_method
Deprecate `:nothing` option for render method
Diffstat (limited to 'actionpack/test/controller/log_subscriber_test.rb')
| -rw-r--r-- | actionpack/test/controller/log_subscriber_test.rb | 4 |
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 |