puppet 5.5.22-x64-mingw32 → 6.0.0-x64-mingw32

data/spec/unit/type/user_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+#! /usr/bin/env ruby
+# encoding: UTF-8
 require 'spec_helper'
 
 describe Puppet::Type.type(:user) do
@@ -12,7 +13,7 @@ describe Puppet::Type.type(:user) do
       def flush; end
       def self.instances; []; end
     end
-    allow(described_class).to receive(:defaultprovider).and_return(@provider_class)
+    described_class.stubs(:defaultprovider).returns @provider_class
   end
 
   it "should be able to create an instance" do
@@ -64,12 +65,12 @@ describe Puppet::Type.type(:user) do
     end
 
     it "cannot be set to true for a provider that does not manage homedirs" do
-      allow(provider.class).to receive(:manages_homedir?).and_return(false)
+      provider.class.stubs(:manages_homedir?).returns false
       expect { instance[:managehome] = 'yes' }.to raise_error(Puppet::Error, /can not manage home directories/)
     end
 
     it "can be set to true for a provider that does manage homedirs" do
-      allow(provider.class).to receive(:manages_homedir?).and_return(true)
+      provider.class.stubs(:manages_homedir?).returns true
       instance[:managehome] = 'yes'
     end
   end
@@ -126,8 +127,8 @@ describe Puppet::Type.type(:user) do
     end
 
     it "should set all values to :absent if the user is absent" do
-      expect(@user.property(:ensure)).to receive(:retrieve).and_return(:absent)
-      expect(@user.property(:uid)).not_to receive(:retrieve)
+      @user.property(:ensure).expects(:retrieve).returns :absent
+      @user.property(:uid).expects(:retrieve).never
       expect(@user.retrieve[@user.property(:uid)]).to eq(:absent)
     end
 
@@ -147,13 +148,13 @@ describe Puppet::Type.type(:user) do
 
     it "should call :create on the provider when asked to sync to the :present state" do
       @provider = @provider_class.new(:name => 'foo', :ensure => :absent)
-      expect(@provider).to receive(:create)
+      @provider.expects(:create)
       described_class.new(:name => 'foo', :ensure => :present, :provider => @provider).parameter(:ensure).sync
     end
 
     it "should call :delete on the provider when asked to sync to the :absent state" do
       @provider = @provider_class.new(:name => 'foo', :ensure => :present)
-      expect(@provider).to receive(:delete)
+      @provider.expects(:delete)
       described_class.new(:name => 'foo', :ensure => :absent, :provider => @provider).parameter(:ensure).sync
     end
 
@@ -211,27 +212,27 @@ describe Puppet::Type.type(:user) do
       end
 
       it "should return true if any of the specified groups are equal to the current integer" do
-        expect(Puppet::Util).to receive(:gid).with("foo").and_return(300)
-        expect(Puppet::Util).to receive(:gid).with("bar").and_return(500)
+        Puppet::Util.expects(:gid).with("foo").returns 300
+        Puppet::Util.expects(:gid).with("bar").returns 500
         expect(described_class.new(:name => 'baz', :gid => [ 'foo', 'bar' ]).parameter(:gid)).to be_safe_insync(500)
       end
 
       it "should return false if none of the specified groups are equal to the current integer" do
-        expect(Puppet::Util).to receive(:gid).with("foo").and_return(300)
-        expect(Puppet::Util).to receive(:gid).with("bar").and_return(500)
+        Puppet::Util.expects(:gid).with("foo").returns 300
+        Puppet::Util.expects(:gid).with("bar").returns 500
         expect(described_class.new(:name => 'baz', :gid => [ 'foo', 'bar' ]).parameter(:gid)).to_not be_safe_insync(700)
       end
     end
 
     describe "when syncing" do
       it "should use the first found, specified group as the desired value and send it to the provider" do
-        expect(Puppet::Util).to receive(:gid).with("foo").and_return(nil)
-        expect(Puppet::Util).to receive(:gid).with("bar").and_return(500)
+        Puppet::Util.expects(:gid).with("foo").returns nil
+        Puppet::Util.expects(:gid).with("bar").returns 500
 
         @provider = @provider_class.new(:name => 'foo')
         resource = described_class.new(:name => 'foo', :provider => @provider, :gid => [ 'foo', 'bar' ])
 
-        expect(@provider).to receive(:gid=).with(500)
+        @provider.expects(:gid=).with 500
         resource.parameter(:gid).sync
       end
     end
@@ -256,6 +257,7 @@ describe Puppet::Type.type(:user) do
     end
 
     describe "when testing is in sync" do
+
       before :each do
         # the useradd provider uses a single string to represent groups and so does Puppet::Property::List when converting to should values
         @provider = @provider_class.new(:name => 'foo', :groups => 'a,b,e,f')
@@ -364,7 +366,7 @@ describe Puppet::Type.type(:user) do
         # useradd subclasses nameservice and thus inherits #comments_insync?
         user = described_class.new(:name => 'foo', :comment => @value, :provider => :useradd)
         comment_property = user.properties.find {|p| p.name == :comment}
-        expect(user.provider).to receive(:comments_insync?)
+        user.provider.expects(:comments_insync?)
         comment_property.insync?('bar')
       end
 
@@ -372,7 +374,6 @@ describe Puppet::Type.type(:user) do
         let(:is) { "\u2603" }
         let(:should) { "\u06FF" }
         let(:comment_property) { @user.properties.find { |p| p.name == :comment } }
-
         context "given is and should strings with incompatible encoding" do
           it "should return a formatted string" do
             is.force_encoding(Encoding::ASCII_8BIT)
@@ -408,7 +409,7 @@ describe Puppet::Type.type(:user) do
       Puppet::Resource::Catalog.new :testing do |conf|
         [testuser, testrole].each { |resource| conf.add_resource resource }
       end
-      allow(Puppet::Type::User::ProviderDirectoryservice).to receive(:get_macosx_version_major).and_return("10.5")
+      Puppet::Type::User::ProviderDirectoryservice.stubs(:get_macosx_version_major).returns "10.5"
 
       rel = testuser.autorequire[0]
       expect(rel.source.ref).to eq(testrole.ref)
@@ -430,15 +431,15 @@ describe Puppet::Type.type(:user) do
         def check_valid_shell; end
       end
 
-      allow(described_class).to receive(:defaultprovider).and_return(@shell_provider_class)
+      described_class.stubs(:defaultprovider).returns @shell_provider_class
     end
 
     it "should call :check_valid_shell on the provider when changing shell value" do
       @provider = @shell_provider_class.new(:name => 'foo', :shell => '/bin/bash', :ensure => :present)
-      expect(@provider).to receive(:check_valid_shell)
+      @provider.expects(:check_valid_shell)
       resource = described_class.new(:name => 'foo', :shell => '/bin/zsh', :provider => @provider)
-      allow(Puppet::Util::Storage).to receive(:load)
-      allow(Puppet::Util::Storage).to receive(:store)
+      Puppet::Util::Storage.stubs(:load)
+      Puppet::Util::Storage.stubs(:store)
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
       catalog.apply
@@ -446,135 +447,13 @@ describe Puppet::Type.type(:user) do
 
     it "should call :check_valid_shell on the provider when changing ensure from present to absent" do
       @provider = @shell_provider_class.new(:name => 'foo', :shell => '/bin/bash', :ensure => :absent)
-      expect(@provider).to receive(:check_valid_shell)
+      @provider.expects(:check_valid_shell)
       resource = described_class.new(:name => 'foo', :shell => '/bin/zsh', :provider => @provider)
-      allow(Puppet::Util::Storage).to receive(:load)
-      allow(Puppet::Util::Storage).to receive(:store)
+      Puppet::Util::Storage.stubs(:load)
+      Puppet::Util::Storage.stubs(:store)
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
       catalog.apply
     end
   end
-
-  describe "when purging ssh keys" do
-    it "should not accept a keyfile with a relative path" do
-      expect {
-        described_class.new(:name => "a", :purge_ssh_keys => "keys")
-      }.to raise_error(Puppet::Error, /Paths to keyfiles must be absolute, not keys/)
-    end
-
-    context "with a home directory specified" do
-      it "should accept true" do
-        described_class.new(:name => "a", :home => "/tmp", :purge_ssh_keys => true)
-      end
-
-      it "should accept the ~ wildcard" do
-        described_class.new(:name => "a", :home => "/tmp", :purge_ssh_keys => "~/keys")
-      end
-
-      it "should accept the %h wildcard" do
-        described_class.new(:name => "a", :home => "/tmp", :purge_ssh_keys => "%h/keys")
-      end
-
-      it "raises when given a relative path" do
-        expect {
-          described_class.new(:name => "a", :home => "/tmp", :purge_ssh_keys => "keys")
-        }.to raise_error(Puppet::Error, /Paths to keyfiles must be absolute/)
-      end
-    end
-
-    context "with no home directory specified" do
-      before(:each) do
-        allow(Dir).to receive(:home).with('a').and_return('/home/a')
-      end
-
-      it "should accept true" do
-        described_class.new(:name => "a", :purge_ssh_keys => true)
-      end
-
-      it "should accept the ~ wildcard" do
-        described_class.new(:name => "a", :purge_ssh_keys => "~/keys")
-      end
-
-      it "should accept the %h wildcard" do
-        described_class.new(:name => "a", :purge_ssh_keys => "%h/keys")
-      end
-    end
-
-    context "with a valid parameter" do
-      let(:paths) do
-        [ "/dev/null", "/tmp/keyfile" ].map { |path| File.expand_path(path) }
-      end
-
-      before(:each) do
-        allow(Dir).to receive(:home).with('test').and_return('/home/test')
-      end
-
-      subject do
-        res = described_class.new(:name => "test", :purge_ssh_keys => paths)
-        res.catalog = Puppet::Resource::Catalog.new
-        res
-      end
-
-      it "should not just return from generate" do
-        expect(subject).to receive(:find_unmanaged_keys)
-        subject.generate
-      end
-
-      it "should check each keyfile for readability" do
-        paths.each do |path|
-          expect(File).to receive(:readable?).with(path)
-        end
-        subject.generate
-      end
-    end
-
-    describe "generated keys" do
-      subject do
-        res = described_class.new(:name => "test_user_name", :purge_ssh_keys => purge_param)
-        res.catalog = Puppet::Resource::Catalog.new
-        res
-      end
-
-      before(:each) do
-        allow(Dir).to receive(:home).with('test_user_name').and_return('/home/test_user_name')
-      end
-
-      context "when purging is disabled" do
-        let(:purge_param) { false }
-
-        its(:generate) { should be_empty }
-      end
-
-      context "when purging is enabled" do
-        let(:purge_param) { my_fixture('authorized_keys') }
-        let(:resources) { subject.generate }
-
-        it "should contain a resource for each key" do
-          names = resources.collect { |res| res.name }
-          expect(names).to include("key1 name")
-          expect(names).to include("keyname2")
-        end
-
-        it "should not include keys in comment lines" do
-          names = resources.collect { |res| res.name }
-          expect(names).not_to include("keyname3")
-        end
-
-        it "should generate names for unnamed keys" do
-          names = resources.collect { |res| res.name }
-          fixture_path = File.join(my_fixture_dir, 'authorized_keys')
-          expect(names).to include("#{fixture_path}:unnamed-1")
-        end
-
-        it "should each have a value for the user property" do
-          expect(resources.map { |res|
-            res[:user]
-          }.reject { |user_name|
-            user_name == "test_user_name"
-          }).to be_empty
-        end
-      end
-    end
-  end
 end

data/spec/unit/type/whit_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 whit = Puppet::Type.type(:whit)

data/spec/unit/type_spec.rb

@@ -1,10 +1,45 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
+require 'puppet/property/boolean'
+
+Puppet::Type.newtype(:type_test) do
+  ensurable
+  newparam(:name, isnamevar: true)
+  newproperty(:device)
+  newproperty(:blockdevice)
+  newproperty(:fstype)
+  newproperty(:options)
+  newproperty(:pass)
+  newproperty(:atboot, parent: Puppet::Property::Boolean) do
+    def munge(value)
+      munged = super
+      if munged
+        :yes
+      else
+        :no
+      end
+    end
+  end
+  newparam(:remounts) do
+    newvalues(:true, :false)
+    defaultto do
+      true
+    end
+  end
+end
+Puppet::Type.type(:type_test).provide(:type_test) do
+  mk_resource_methods
+end
 
-describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
   include PuppetSpec::Files
   include PuppetSpec::Compiler
 
+  let(:resource_type) { :type_test }
+  let(:klass) { Puppet::Type.type(resource_type) }
+  let(:ref_type) { klass.name.to_s.capitalize }
+
   it "should be Comparable" do
     a = Puppet::Type.type(:notify).new(:name => "a")
     b = Puppet::Type.type(:notify).new(:name => "b")
@@ -28,34 +63,34 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
   end
 
   it "should consider a parameter to be valid if it is a valid parameter" do
-    expect(Puppet::Type.type(:mount)).to be_valid_parameter(:name)
+    expect(klass).to be_valid_parameter(:name)
   end
 
   it "should consider a parameter to be valid if it is a valid property" do
-    expect(Puppet::Type.type(:mount)).to be_valid_parameter(:fstype)
+    expect(klass).to be_valid_parameter(:fstype)
   end
 
   it "should consider a parameter to be valid if it is a valid metaparam" do
-    expect(Puppet::Type.type(:mount)).to be_valid_parameter(:noop)
+    expect(klass).to be_valid_parameter(:noop)
   end
 
   it "should be able to retrieve a property by name" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
-    expect(resource.property(:fstype)).to be_instance_of(Puppet::Type.type(:mount).attrclass(:fstype))
+    resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
+    expect(resource.property(:fstype)).to be_instance_of(klass.attrclass(:fstype))
   end
 
   it "should be able to retrieve a parameter by name" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
-    expect(resource.parameter(:name)).to be_instance_of(Puppet::Type.type(:mount).attrclass(:name))
+    resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
+    expect(resource.parameter(:name)).to be_instance_of(klass.attrclass(:name))
   end
 
   it "should be able to retrieve a property by name using the :parameter method" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
-    expect(resource.parameter(:fstype)).to be_instance_of(Puppet::Type.type(:mount).attrclass(:fstype))
+    resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
+    expect(resource.parameter(:fstype)).to be_instance_of(klass.attrclass(:fstype))
   end
 
   it "should be able to retrieve all set properties" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
+    resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
     props = resource.properties
     expect(props).not_to be_include(nil)
     [:fstype, :ensure, :pass].each do |name|
@@ -64,15 +99,15 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
   end
 
   it "can retrieve all set parameters" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present, :tag => 'foo')
+    resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present, :tag => 'foo')
     params = resource.parameters_with_value
-    [:name, :provider, :ensure, :fstype, :pass, :dump, :target, :loglevel, :tag].each do |name|
+    [:name, :provider, :ensure, :fstype, :pass, :loglevel, :tag].each do |name|
       expect(params).to be_include(resource.parameter(name))
     end
   end
 
   it "can not return any `nil` values when retrieving all set parameters" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present, :tag => 'foo')
+    resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present, :tag => 'foo')
     params = resource.parameters_with_value
     expect(params).not_to be_include(nil)
   end
@@ -86,49 +121,49 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
   end
 
   it "should have a method for setting default values for resources" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo")).to respond_to(:set_default)
+    expect(klass.new(:name => "foo")).to respond_to(:set_default)
   end
 
   it "should do nothing for attributes that have no defaults and no specified value" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo").parameter(:noop)).to be_nil
+    expect(klass.new(:name => "foo").parameter(:noop)).to be_nil
   end
 
   it "should have a method for adding tags" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo")).to respond_to(:tags)
+    expect(klass.new(:name => "foo")).to respond_to(:tags)
   end
 
   it "should use the tagging module" do
-    expect(Puppet::Type.type(:mount).ancestors).to be_include(Puppet::Util::Tagging)
+    expect(klass.ancestors).to be_include(Puppet::Util::Tagging)
   end
 
   it "should delegate to the tagging module when tags are added" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo")
-    allow(resource).to receive(:tag).with(:mount)
+    resource = klass.new(:name => "foo")
+    resource.stubs(:tag).with(resource_type)
 
-    expect(resource).to receive(:tag).with(:tag1, :tag2)
+    resource.expects(:tag).with(:tag1, :tag2)
 
     resource.tags = [:tag1,:tag2]
   end
 
   it "should add the current type as tag" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo")
-    allow(resource).to receive(:tag)
+    resource = klass.new(:name => "foo")
+    resource.stubs(:tag)
 
-    expect(resource).to receive(:tag).with(:mount)
+    resource.expects(:tag).with(resource_type)
 
     resource.tags = [:tag1,:tag2]
   end
 
   it "should have a method to know if the resource is exported" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo")).to respond_to(:exported?)
+    expect(klass.new(:name => "foo")).to respond_to(:exported?)
   end
 
   it "should have a method to know if the resource is virtual" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo")).to respond_to(:virtual?)
+    expect(klass.new(:name => "foo")).to respond_to(:virtual?)
   end
 
   it "should consider its version to be zero if it has no catalog" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo").version).to eq(0)
+    expect(klass.new(:name => "foo").version).to eq(0)
   end
 
   it "reports the correct path even after path is used during setup of the type" do
@@ -163,7 +198,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
   context "resource attributes" do
     let(:resource) {
-      resource = Puppet::Type.type(:mount).new(:name => "foo")
+      resource = klass.new(:name => "foo")
       catalog = Puppet::Resource::Catalog.new
       catalog.version = 50
       catalog.add_resource resource
@@ -175,30 +210,30 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should have tags" do
-      expect(resource).to be_tagged("mount")
+      expect(resource).to be_tagged(resource_type.to_s)
       expect(resource).to be_tagged("foo")
     end
 
     it "should have a path" do
-      expect(resource.path).to eq("/Mount[foo]")
+      expect(resource.path).to eq("/#{ref_type}[foo]")
     end
   end
 
   it "should consider its type to be the name of its class" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo").type).to eq(:mount)
+    expect(klass.new(:name => "foo").type).to eq(resource_type)
   end
 
   it "should use any provided noop value" do
-    expect(Puppet::Type.type(:mount).new(:name => "foo", :noop => true)).to be_noop
+    expect(klass.new(:name => "foo", :noop => true)).to be_noop
   end
 
   it "should use the global noop value if none is provided" do
     Puppet[:noop] = true
-    expect(Puppet::Type.type(:mount).new(:name => "foo")).to be_noop
+    expect(klass.new(:name => "foo")).to be_noop
   end
 
   it "should not be noop if in a non-host_config catalog" do
-    resource = Puppet::Type.type(:mount).new(:name => "foo")
+    resource = klass.new(:name => "foo")
     catalog = Puppet::Resource::Catalog.new
     catalog.add_resource resource
     expect(resource).not_to be_noop
@@ -206,11 +241,11 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
   describe "when creating an event" do
     before do
-      @resource = Puppet::Type.type(:mount).new :name => "foo"
+      @resource = klass.new :name => "foo"
     end
 
     it "should have the resource's reference as the resource" do
-      expect(@resource.event.resource).to eq("Mount[foo]")
+      expect(@resource.event.resource).to eq("#{ref_type}[foo]")
     end
 
     it "should have the resource's log level as the default log level" do
@@ -220,7 +255,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
     {:file => "/my/file", :line => 50}.each do |attr, value|
       it "should set the #{attr}" do
-        allow(@resource).to receive(attr).and_return(value)
+        @resource.stubs(attr).returns value
         expect(@resource.event.send(attr)).to eq(value)
       end
     end
@@ -359,8 +394,8 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       basic = type.provide(:basic) {}
       greater = type.provide(:greater) {}
 
-      allow(basic).to receive(:specificity).and_return(1)
-      allow(greater).to receive(:specificity).and_return(2)
+      basic.stubs(:specificity).returns 1
+      greater.stubs(:specificity).returns 2
 
       expect(type.defaultprovider).to equal(greater)
     end
@@ -523,87 +558,87 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
   describe "when initializing" do
     describe "and passed a Puppet::Resource instance" do
       it "should set its title to the title of the resource if the resource type is equal to the current type" do
-        resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "/other"})
-        expect(Puppet::Type.type(:mount).new(resource).title).to eq("/foo")
+        resource = Puppet::Resource.new(resource_type, "/foo", :parameters => {:name => "/other"})
+        expect(klass.new(resource).title).to eq("/foo")
       end
 
       it "should set its title to the resource reference if the resource type is not equal to the current type" do
         resource = Puppet::Resource.new(:user, "foo")
-        expect(Puppet::Type.type(:mount).new(resource).title).to eq("User[foo]")
+        expect(klass.new(resource).title).to eq("User[foo]")
       end
 
       [:line, :file, :catalog, :exported, :virtual].each do |param|
         it "should copy '#{param}' from the resource if present" do
-          resource = Puppet::Resource.new(:mount, "/foo")
+          resource = Puppet::Resource.new(resource_type, "/foo")
           resource.send(param.to_s + "=", "foo")
           resource.send(param.to_s + "=", "foo")
-          expect(Puppet::Type.type(:mount).new(resource).send(param)).to eq("foo")
+          expect(klass.new(resource).send(param)).to eq("foo")
         end
       end
 
       it "should copy any tags from the resource" do
-        resource = Puppet::Resource.new(:mount, "/foo")
+        resource = Puppet::Resource.new(resource_type, "/foo")
         resource.tag "one", "two"
-        tags = Puppet::Type.type(:mount).new(resource).tags
+        tags = klass.new(resource).tags
         expect(tags).to be_include("one")
         expect(tags).to be_include("two")
       end
 
       it "should copy the resource's parameters as its own" do
-        resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:atboot => :yes, :fstype => "boo"})
-        params = Puppet::Type.type(:mount).new(resource).to_hash
+        resource = Puppet::Resource.new(resource_type, "/foo", :parameters => {:atboot => :yes, :fstype => "boo"})
+        params = klass.new(resource).to_hash
         expect(params[:fstype]).to eq("boo")
         expect(params[:atboot]).to eq(:yes)
       end
 
       it "copies sensitive parameters to the appropriate properties" do
-        resource = Puppet::Resource.new(:mount, "/foo",
+        resource = Puppet::Resource.new(resource_type, "/foo",
                                         :parameters => {:atboot => :yes, :fstype => "boo"},
                                         :sensitive_parameters => [:fstype])
-        type = Puppet::Type.type(:mount).new(resource)
+        type = klass.new(resource)
         expect(type.property(:fstype).sensitive).to eq true
       end
 
       it "logs a warning when a parameter is marked as sensitive" do
-        resource = Puppet::Resource.new(:mount, "/foo",
+        resource = Puppet::Resource.new(resource_type, "/foo",
                                         :parameters => {:atboot => :yes, :fstype => "boo", :remounts => true},
                                         :sensitive_parameters => [:remounts])
-        expect_any_instance_of(Puppet::Type.type(:mount)).to receive(:warning).with(/Unable to mark 'remounts' as sensitive: remounts is a parameter and not a property/)
-        Puppet::Type.type(:mount).new(resource)
+        klass.any_instance.expects(:warning).with(regexp_matches(/Unable to mark 'remounts' as sensitive: remounts is a parameter and not a property/))
+        klass.new(resource)
       end
 
       it "logs a warning when a property is not set but is marked as sensitive" do
-        resource = Puppet::Resource.new(:mount, "/foo",
+        resource = Puppet::Resource.new(resource_type, "/foo",
                                         :parameters => {:atboot => :yes, :fstype => "boo"},
                                         :sensitive_parameters => [:device])
-        expect_any_instance_of(Puppet::Type.type(:mount)).to receive(:warning).with("Unable to mark 'device' as sensitive: the property itself was not assigned a value.")
-        Puppet::Type.type(:mount).new(resource)
+        klass.any_instance.expects(:warning).with("Unable to mark 'device' as sensitive: the property itself was not assigned a value.")
+        klass.new(resource)
       end
 
       it "logs an error when a property is not defined on the type but is marked as sensitive" do
-        resource = Puppet::Resource.new(:mount, "/foo",
+        resource = Puppet::Resource.new(resource_type, "/foo",
                                         :parameters => {:atboot => :yes, :fstype => "boo"},
                                         :sensitive_parameters => [:content])
-        expect_any_instance_of(Puppet::Type.type(:mount)).to receive(:err).with("Unable to mark 'content' as sensitive: the property itself is not defined on mount.")
-        Puppet::Type.type(:mount).new(resource)
+        klass.any_instance.expects(:err).with("Unable to mark 'content' as sensitive: the property itself is not defined on #{resource_type}.")
+        klass.new(resource)
       end
     end
 
     describe "and passed a Hash" do
       it "should extract the title from the hash" do
-        expect(Puppet::Type.type(:mount).new(:title => "/yay").title).to eq("/yay")
+        expect(klass.new(:title => "/yay").title).to eq("/yay")
       end
 
       it "should work when hash keys are provided as strings" do
-        expect(Puppet::Type.type(:mount).new("title" => "/yay").title).to eq("/yay")
+        expect(klass.new("title" => "/yay").title).to eq("/yay")
       end
 
       it "should work when hash keys are provided as symbols" do
-        expect(Puppet::Type.type(:mount).new(:title => "/yay").title).to eq("/yay")
+        expect(klass.new(:title => "/yay").title).to eq("/yay")
       end
 
       it "should use the name from the hash as the title if no explicit title is provided" do
-        expect(Puppet::Type.type(:mount).new(:name => "/yay").title).to eq("/yay")
+        expect(klass.new(:name => "/yay").title).to eq("/yay")
       end
 
       it "should use the Resource Type's namevar to determine how to find the name in the hash" do
@@ -613,19 +648,19 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
       [:catalog].each do |param|
         it "should extract '#{param}' from the hash if present" do
-          expect(Puppet::Type.type(:mount).new(:name => "/yay", param => "foo").send(param)).to eq("foo")
+          expect(klass.new(:name => "/yay", param => "foo").send(param)).to eq("foo")
         end
       end
 
       it "should use any remaining hash keys as its parameters" do
-        resource = Puppet::Type.type(:mount).new(:title => "/foo", :catalog => "foo", :atboot => :yes, :fstype => "boo")
+        resource = klass.new(:title => "/foo", :catalog => "foo", :atboot => :yes, :fstype => "boo")
         expect(resource[:fstype]).to eq("boo")
         expect(resource[:atboot]).to eq(:yes)
       end
     end
 
     it "should fail if any invalid attributes have been provided" do
-      expect { Puppet::Type.type(:mount).new(:title => "/foo", :nosuchattr => "whatever") }.to raise_error(Puppet::Error, /no parameter named 'nosuchattr'/)
+      expect { klass.new(:title => "/foo", :nosuchattr => "whatever") }.to raise_error(Puppet::Error, /no parameter named 'nosuchattr'/)
     end
 
     context "when an attribute fails validation" do
@@ -638,59 +673,65 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should include the file/line in the error" do
-        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return("example.pp")
-        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(42)
+        Puppet::Type.type(:file).any_instance.stubs(:file).returns("example.pp")
+        Puppet::Type.type(:file).any_instance.stubs(:line).returns(42)
         expect { Puppet::Type.type(:file).new(:title => "/foo", :source => "unknown:///") }.to raise_error(Puppet::ResourceError, /\(file: example\.pp, line: 42\)/)
       end
     end
 
     it "should set its name to the resource's title if the resource does not have a :name or namevar parameter set" do
-      resource = Puppet::Resource.new(:mount, "/foo")
+      resource = Puppet::Resource.new(resource_type, "/foo")
 
-      expect(Puppet::Type.type(:mount).new(resource).name).to eq("/foo")
+      expect(klass.new(resource).name).to eq("/foo")
     end
 
     it "should fail if no title, name, or namevar are provided" do
-      expect { Puppet::Type.type(:mount).new(:atboot => :yes) }.to raise_error(Puppet::Error)
+      expect { klass.new(:atboot => :yes) }.to raise_error(Puppet::Error)
     end
 
     it "should set the attributes in the order returned by the class's :allattrs method" do
-      allow(Puppet::Type.type(:mount)).to receive(:allattrs).and_return([:name, :atboot, :noop])
-      resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => :yes, :noop => "whatever"})
+      klass.stubs(:allattrs).returns([:name, :atboot, :noop])
+      resource = Puppet::Resource.new(resource_type, "/foo", :parameters => {:name => "myname", :atboot => :yes, :noop => "whatever"})
 
       set = []
 
-      allow_any_instance_of(Puppet::Type.type(:mount)).to receive(:newattr) do |_, param, hash|
+      klass.any_instance.stubs(:newattr).with do |param, hash|
         set << param
-        double("a property", :value= => nil, :default => nil, :name => nil)
-      end
+        true
+      end.returns(stub_everything("a property"))
 
-      Puppet::Type.type(:mount).new(resource)
+      klass.new(resource)
 
       expect(set[-1]).to eq(:noop)
       expect(set[-2]).to eq(:atboot)
     end
 
     it "should always set the name and then default provider before anything else" do
-      allow(Puppet::Type.type(:mount)).to receive(:allattrs).and_return([:provider, :name, :atboot])
-      resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name => "myname", :atboot => :yes})
+      klass.stubs(:allattrs).returns([:provider, :name, :atboot])
+      resource = Puppet::Resource.new(resource_type, "/foo", :parameters => {:name => "myname", :atboot => :yes})
 
       set = []
 
-      allow_any_instance_of(Puppet::Type.type(:mount)).to receive(:newattr) do |_, param, hash|
+      klass.any_instance.stubs(:newattr).with do |param, hash|
         set << param
-        double("a property", :value= => nil, :default => nil, :name => nil)
-      end
+        true
+      end.returns(stub_everything("a property"))
 
-      Puppet::Type.type(:mount).new(resource)
+      klass.new(resource)
       expect(set[0]).to eq(:name)
       expect(set[1]).to eq(:provider)
     end
 
     # This one is really hard to test :/
     it "should set each default immediately if no value is provided" do
+      # We have a :confine block that calls execute in our upstart provider, which fails
+      # on jruby. Thus, we stub it out here since we don't care to do any assertions on it.
+      # This is only an issue if you're running these unit tests on a platform where upstart
+      # is a default provider, like Ubuntu trusty.
+      Puppet::Util::Execution.stubs(:execute)
+
       defaults = []
-      allow_any_instance_of(Puppet::Type.type(:service)).to receive(:set_default) { |_, value| defaults << value }
+      Puppet::Type.type(:service).any_instance.stubs(:set_default).with { |value| defaults << value; true }
 
       Puppet::Type.type(:service).new :name => "whatever"
 
@@ -698,7 +739,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should retain a copy of the originally provided parameters" do
-      expect(Puppet::Type.type(:mount).new(:name => "foo", :atboot => :yes, :noop => false).original_parameters).to eq({:atboot => :yes, :noop => false})
+      expect(klass.new(:name => "foo", :atboot => :yes, :noop => false).original_parameters).to eq({:atboot => :yes, :noop => false})
     end
 
     it "should delete the name via the namevar from the originally provided parameters" do
@@ -707,7 +748,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
     context "when validating the resource" do
       it "should call the type's validate method if present" do
-        expect_any_instance_of(Puppet::Type.type(:file)).to receive(:validate)
+        Puppet::Type.type(:file).any_instance.expects(:validate)
         Puppet::Type.type(:file).new(:name => make_absolute('/foo'))
       end
 
@@ -722,8 +763,8 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should raise Puppet::ResourceError with manifest file and line on failure" do
-        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return("example.pp")
-        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(42)
+        Puppet::Type.type(:file).any_instance.stubs(:file).returns("example.pp")
+        Puppet::Type.type(:file).any_instance.stubs(:line).returns(42)
         expect do
           Puppet::Type.type(:file).new(
             :name => make_absolute('/foo'),
@@ -798,12 +839,12 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
   end
 
   it "should have a class method for converting a hash into a Puppet::Resource instance" do
-    expect(Puppet::Type.type(:mount)).to respond_to(:hash2resource)
+    expect(klass).to respond_to(:hash2resource)
   end
 
   describe "when converting a hash to a Puppet::Resource instance" do
     before do
-      @type = Puppet::Type.type(:mount)
+      @type = klass
     end
 
     it "should treat a :title key as the title of the resource" do
@@ -815,7 +856,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should use the Resource Type's namevar to determine how to find the name in the hash" do
-      allow(@type).to receive(:key_attributes).and_return([ :myname ])
+      @type.stubs(:key_attributes).returns([ :myname ])
 
       expect(@type.hash2resource(:myname => "foo").title).to eq("foo")
     end
@@ -848,34 +889,34 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
   describe "when retrieving current property values" do
     before do
-      @resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
-      allow(@resource.property(:ensure)).to receive(:retrieve).and_return(:absent)
+      @resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
+      @resource.property(:ensure).stubs(:retrieve).returns :absent
     end
 
     it "should always retrieve the ensure value by default" do
       @ensurable_resource = Puppet::Type.type(:file).new(:name => "/not/existent", :mode => "0644")
-      allow(Puppet::Type::File::Ensure).to receive(:ensure).and_return(:absent)
-      expect_any_instance_of(Puppet::Type::File::Ensure).to receive(:retrieve).once
+      Puppet::Type::File::Ensure.stubs(:ensure).returns :absent
+      Puppet::Type::File::Ensure.any_instance.expects(:retrieve).once
       @ensurable_resource.retrieve_resource
     end
 
     it "should not retrieve the ensure value if specified" do
       @ensurable_resource = Puppet::Type.type(:service).new(:name => "DummyService", :enable => true)
-      @ensurable_resource.properties.each { |prop| allow(prop).to receive(:retrieve) }
-      expect_any_instance_of(Puppet::Type::Service::Ensure).not_to receive(:retrieve)
+      @ensurable_resource.properties.each { |prop| prop.stubs(:retrieve) }
+      Puppet::Type::Service::Ensure.any_instance.expects(:retrieve).never
       @ensurable_resource.retrieve_resource
     end
 
     it "should fail if its provider is unsuitable" do
-      @resource = Puppet::Type.type(:mount).new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
-      expect(@resource.provider.class).to receive(:suitable?).and_return(false)
+      @resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
+      @resource.provider.class.expects(:suitable?).returns false
       expect { @resource.retrieve_resource }.to raise_error(Puppet::Error)
     end
 
     it "should return a Puppet::Resource instance with its type and title set appropriately" do
       result = @resource.retrieve_resource
       expect(result).to be_instance_of(Puppet::Resource)
-      expect(result.type).to eq("Mount")
+      expect(result.type).to eq(ref_type)
       expect(result.title).to eq("foo")
     end
 
@@ -895,21 +936,21 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should not call retrieve on non-ensure properties if the resource is absent and should consider the property absent" do
-      expect(@resource.property(:ensure)).to receive(:retrieve).and_return(:absent)
-      expect(@resource.property(:fstype)).not_to receive(:retrieve)
+      @resource.property(:ensure).expects(:retrieve).returns :absent
+      @resource.property(:fstype).expects(:retrieve).never
       expect(@resource.retrieve_resource[:fstype]).to eq(:absent)
     end
 
     it "should include the result of retrieving each property's current value if the resource is present" do
-      expect(@resource.property(:ensure)).to receive(:retrieve).and_return(:present)
-      expect(@resource.property(:fstype)).to receive(:retrieve).and_return(15)
+      @resource.property(:ensure).expects(:retrieve).returns :present
+      @resource.property(:fstype).expects(:retrieve).returns 15
       @resource.retrieve_resource[:fstype] == 15
     end
   end
 
   describe "#to_resource" do
     it "should return a Puppet::Resource that includes properties, parameters and tags" do
-      type_resource = Puppet::Type.type(:mount).new(
+      type_resource = klass.new(
         :ensure   => :present,
         :name     => "foo",
         :fstype   => "bar",
@@ -921,15 +962,15 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       expect(type_resource.parameters[:remounts]).not_to be_a(Puppet::Property)
       expect(type_resource.parameters[:fstype].is_a?(Puppet::Property)).to be_truthy
 
-      expect(type_resource.property(:ensure)).to receive(:retrieve).and_return(:present)
-      expect(type_resource.property(:fstype)).to receive(:retrieve).and_return(15)
+      type_resource.property(:ensure).expects(:retrieve).returns :present
+      type_resource.property(:fstype).expects(:retrieve).returns 15
 
       resource = type_resource.to_resource
 
       expect(resource).to be_a Puppet::Resource
       expect(resource[:fstype]).to   eq(15)
       expect(resource[:remounts]).to eq(:true)
-      expect(resource.tags).to eq(Puppet::Util::TagSet.new(%w{foo bar baz mount}))
+      expect(resource.tags).to eq(Puppet::Util::TagSet.new(%w{foo bar baz} + [resource_type.to_s]))
     end
   end
 
@@ -937,7 +978,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     describe "when there's one namevar" do
       before do
         @type_class = Puppet::Type.type(:notify)
-        allow(@type_class).to receive(:key_attributes).and_return([:one])
+        @type_class.stubs(:key_attributes).returns([:one])
       end
 
       it "should have a default pattern for when there's one namevar" do
@@ -992,7 +1033,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     let(:provider) { resource.provider }
 
     it "should be suitable if its type doesn't use providers" do
-      allow(type).to receive(:paramclass).with(:provider).and_return(nil)
+      type.stubs(:paramclass).with(:provider).returns nil
       expect(resource).to be_suitable
     end
 
@@ -1001,18 +1042,18 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should not be suitable if it has a provider which is not suitable" do
-      allow(provider.class).to receive(:suitable?).and_return(false)
+      provider.class.stubs(:suitable?).returns false
       expect(resource).not_to be_suitable
     end
 
     it "should be suitable if it does not have a provider and there is a default provider" do
-      allow(resource).to receive(:provider).and_return(nil)
+      resource.stubs(:provider).returns nil
       expect(resource).to be_suitable
     end
 
     it "should not be suitable if it doesn't have a provider and there is not default provider" do
-      allow(resource).to receive(:provider).and_return(nil)
-      allow(type).to receive(:defaultprovider).and_return(nil)
+      resource.stubs(:provider).returns nil
+      type.stubs(:defaultprovider).returns nil
 
       expect(resource).not_to be_suitable
     end
@@ -1144,29 +1185,27 @@ describe Puppet::Type::RelationshipMetaparam do
   end
 
   it "should be able to validate relationships" do
-    expect(Puppet::Type.metaparamclass(:require).new(:resource => double("resource"))).to respond_to(:validate_relationship)
+    expect(Puppet::Type.metaparamclass(:require).new(:resource => mock("resource"))).to respond_to(:validate_relationship)
   end
 
   describe 'if any specified resource is not in the catalog' do
-    let(:catalog) { double('catalog') }
+    let(:catalog) { mock 'catalog' }
 
     let(:resource) do
-      double(
-        'resource',
+      stub 'resource',
         :catalog => catalog,
         :ref     => 'resource',
         :line=   => nil,
         :line    => nil,
         :file=   => nil,
         :file    => nil
-      )
     end
 
     let(:param) { Puppet::Type.metaparamclass(:require).new(:resource => resource, :value => %w{Foo[bar] Class[test]}) }
 
     before do
-      expect(catalog).to receive(:resource).with("Foo[bar]").and_return("something")
-      expect(catalog).to receive(:resource).with("Class[Test]").and_return(nil)
+      catalog.expects(:resource).with("Foo[bar]").returns "something"
+      catalog.expects(:resource).with("Class[Test]").returns nil
     end
 
     describe "and the resource doesn't have a file or line number" do
@@ -1180,8 +1219,8 @@ describe Puppet::Type::RelationshipMetaparam do
 
     describe "and the resource has a file or line number" do
       before do
-        allow(resource).to receive(:line).and_return('42')
-        allow(resource).to receive(:file).and_return('/hitchhikers/guide/to/the/galaxy')
+        resource.stubs(:line).returns '42'
+        resource.stubs(:file).returns '/hitchhikers/guide/to/the/galaxy'
       end
 
       it "raises an error with context" do
@@ -1241,8 +1280,8 @@ describe Puppet::Type.metaparamclass(:audit) do
 
   describe "when generating the uniqueness key" do
     it "should include all of the key_attributes in alphabetical order by attribute name" do
-      allow(Puppet::Type.type(:file)).to receive(:key_attributes).and_return([:path, :mode, :owner])
-      allow(Puppet::Type.type(:file)).to receive(:title_patterns).and_return(
+      Puppet::Type.type(:file).stubs(:key_attributes).returns [:path, :mode, :owner]
+      Puppet::Type.type(:file).stubs(:title_patterns).returns(
         [ [ /(.*)/, [ [:path, lambda{|x| x} ] ] ] ]
       )
       myfile = make_absolute('/my/file')