aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-02 18:44:09 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-02 18:44:09 -0200
commit2b6557e70a62158c87f744082f2044524f4f6257 (patch)
treedfbca2fa3da0a3d6dfdc980acba26b271439c3f8 /railties
parent7ba1ca909cd0b1e1f116321de05a4db7922cc97a (diff)
parentc3668c39502405607f33faff18b450623809dbba (diff)
downloadrails-2b6557e70a62158c87f744082f2044524f4f6257.tar.gz
rails-2b6557e70a62158c87f744082f2044524f4f6257.tar.bz2
rails-2b6557e70a62158c87f744082f2044524f4f6257.zip
Merge pull request #22469 from merhard/fix_custom_file_loader_test
Fix failing test using custom file watcher
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/loading_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index 1027bca2c1..2106708c98 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -169,6 +169,8 @@ class LoadingTest < ActiveSupport::TestCase
config.file_watcher = Class.new do
def initialize(*); end
def updated?; false; end
+ def execute; end
+ def execute_if_updated; false; end
end
RUBY