Merge branch 'master' of git://reductivelabs.com/puppet into routing

3 files changed, 58 insertions, 14 deletions

diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb
index 9dd07f31a..63eb87896 100644
--- a/lib/puppet/parser/collector.rb
+++ b/lib/puppet/parser/collector.rb
@@ -16,7 +16,6 @@ class Puppet::Parser::Collector
             method = "collect_#{@form.to_s}"
             objects = send(method).each do |obj|
                 obj.virtual = false
-                obj.exported = false if form == :exported
             end
             if objects.empty?
                 return false
diff --git a/spec/unit/parser/collector.rb b/spec/unit/parser/collector.rb
index c0e5f2298..450176f30 100755
--- a/spec/unit/parser/collector.rb
+++ b/spec/unit/parser/collector.rb
@@ -243,19 +243,6 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do
         @collector.evaluate.should == [one, two]
     end
 
-    it "should mark all returned resources as not exported" do
-        stub_rails(true)
-
-        one = stub 'one', :type => "Mytype", :virtual? => true, :exported? => true
-
-        one.expects(:exported=).with(false)
-        one.stubs(:virtual=)
-
-        @compile.expects(:resources).returns([one])
-
-        @collector.evaluate.should == [one]
-    end
-
     it "should mark all returned resources as not virtual" do
         stub_rails(true)
 
diff --git a/spec/unit/ral/types/user.rb b/spec/unit/ral/types/user.rb
new file mode 100755
index 000000000..4e43a8ceb
--- /dev/null
+++ b/spec/unit/ral/types/user.rb
@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/type/user'
+
+module UserTestFunctions
+    def mkuser(name)
+        user = nil;
+        lambda {
+            user = Puppet::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::User do
+
+    include UserTestFunctions
+
+    it "should have a default provider inheriting from Puppet::Provider" do
+        test_provider_class Puppet::Type::User.defaultprovider
+    end
+
+    it "should be able to create a instance" do
+        mkuser "123testuser1"
+    end
+end
+
+describe Puppet::Type::User, "instances" do
+
+    include UserTestFunctions
+
+    it "should have a valid provider" do
+        user = mkuser "123testuser2"
+        user.provider.should_not be_nil
+        test_provider_class user.provider.class
+    end
+
+end
+
+