test_watch.rb in nanoc-3.6.1

- old
+ new

@@ -18,26 +18,46 @@
 
       watch_thread.kill
     end
   end
 
+  def test_change_nanoc_dot_yaml
+    Nanoc::CLI.run %w( create-site bleh )
+    Dir.chdir('bleh') do
+      File.open('Rules', 'w') do |io|
+        io.write("compile '*' do ; filter :erb ; end\n")
+        io.write("route '*' do ; item.identifier + 'index.html' ; end\n")
+      end
+
+      config_contents = File.read('nanoc.yaml')
+
+      watch_thread = Thread.new do
+        Nanoc::CLI.run %w( watch )
+      end
+
+      File.open('content/index.html', 'w') { |io| io.write('<%= @config[:blah].inspect %>!!!') }
+      self.wait_until_content_equals('output/index.html', 'nil!!!')
+
+      File.open('nanoc.yaml', 'w') { |io| io.write(config_contents + "\nblah: 456\n") }
+      self.wait_until_content_equals('output/index.html', '456!!!')
+
+      watch_thread.kill
+    end
+  end
+
   def test_notify
-    old_path = ENV['PATH']
     with_site do |s|
       watch_thread = Thread.new do
         Nanoc::CLI.run %w( watch )
       end
 
-      ENV['PATH'] = '.' # so that neither which nor where can be found
       File.open('content/index.html', 'w') { |io| io.write('Hello there!') }
       self.wait_until_exists('output/index.html')
       assert_equal 'Hello there!', File.read('output/index.html')
 
       watch_thread.kill
     end
-  ensure
-    ENV['PATH'] = old_path
   end
 
   def wait_until_exists(filename)
     20.times do
       break if File.file?(filename)
@@ -46,18 +66,25 @@
     if !File.file?(filename)
       raise RuntimeError, "Expected #{filename} to appear but it didn't :("
     end
   end
 
-  def wait_until_content_equals(filename, content)
+  def wait_until_content_equals(filename, expected_content)
     self.wait_until_exists(filename)
 
     20.times do
-      break if File.read(filename) == content
+      break if File.read(filename) == expected_content
       sleep 0.5
     end
-    if File.read(filename) != content
-      raise RuntimeError, "Expected #{filename} to have content #{content} but it doesn't :("
+
+    actual_content = File.read(filename)
+    if actual_content != expected_content
+      raise RuntimeError, "Expected #{filename} to have " \
+        "content #{expected_content.inspect} but it had " \
+        "content #{actual_content.inspect} instead :("
     end
+
+    # Ugly, but seems to be necessary or changes are not picked up. :(
+    sleep 0.5
   end
 
 end