Use new "macOS" naming where appropriate.

Not quite a mass replacement as I've used OS X and Mac OS X where
describing specific older versions and added compatibility methods
for things in the DSL.

3 files changed, 8 insertions, 8 deletions

diff --git a/Library/Homebrew/test/test_formula_support.rb b/Library/Homebrew/test/test_formula_support.rb
index 111b509ec..c0a79f950 100644
--- a/Library/Homebrew/test/test_formula_support.rb
+++ b/Library/Homebrew/test/test_formula_support.rb
@@ -8,8 +8,8 @@ class KegOnlyReasonTests < Homebrew::TestCase
   end
 
   def test_to_s_no_explanation
-    r = KegOnlyReason.new :provided_by_osx, ""
-    assert_match(/^OS X already provides/, r.to_s)
+    r = KegOnlyReason.new :provided_by_macos, ""
+    assert_match(/^macOS already provides/, r.to_s)
   end
 end
 
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index 43b8689af..11eb6c69d 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -44,8 +44,8 @@ class IntegrationCommandTests < Homebrew::TestCase
     end
   end
 
-  def needs_osx
-    skip "Not on OS X" unless OS.mac?
+  def needs_macos
+    skip "Not on MacOS" unless OS.mac?
   end
 
   def cmd_id_from_args(args)
@@ -729,14 +729,14 @@ class IntegrationCommandTests < Homebrew::TestCase
 
   def test_cask
     needs_test_cmd_taps
-    needs_osx
+    needs_macos
     setup_remote_tap("caskroom/cask")
     cmd("cask", "list")
   end
 
   def test_services
     needs_test_cmd_taps
-    needs_osx
+    needs_macos
     setup_remote_tap("homebrew/services")
     assert_equal "Warning: No services available to control with `brew services`",
       cmd("services", "list")
diff --git a/Library/Homebrew/test/test_os_mac_diagnostic.rb b/Library/Homebrew/test/test_os_mac_diagnostic.rb
index f7d43c4c7..655aa1d46 100644
--- a/Library/Homebrew/test/test_os_mac_diagnostic.rb
+++ b/Library/Homebrew/test/test_os_mac_diagnostic.rb
@@ -19,11 +19,11 @@ class OSMacDiagnosticChecksTest < Homebrew::TestCase
       @checks.check_for_other_package_managers
   end
 
-  def test_check_for_unsupported_osx
+  def test_check_for_unsupported_macos
     ARGV.stubs(:homebrew_developer?).returns false
     OS::Mac.stubs(:prerelease?).returns true
     assert_match "We do not provide support for this pre-release version.",
-      @checks.check_for_unsupported_osx
+      @checks.check_for_unsupported_macos
   end
 
   def test_check_for_unsupported_curl_vars