Merge pull request #2537 from reitermarkus/pathname-to_str

Remove `to_s` from some `Pathname`s.

3 files changed, 5 insertions, 5 deletions

diff --git a/Library/Homebrew/test/cmd/--env_spec.rb b/Library/Homebrew/test/cmd/--env_spec.rb
index 7dd84132a..9ccdaa6f1 100644
--- a/Library/Homebrew/test/cmd/--env_spec.rb
+++ b/Library/Homebrew/test/cmd/--env_spec.rb
@@ -9,7 +9,7 @@ describe "brew --env", :integration_test do
   describe "--shell=bash" do
     it "prints the Homebrew build environment variables in Bash syntax" do
       expect { brew "--env", "--shell=bash" }
-        .to output(/export CMAKE_PREFIX_PATH="#{Regexp.quote(HOMEBREW_PREFIX.to_s)}"/).to_stdout
+        .to output(/export CMAKE_PREFIX_PATH="#{Regexp.quote(HOMEBREW_PREFIX)}"/).to_stdout
         .and not_to_output.to_stderr
         .and be_a_success
     end
@@ -18,7 +18,7 @@ describe "brew --env", :integration_test do
   describe "--shell=fish" do
     it "prints the Homebrew build environment variables in Fish syntax" do
       expect { brew "--env", "--shell=fish" }
-        .to output(/set [-]gx CMAKE_PREFIX_PATH "#{Regexp.quote(HOMEBREW_PREFIX.to_s)}"/).to_stdout
+        .to output(/set [-]gx CMAKE_PREFIX_PATH "#{Regexp.quote(HOMEBREW_PREFIX)}"/).to_stdout
         .and not_to_output.to_stderr
         .and be_a_success
     end
@@ -27,7 +27,7 @@ describe "brew --env", :integration_test do
   describe "--shell=tcsh" do
     it "prints the Homebrew build environment variables in Tcsh syntax" do
       expect { brew "--env", "--shell=tcsh" }
-        .to output(/setenv CMAKE_PREFIX_PATH #{Regexp.quote(HOMEBREW_PREFIX.to_s)};/).to_stdout
+        .to output(/setenv CMAKE_PREFIX_PATH #{Regexp.quote(HOMEBREW_PREFIX)};/).to_stdout
         .and not_to_output.to_stderr
         .and be_a_success
     end
diff --git a/Library/Homebrew/test/cmd/--version_spec.rb b/Library/Homebrew/test/cmd/--version_spec.rb
index 8992629d7..8dc183882 100644
--- a/Library/Homebrew/test/cmd/--version_spec.rb
+++ b/Library/Homebrew/test/cmd/--version_spec.rb
@@ -1,7 +1,7 @@
 describe "brew --version", :integration_test do
   it "prints the Homebrew version" do
     expect { brew "--version" }
-      .to output(/^Homebrew #{Regexp.escape(HOMEBREW_VERSION.to_s)}\n/).to_stdout
+      .to output(/^Homebrew #{Regexp.escape(HOMEBREW_VERSION)}\n/).to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
   end
diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb b/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb
index 31083ee58..1364c13a3 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_examples/hbc_staged.rb
@@ -24,7 +24,7 @@ shared_examples Hbc::Staged do
   end
 
   it "can get the Info.plist file for the primary app" do
-    expect(staged.info_plist_file.to_s).to include Hbc.appdir.join("TestCask.app/Contents/Info.plist")
+    expect(staged.info_plist_file).to eq Hbc.appdir.join("TestCask.app/Contents/Info.plist")
   end
 
   it "can execute commands on the Info.plist file" do