Rewriting the user tests, in preparation for enhancing them

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 9 insertions, 41 deletions

diff --git a/spec/unit/type/user.rb b/spec/unit/type/user.rb
index d16d752f9..4576f560b 100755
--- a/spec/unit/type/user.rb
+++ b/spec/unit/type/user.rb
@@ -2,55 +2,23 @@
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-module UserTestFunctions
-    def mkuser(name)
-        user = nil;
-        lambda {
-            user = Puppet::Type.type(:user).create(
-                :name => name,
-                :comment => "Puppet Testing User",
-                :gid => Puppet::Util::SUIDManager.gid,
-                :shell => "/bin/sh",
-                :home => "/home/%s" % name
-        ) }.should_not raise_error
-        user.should_not be_nil
-        user
-    end
-
-    def test_provider_class(klass)
-        klass.should_not be_nil
-        klass.should be_an_instance_of(Class)
-        superclasses = []
-        while klass = klass.superclass
-            superclasses << klass
-        end
-        superclasses.should include(Puppet::Provider)
-    end
-end
-
-describe Puppet::Type.type(:user) do
+user = Puppet::Type.type(:user)
 
-    include UserTestFunctions
+describe user do
+    after { user.clear }
 
     it "should have a default provider inheriting from Puppet::Provider" do
-        test_provider_class Puppet::Type.type(:user).defaultprovider
+        user.defaultprovider.ancestors.should be_include(Puppet::Provider)
     end
 
     it "should be able to create a instance" do
-        mkuser "123testuser1"
+        user.create(:name => "foo").should_not be_nil
     end
-end
-
-describe Puppet::Type.type(:user), "instances" do
 
-    include UserTestFunctions
+    describe "instances" do
 
-    it "should have a valid provider" do
-        user = mkuser "123testuser2"
-        user.provider.should_not be_nil
-        test_provider_class user.provider.class
+        it "should have a valid provider" do
+            user.create(:name => "foo").provider.class.ancestors.should be_include(Puppet::Provider)
+        end
     end
-
 end
-
-