From ae15d203a89fcc68b8c253167108147b7dc36a13 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 28 Nov 2015 19:32:45 -0800
Subject: [PATCH] Fix some tests

---
 middleman-core/lib/middleman-core/core_extensions/data.rb  | 4 ++--
 .../lib/middleman-core/sources/source_watcher.rb           | 2 +-
 middleman-core/lib/middleman-core/util.rb                  | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index 142f5856..f1762e43 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -94,7 +94,7 @@ module Middleman
         # @return [void]
         Contract IsA['Middleman::SourceFile'] => Any
         def touch_file(file)
-          data_path = file[:full_path]
+          data_path = file[:relative_path]
           extension = File.extname(data_path)
           basename  = File.basename(data_path, extension)
 
@@ -124,7 +124,7 @@ module Middleman
         # @return [void]
         Contract IsA['Middleman::SourceFile'] => Any
         def remove_file(file)
-          data_path = file[:full_path]
+          data_path = file[:relative_path]
           extension = File.extname(data_path)
           basename  = File.basename(data_path, extension)
 
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 8aa03196..00e500fb 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -226,7 +226,7 @@ module Middleman
     Contract ArrayOf[Pathname], ArrayOf[Pathname] => Any
     def update(updated_paths, removed_paths)
       valid_updates = updated_paths
-                      .map { |p| ::Middleman::Util.path_to_source_file(p, @directory, @type) }
+                      .map { |p| ::Middleman::Util.path_to_source_file(p, @directory, @type, @options.fetch(:destination_dir, false)) }
                       .select(&method(:valid?))
 
       valid_updates.each do |f|
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index 0e3f37ad..226b6479 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -468,13 +468,12 @@ module Middleman
     #
     # @param [Pathname] path The path.
     # @return [Middleman::SourceFile]
-    Contract Pathname, Pathname, Symbol => IsA['Middleman::SourceFile']
-    def path_to_source_file(path, directory, type)
+    Contract Pathname, Pathname, Symbol, Bool => IsA['Middleman::SourceFile']
+    def path_to_source_file(path, directory, type, destination_dir)
       types = Set.new([type])
 
       relative_path = path.relative_path_from(directory)
-      # destination_dir = @options.fetch(:destination_dir, false)
-      # relative_path   = File.join(destination_dir, relative_path) if destination_dir
+      relative_path   = File.join(destination_dir, relative_path) if destination_dir
 
       ::Middleman::SourceFile.new(Pathname(relative_path), path, directory, types)
     end