Revert "Merge pull request #5231 from chef/lcg/fix-func-useradd-spec"

This reverts commit 07f09cb9cd7c2d351be4a867f095af7968fe9c5f, reversing
changes made to c6ec6ee9a0c3daaeb62835c6ded55955fc578b27.

4 files changed, 22 insertions, 18 deletions

diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb
index aa5a29f92c..06a89a67c5 100644
--- a/spec/functional/resource/group_spec.rb
+++ b/spec/functional/resource/group_spec.rb
@@ -105,11 +105,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte
   end
 
   def remove_user(username)
-    if ! windows_domain_user?(username)
-      u = user(username)
-      u.manage_home false # jekins hosts throw mail spool file not owned by user if we use manage_home true
-      u.run_action(:remove)
-    end
+    user(username).run_action(:remove) if ! windows_domain_user?(username)
     # TODO: User shouldn't exist
   end
 
diff --git a/spec/functional/resource/user/dscl_spec.rb b/spec/functional/resource/user/dscl_spec.rb
index bedb37838c..e2097710df 100644
--- a/spec/functional/resource/user/dscl_spec.rb
+++ b/spec/functional/resource/user/dscl_spec.rb
@@ -76,7 +76,7 @@ describe "Chef::Resource::User with Chef::Provider::User::Dscl provider", metada
   let(:iterations) { nil }
 
   let(:user_resource) do
-    r = Chef::Resource::User::DsclUser.new("TEST USER RESOURCE", run_context)
+    r = Chef::Resource::User.new("TEST USER RESOURCE", run_context)
     r.username(username)
     r.uid(uid)
     r.gid(gid)
diff --git a/spec/functional/resource/user/useradd_spec.rb b/spec/functional/resource/user/useradd_spec.rb
index 2c6ef4a41f..43c26ac006 100644
--- a/spec/functional/resource/user/useradd_spec.rb
+++ b/spec/functional/resource/user/useradd_spec.rb
@@ -21,14 +21,19 @@ require "spec_helper"
 require "functional/resource/base"
 require "chef/mixin/shell_out"
 
-def resource_for_platform(username, run_context)
-  Chef::Resource.resource_for_node(:user, node).new(username, run_context)
+def user_provider_for_platform
+  case ohai[:platform]
+  when "aix"
+    Chef::Provider::User::Aix
+  else
+    Chef::Provider::User::Useradd
+  end
 end
 
-metadata = {
-  :unix_only => true,
-  :requires_root => true,
-  :not_supported_on_mac_osx => true,
+metadata = { :unix_only => true,
+             :requires_root => true,
+             :not_supported_on_mac_osx => true,
+             :provider => { :user => user_provider_for_platform },
 }
 
 describe Chef::Provider::User::Useradd, metadata do
@@ -81,7 +86,7 @@ describe Chef::Provider::User::Useradd, metadata do
     end
 
     ["cf-test"].each do |u|
-      r = resource_for_platform("DELETE USER", run_context)
+      r = Chef::Resource::User.new("DELETE USER", run_context)
       r.username("cf-test")
       r.run_action(:remove)
     end
@@ -129,7 +134,10 @@ describe Chef::Provider::User::Useradd, metadata do
     Chef::RunContext.new(node, {}, events)
   end
 
-  let(:username) { "cf-test" }
+  let(:username) do
+    "cf-test"
+  end
+
   let(:uid) { nil }
   let(:home) { nil }
   let(:manage_home) { false }
@@ -138,7 +146,7 @@ describe Chef::Provider::User::Useradd, metadata do
   let(:comment) { nil }
 
   let(:user_resource) do
-    r = resource_for_platform("TEST USER RESOURCE", run_context)
+    r = Chef::Resource::User.new("TEST USER RESOURCE", run_context)
     r.username(username)
     r.uid(uid)
     r.home(home)
@@ -302,8 +310,8 @@ describe Chef::Provider::User::Useradd, metadata do
       let(:existing_comment) { nil }
 
       let(:existing_user) do
-        r = resource_for_platform("TEST USER RESOURCE", run_context)
-          # username is identity attr, must match.
+        r = Chef::Resource::User.new("TEST USER RESOURCE", run_context)
+        # username is identity attr, must match.
         r.username(username)
         r.uid(existing_uid)
         r.home(existing_home)
diff --git a/spec/functional/resource/windows_service_spec.rb b/spec/functional/resource/windows_service_spec.rb
index 531f9e9250..f74e9bdac3 100644
--- a/spec/functional/resource/windows_service_spec.rb
+++ b/spec/functional/resource/windows_service_spec.rb
@@ -28,7 +28,7 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
   let(:password) { "1a2b3c4X!&narf" }
 
   let(:user_resource) do
-    r = Chef::Resource::User::WindowsUser.new(username, run_context)
+    r = Chef::Resource::User.new(username, run_context)
     r.username(username)
     r.password(password)
     r.comment("temp spec user")