1 files changed, 43 insertions, 23 deletions

diff --git a/activesupport/test/file_update_checker_test.rb b/activesupport/test/file_update_checker_test.rb
index 425931f49a..52c1f3260d 100644
--- a/activesupport/test/file_update_checker_test.rb
+++ b/activesupport/test/file_update_checker_test.rb
@@ -4,21 +4,19 @@ require 'fileutils'
 
 MTIME_FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
 
-module FileUpdateCheckerSuite
+class FileUpdateCheckerWithEnumerableTest < Test::Unit::TestCase
   FILES = %w(1.txt 2.txt 3.txt)
 
   def setup
+    FileUtils.mkdir_p("tmp_watcher")
     FileUtils.touch(FILES)
   end
 
   def teardown
+    FileUtils.rm_rf("tmp_watcher")
     FileUtils.rm(FILES)
   end
 
-  def args
-    raise NotImplementedError
-  end
-
   def test_should_not_execute_the_block_if_no_paths_are_given
     i = 0
     checker = ActiveSupport::FileUpdateChecker.new([]){ i += 1 }
@@ -28,42 +26,64 @@ module FileUpdateCheckerSuite
 
   def test_should_invoke_the_block_on_first_call_if_it_does_not_calculate_last_updated_at_on_load
     i = 0
-    checker = ActiveSupport::FileUpdateChecker.new(args){ i += 1 }
+    checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
     checker.execute_if_updated
     assert_equal 1, i
   end
 
   def test_should_not_invoke_the_block_on_first_call_if_it_calculates_last_updated_at_on_load
     i = 0
-    checker = ActiveSupport::FileUpdateChecker.new(args, true){ i += 1 }
+    checker = ActiveSupport::FileUpdateChecker.new(FILES, true){ i += 1 }
     checker.execute_if_updated
     assert_equal 0, i
   end
 
   def test_should_not_invoke_the_block_if_no_file_has_changed
     i = 0
-    checker = ActiveSupport::FileUpdateChecker.new(args){ i += 1 }
-    5.times { checker.execute_if_updated }
-    assert_equal 1, i
+    checker = ActiveSupport::FileUpdateChecker.new(FILES, true){ i += 1 }
+    5.times { assert !checker.execute_if_updated }
+    assert_equal 0, i
   end
 
   def test_should_invoke_the_block_if_a_file_has_changed
     i = 0
-    checker = ActiveSupport::FileUpdateChecker.new(args){ i += 1 }
-    checker.execute_if_updated
+    checker = ActiveSupport::FileUpdateChecker.new(FILES, true){ i += 1 }
     sleep(1)
     FileUtils.touch(FILES)
-    checker.execute_if_updated
-    assert_equal 2, i
+    assert checker.execute_if_updated
+    assert_equal 1, i
   end
-end
 
-class FileUpdateCheckerWithEnumerableTest < Test::Unit::TestCase
-  include FileUpdateCheckerSuite
-  def args; FILES; end
-end
+  def test_should_cache_updated_result_until_flushed
+    i = 0
+    checker = ActiveSupport::FileUpdateChecker.new(FILES, true){ i += 1 }
+    assert !checker.updated?
+
+    sleep(1)
+    FileUtils.touch(FILES)
+
+    assert checker.updated?
+    assert checker.execute_if_updated
+    assert !checker.updated?
+  end
 
-class FileUpdateCheckerWithStringTest < Test::Unit::TestCase
-  include FileUpdateCheckerSuite
-  def args; "{1,2,3}.txt"; end
-end
+  def test_should_invoke_the_block_if_a_watched_dir_changed_its_glob
+    i = 0
+    checker = ActiveSupport::FileUpdateChecker.new([{"tmp_watcher" => [:txt]}], true){ i += 1 }
+    FileUtils.cd "tmp_watcher" do
+      FileUtils.touch(FILES)
+    end
+    assert checker.execute_if_updated
+    assert_equal 1, i
+  end
+
+  def test_should_not_invoke_the_block_if_a_watched_dir_changed_its_glob
+    i = 0
+    checker = ActiveSupport::FileUpdateChecker.new([{"tmp_watcher" => :rb}], true){ i += 1 }
+    FileUtils.cd "tmp_watcher" do
+      FileUtils.touch(FILES)
+    end
+    assert !checker.execute_if_updated
+    assert_equal 0, i
+  end
+end
\ No newline at end of file