diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-26 16:08:12 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-26 16:08:12 -0300 |
| commit | bf1ac69636f6dabfd993afd4ad29416514816daf (patch) | |
| tree | 3af8755d0182a38f744a4b216540ba343d034d7d /actionview/test | |
| parent | e0a225a3d5bbab1700b6cf071b4b13d8c5d70d5c (diff) | |
| parent | 82aa20adc080ad705fc4a7643bca9e40fb6a6b9a (diff) | |
| download | rails-bf1ac69636f6dabfd993afd4ad29416514816daf.tar.gz rails-bf1ac69636f6dabfd993afd4ad29416514816daf.tar.bz2 rails-bf1ac69636f6dabfd993afd4ad29416514816daf.zip | |
Merge pull request #23915 from sikachu/pr-23710-update
Revise #23717 (Add "Rendering ..." message) using proper ActiveSupport::LogSubscriber#start
Diffstat (limited to 'actionview/test')
| -rw-r--r-- | actionview/test/template/log_subscriber_test.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb index 93a0701dcc..7683444bf0 100644 --- a/actionview/test/template/log_subscriber_test.rb +++ b/actionview/test/template/log_subscriber_test.rb @@ -35,7 +35,8 @@ class AVLogSubscriberTest < ActiveSupport::TestCase @view.render(:file => "test/hello_world") wait - assert_equal 1, @logger.logged(:info).size + assert_equal 2, @logger.logged(:info).size + assert_match(/Rendering test\/hello_world\.erb/, @logger.logged(:info).first) assert_match(/Rendered test\/hello_world\.erb/, @logger.logged(:info).last) end end @@ -45,7 +46,8 @@ class AVLogSubscriberTest < ActiveSupport::TestCase @view.render(:text => "TEXT") wait - assert_equal 1, @logger.logged(:info).size + assert_equal 2, @logger.logged(:info).size + assert_match(/Rendering text template/, @logger.logged(:info).first) assert_match(/Rendered text template/, @logger.logged(:info).last) end end @@ -55,7 +57,8 @@ class AVLogSubscriberTest < ActiveSupport::TestCase @view.render(:inline => "<%= 'TEXT' %>") wait - assert_equal 1, @logger.logged(:info).size + assert_equal 2, @logger.logged(:info).size + assert_match(/Rendering inline template/, @logger.logged(:info).first) assert_match(/Rendered inline template/, @logger.logged(:info).last) end end |