Cleanup some functional helpersfunctional_cleanup

Rename the macos helpers. Remove unused helpers to check for RHEL 5 and < Windows 2008 R2.

Signed-off-by: Tim Smith <tsmith@chef.io>

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index 2d65d69843..d4c8132313 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -146,7 +146,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
     end
 
     # dscl doesn't perform any error checking and will let you add users that don't exist.
-    describe "when no users exist", :not_supported_on_mac_osx do
+    describe "when no users exist", :not_supported_on_macos do
       describe "when append is not set" do
         # excluded_members can only be used when append is set.  It is ignored otherwise.
         let(:excluded_members) { [] }
diff --git a/spec/functional/resource/user/dscl_spec.rb b/spec/functional/resource/user/dscl_spec.rb
index e73a4ad3ee..dab640d4da 100644
--- a/spec/functional/resource/user/dscl_spec.rb
+++ b/spec/functional/resource/user/dscl_spec.rb
@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 
 metadata = {
-  mac_osx_only: true,
+  macos_only: true,
   requires_root: true,
 }