Merge pull request #2218 from reitermarkus/spec-x11_requirement

Convert X11Requirement test to spec.

2 files changed, 13 insertions, 13 deletions

diff --git a/Library/Homebrew/test/os/mac/x11_requirement_test.rb b/Library/Homebrew/test/os/mac/x11_requirement_test.rb
deleted file mode 100644
index 102937cb5..000000000
--- a/Library/Homebrew/test/os/mac/x11_requirement_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "testing_env"
-require "requirements/x11_requirement"
-
-class OSMacX11RequirementTests < Homebrew::TestCase
-  def test_satisfied
-    MacOS::XQuartz.stubs(:version).returns("2.7.5")
-    MacOS::XQuartz.stubs(:installed?).returns(true)
-    assert_predicate X11Requirement.new, :satisfied?
-
-    MacOS::XQuartz.stubs(:installed?).returns(false)
-    refute_predicate X11Requirement.new, :satisfied?
-  end
-end
diff --git a/Library/Homebrew/test/x11_requirement_spec.rb b/Library/Homebrew/test/x11_requirement_spec.rb
index f60c8bffe..bc02dc75a 100644
--- a/Library/Homebrew/test/x11_requirement_spec.rb
+++ b/Library/Homebrew/test/x11_requirement_spec.rb
@@ -33,4 +33,17 @@ describe X11Requirement do
       subject.modify_build_environment
     end
   end
+
+  describe "#satisfied?", :needs_macos do
+    it "returns true if X11 is installed" do
+      expect(MacOS::XQuartz).to receive(:version).and_return("2.7.5")
+      expect(MacOS::XQuartz).to receive(:installed?).and_return(true)
+      expect(subject).to be_satisfied
+    end
+
+    it "returns false if X11 is not installed" do
+      expect(MacOS::XQuartz).to receive(:installed?).and_return(false)
+      expect(subject).not_to be_satisfied
+    end
+  end
 end