Decouple DATA patches from the executing script

2 files changed, 25 insertions, 3 deletions

diff --git a/Library/Homebrew/test/test_patch.rb b/Library/Homebrew/test/test_patch.rb
index bc0e522d3..4b8cdf53c 100644
--- a/Library/Homebrew/test/test_patch.rb
+++ b/Library/Homebrew/test/test_patch.rb
@@ -36,13 +36,13 @@ class PatchTests < Homebrew::TestCase
 
   def test_create_DATA
     patch = Patch.create(:p0, :DATA)
-    assert_kind_of IOPatch, patch
+    assert_kind_of DATAPatch, patch
     assert_equal :p0, patch.strip
   end
 
   def test_create_DATA_without_strip
     patch = Patch.create(:DATA, nil)
-    assert_kind_of IOPatch, patch
+    assert_kind_of DATAPatch, patch
     assert_equal :p1, patch.strip
   end
 
diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test_patching.rb
index 8fe8489f2..76ed37483 100644
--- a/Library/Homebrew/test/test_patching.rb
+++ b/Library/Homebrew/test/test_patching.rb
@@ -8,7 +8,7 @@ class PatchingTests < Homebrew::TestCase
   PATCH_A_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-a.diff"
   PATCH_B_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-b.diff"
 
-  def formula(&block)
+  def formula(*args, &block)
     super do
       url "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz"
       sha1 "482e737739d946b7c8cbaf127d9ee9c148b999f5"
@@ -138,4 +138,26 @@ class PatchingTests < Homebrew::TestCase
       end.brew { assert_patched 'libexec/noop' }
     end
   end
+
+  def test_patch_DATA_constant
+    shutup do
+      formula("test", Pathname.new(__FILE__).expand_path) do
+        def patches
+          Formula::DATA
+        end
+      end.brew { assert_patched "libexec/noop" }
+    end
+  end
 end
+
+__END__
+diff --git a/libexec/NOOP b/libexec/NOOP
+index bfdda4c..e08d8f4 100755
+--- a/libexec/NOOP
++++ b/libexec/NOOP
+@@ -1,2 +1,2 @@
+ #!/bin/bash
+-echo NOOP
+\ No newline at end of file
++echo ABCD
+\ No newline at end of file