Put in some temporary hacks for the service and user resource for cases where the tests assumed nillable properties.

This will get cleaned up when they are converted to real properties.

Signed-off-by: Noah Kantrowitz <noah@coderanger.net>

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/chef/resource/user.rb b/lib/chef/resource/user.rb
index a1e315ef50..03f2551bf4 100644
--- a/lib/chef/resource/user.rb
+++ b/lib/chef/resource/user.rb
@@ -62,19 +62,21 @@ class Chef
         )
       end
 
-      def uid(arg = nil)
+      def uid(arg = Chef::NOT_PASSED)
         set_or_return(
           :uid,
           arg,
-          :kind_of => [ String, Integer ]
+          :kind_of => [ String, Integer, NilClass ],
+          :coerce => proc {|x| x || nil }
         )
       end
 
-      def gid(arg = nil)
+      def gid(arg = Chef::NOT_PASSED)
         set_or_return(
           :gid,
           arg,
-          :kind_of => [ String, Integer ]
+          :kind_of => [ String, Integer, NilClass ],
+          :coerce => proc {|x| x || nil }
         )
       end