Code refactoring v3.0

2 files changed, 23 insertions, 24 deletions

diff --git a/Library/Homebrew/test/os/dependency_collector_spec.rb b/Library/Homebrew/test/os/dependency_collector_spec.rb
index 4fe064732..eaae99fe9 100644
--- a/Library/Homebrew/test/os/dependency_collector_spec.rb
+++ b/Library/Homebrew/test/os/dependency_collector_spec.rb
@@ -1 +1,23 @@
-require "test/dependency_collector"
+require "dependency_collector"
+
+describe DependencyCollector do
+  alias_matcher :be_a_build_requirement, :be_build
+
+  after(:each) do
+    described_class.clear_cache
+  end
+
+  describe "#add" do
+    it "creates a resource dependency from a '.zip' URL" do
+      resource = Resource.new
+      resource.url("http://example.com/foo.zip")
+      expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
+    end
+
+    it "creates a resource dependency from a '.bz2' URL" do
+      resource = Resource.new
+      resource.url("http://example.com/foo.tar.bz2")
+      expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
+    end
+  end
+end
diff --git a/Library/Homebrew/test/os/linux/dependency_collector.rb b/Library/Homebrew/test/os/linux/dependency_collector.rb
deleted file mode 100644
index eaae99fe9..000000000
--- a/Library/Homebrew/test/os/linux/dependency_collector.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "dependency_collector"
-
-describe DependencyCollector do
-  alias_matcher :be_a_build_requirement, :be_build
-
-  after(:each) do
-    described_class.clear_cache
-  end
-
-  describe "#add" do
-    it "creates a resource dependency from a '.zip' URL" do
-      resource = Resource.new
-      resource.url("http://example.com/foo.zip")
-      expect(subject.add(resource)).to eq(Dependency.new("zip", [:build]))
-    end
-
-    it "creates a resource dependency from a '.bz2' URL" do
-      resource = Resource.new
-      resource.url("http://example.com/foo.tar.bz2")
-      expect(subject.add(resource)).to eq(Dependency.new("bzip2", [:build]))
-    end
-  end
-end