1 files changed, 45 insertions, 17 deletions

diff --git a/activesupport/test/file_update_checker_test.rb b/activesupport/test/file_update_checker_test.rb
index b65bb1d024..dd19b58aa2 100644
--- a/activesupport/test/file_update_checker_test.rb
+++ b/activesupport/test/file_update_checker_test.rb
@@ -4,15 +4,17 @@ require 'fileutils'
 
 MTIME_FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
 
-class FileUpdateCheckerTest < Test::Unit::TestCase
+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(FILES)
+    FileUtils.rm_rf("tmp_watcher")
+    FileUtils.rm_rf(FILES)
   end
 
   def test_should_not_execute_the_block_if_no_paths_are_given
@@ -22,34 +24,60 @@ class FileUpdateCheckerTest < Test::Unit::TestCase
     assert_equal 0, i
   end
 
-  def test_should_invoke_the_block_on_first_call_if_it_does_not_calculate_last_updated_at_on_load
+  def test_should_not_invoke_the_block_if_no_file_has_changed
     i = 0
     checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
-    checker.execute_if_updated
-    assert_equal 1, i
+    5.times { assert !checker.execute_if_updated }
+    assert_equal 0, i
   end
 
-  def test_should_not_invoke_the_block_on_first_call_if_it_calculates_last_updated_at_on_load
+  def test_should_invoke_the_block_if_a_file_has_changed
     i = 0
-    checker = ActiveSupport::FileUpdateChecker.new(FILES, true){ i += 1 }
-    checker.execute_if_updated
-    assert_equal 0, i
+    checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
+    sleep(1)
+    FileUtils.touch(FILES)
+    assert checker.execute_if_updated
+    assert_equal 1, i
   end
 
-  def test_should_not_invoke_the_block_if_no_file_has_changed
+  def test_should_be_robust_enough_to_handle_deleted_files
     i = 0
     checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
-    5.times { checker.execute_if_updated }
-    assert_equal 1, i
+    FileUtils.rm(FILES)
+    assert !checker.execute_if_updated
+    assert_equal 0, i
   end
 
-  def test_should_invoke_the_block_if_a_file_has_changed
+  def test_should_cache_updated_result_until_execute
     i = 0
     checker = ActiveSupport::FileUpdateChecker.new(FILES){ i += 1 }
-    checker.execute_if_updated
+    assert !checker.updated?
+
     sleep(1)
     FileUtils.touch(FILES)
-    checker.execute_if_updated
-    assert_equal 2, i
+
+    assert checker.updated?
+    checker.execute
+    assert !checker.updated?
+  end
+
+  def test_should_invoke_the_block_if_a_watched_dir_changed_its_glob
+    i = 0
+    checker = ActiveSupport::FileUpdateChecker.new([], "tmp_watcher" => [:txt]){ 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){ i += 1 }
+    FileUtils.cd "tmp_watcher" do
+      FileUtils.touch(FILES)
+    end
+    assert !checker.execute_if_updated
+    assert_equal 0, i
   end
-end
+end
\ No newline at end of file