Merge pull request #2685 from MikeMcQuaid/more-macos-doctor

diagnostic: move some more macOS doctor checks.

2 files changed, 6 insertions, 7 deletions

diff --git a/Library/Homebrew/test/diagnostic_spec.rb b/Library/Homebrew/test/diagnostic_spec.rb
index c4373671e..058b9823c 100644
--- a/Library/Homebrew/test/diagnostic_spec.rb
+++ b/Library/Homebrew/test/diagnostic_spec.rb
@@ -90,13 +90,6 @@ describe Homebrew::Diagnostic::Checks do
     end
   end
 
-  specify "#check_homebrew_prefix" do
-    ENV.delete("JENKINS_HOME")
-    # the integration tests are run in a special prefix
-    expect(subject.check_homebrew_prefix)
-      .to match("Your Homebrew's prefix is not /usr/local.")
-  end
-
   specify "#check_user_path_1" do
     bin = HOMEBREW_PREFIX/"bin"
     sep = File::PATH_SEPARATOR
diff --git a/Library/Homebrew/test/os/mac/diagnostic_spec.rb b/Library/Homebrew/test/os/mac/diagnostic_spec.rb
index d2b38a332..787f80fec 100644
--- a/Library/Homebrew/test/os/mac/diagnostic_spec.rb
+++ b/Library/Homebrew/test/os/mac/diagnostic_spec.rb
@@ -39,4 +39,10 @@ describe Homebrew::Diagnostic::Checks do
     expect(subject.check_xcode_8_without_clt_on_el_capitan)
       .to match("You have Xcode 8 installed without the CLT")
   end
+
+  specify "#check_homebrew_prefix" do
+    # the integration tests are run in a special prefix
+    expect(subject.check_homebrew_prefix)
+      .to match("Your Homebrew's prefix is not /usr/local.")
+  end
 end