aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-11-02 09:58:54 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-11-02 10:08:21 +0900
commitd5defda77f3d941f238c35eae12146d5d4737e54 (patch)
tree543940fe98890931d9598cc8ea4a13918588f972 /actionview
parentb001fa5e2940cdf9fa0b6fcdaefe8a56fcf98bf3 (diff)
downloadrails-d5defda77f3d941f238c35eae12146d5d4737e54.tar.gz
rails-d5defda77f3d941f238c35eae12146d5d4737e54.tar.bz2
rails-d5defda77f3d941f238c35eae12146d5d4737e54.zip
Fix "warning: instance variable @defined_root not initialized"
Currently, the following error is shows only when run the test using `bin/test`. ``` ./bin/test -w test/template/log_subscriber_test.rb Run options: --seed 17167 # Running: /rails/actionview/test/template/log_subscriber_test.rb:34: warning: instance variable @defined_root not initialized ``` In `AVLogSubscriberTest`, if the `Rails.root` is not defined, define the method and undef it in teardown. https://github.com/rails/rails/blob/master/actionview/test/template/log_subscriber_test.rb#L21..L33 However, in `bin/test`, `Rails.root` is defined, which results in referring to uninitialized variables and warnings.
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/template/log_subscriber_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb
index a4d89ba0d1..7f4fd25573 100644
--- a/actionview/test/template/log_subscriber_test.rb
+++ b/actionview/test/template/log_subscriber_test.rb
@@ -30,7 +30,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
ActiveSupport::LogSubscriber.log_subscribers.clear
# We need to undef `root`, RenderTestCases don't want this to be defined
- Rails.instance_eval { undef :root } if @defined_root
+ Rails.instance_eval { undef :root } if defined?(@defined_root)
end
def set_logger(logger)