Create custom matchers for “valid symlink”.

6 files changed, 14 insertions, 12 deletions

diff --git a/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb b/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb
index 95ac2b5f5..b606aba1b 100644
--- a/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/artifact/binary_spec.rb
@@ -20,7 +20,7 @@ describe Hbc::Artifact::Binary do
     shutup do
       Hbc::Artifact::Binary.new(cask).install_phase
     end
-    expect(FileHelper.valid_alias?(expected_path)).to be true
+    expect(expected_path).to be_a_valid_symlink
   end
 
   it "avoids clobbering an existing binary by linking over it" do
@@ -82,7 +82,7 @@ describe Hbc::Artifact::Binary do
         Hbc::Artifact::Binary.new(cask).install_phase
       end
 
-      expect(FileHelper.valid_alias?(expected_path)).to be true
+      expect(expected_path).to be_a_valid_symlink
     end
   end
 end
diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb
index eefee3d60..548691f19 100644
--- a/Library/Homebrew/cask/spec/spec_helper.rb
+++ b/Library/Homebrew/cask/spec/spec_helper.rb
@@ -34,4 +34,5 @@ end
 RSpec.configure do |config|
   config.order = :random
   config.include(Test::Helper::Shutup)
+  config.include(FileMatchers)
 end
diff --git a/Library/Homebrew/cask/spec/support/file_helper.rb b/Library/Homebrew/cask/spec/support/file_helper.rb
deleted file mode 100644
index abe7b2618..000000000
--- a/Library/Homebrew/cask/spec/support/file_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module FileHelper
-  module_function
-
-  def valid_alias?(candidate)
-    return false unless candidate.symlink?
-    candidate.readlink.exist?
-  end
-end
diff --git a/Library/Homebrew/cask/spec/support/file_matchers.rb b/Library/Homebrew/cask/spec/support/file_matchers.rb
new file mode 100644
index 000000000..d3e62f45a
--- /dev/null
+++ b/Library/Homebrew/cask/spec/support/file_matchers.rb
@@ -0,0 +1,9 @@
+module FileMatchers
+  extend RSpec::Matchers::DSL
+
+  matcher :be_a_valid_symlink do
+    match do |path|
+      path.symlink? && path.readlink.exist?
+    end
+  end
+end
diff --git a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
index 0584dcbeb..6259baa4b 100644
--- a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
@@ -20,7 +20,7 @@ describe Hbc::Artifact::Suite do
     end
 
     target_path.must_be :directory?
-    TestHelper.valid_alias?(target_path).must_equal false
+    TestHelper.valid_symlink?(target_path).must_equal false
     source_path.wont_be :exist?
   end
 
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index 71ce5752e..f600a1c5c 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -58,7 +58,7 @@ class TestHelper
     "file://" + local_binary_path(name)
   end
 
-  def self.valid_alias?(candidate)
+  def self.valid_symlink?(candidate)
     return false unless candidate.symlink?
     candidate.readlink.exist?
   end