puppet 3.8.7-x64-mingw32 → 4.0.0.rc1-x64-mingw32

data/spec/integration/reference/providers_spec.rb

@@ -7,7 +7,7 @@ reference = Puppet::Util::Reference.reference(:providers)
 
 describe reference do
   it "should exist" do
-    reference.should_not be_nil
+    expect(reference).not_to be_nil
   end
 
   it "should be able to be rendered as markdown" do

data/spec/integration/reports_spec.rb

@@ -9,6 +9,6 @@ describe Puppet::Reports, " when using report types" do
   end
 
   it "should load report types as modules" do
-    Puppet::Reports.report(:store).should be_instance_of(Module)
+    expect(Puppet::Reports.report(:store)).to be_instance_of(Module)
   end
 end

data/spec/integration/resource/catalog_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Puppet::Resource::Catalog do
   it "should support pson" do
-    Puppet::Resource::Catalog.supported_formats.should be_include(:pson)
+    expect(Puppet::Resource::Catalog.supported_formats).to be_include(:pson)
   end
 
   describe "when using the indirector" do
@@ -22,7 +22,7 @@ describe Puppet::Resource::Catalog do
       terminus.expects(:path).with("me").returns "/my/yaml/file"
 
       Puppet::FileSystem.expects(:exist?).with("/my/yaml/file").returns false
-      Puppet::Resource::Catalog.indirection.find("me").should be_nil
+      expect(Puppet::Resource::Catalog.indirection.find("me")).to be_nil
     end
 
     it "should be able to delegate to the :compiler terminus" do
@@ -37,7 +37,7 @@ describe Puppet::Resource::Catalog do
       Puppet::Node.indirection.expects(:find).returns(node)
       compiler.expects(:compile).with(node).returns nil
 
-      Puppet::Resource::Catalog.indirection.find("me").should be_nil
+      expect(Puppet::Resource::Catalog.indirection.find("me")).to be_nil
     end
 
     it "should pass provided node information directly to the terminus" do

data/spec/integration/resource/type_collection_spec.rb

@@ -40,55 +40,40 @@ describe Puppet::Resource::TypeCollection do
     end
 
     it "should return nil when a class can't be found or loaded" do
-      @code.find_hostclass('', 'nosuchclass').should be_nil
+      expect(@code.find_hostclass('nosuchclass')).to be_nil
     end
 
     it "should load the module's init file first" do
       name = "simple"
       mk_module(name, :init => [name])
-
-      @code.find_hostclass("", name).name.should == name
-    end
-
-    it "should load the module's init file even when searching from a different namespace" do
-      name = "simple"
-      mk_module(name, :init => [name])
-
-      @code.find_hostclass("other::ns", name).name.should == name
+      expect(@code.find_hostclass(name).name).to eq(name)
     end
 
     it "should be able to load definitions from the module base file" do
       name = "simpdef"
       mk_module(name, :define => true, :init => [name])
-      @code.find_definition("", name).name.should == name
+      expect(@code.find_definition(name).name).to eq(name)
     end
 
     it "should be able to load qualified classes from the module base file" do
-      modname = "both"
-      name = "sub"
-      mk_module(modname, :init => %w{both both::sub})
-
-      @code.find_hostclass("both", name).name.should == "both::sub"
+      mk_module('both', :init => %w{both both::sub})
+      expect(@code.find_hostclass("both::sub").name).to eq("both::sub")
     end
 
     it "should be able load classes from a separate file" do
-      modname = "separate"
-      name = "sub"
-      mk_module(modname, :init => %w{separate}, :sub => %w{separate::sub})
-      @code.find_hostclass("separate", name).name.should == "separate::sub"
+      mk_module('separate', :init => %w{separate}, :sub => %w{separate::sub})
+      expect(@code.find_hostclass("separate::sub").name).to eq("separate::sub")
     end
 
     it "should not fail when loading from a separate file if there is no module file" do
-      modname = "alone"
-      name = "sub"
-      mk_module(modname, :sub => %w{alone::sub})
-      lambda { @code.find_hostclass("alone", name) }.should_not raise_error
+      mk_module('alone', :sub => %w{alone::sub})
+      expect { @code.find_hostclass("alone::sub") }.not_to raise_error
     end
 
     it "should be able to load definitions from their own file" do
       name = "mymod"
       mk_module(name, :define => true, :mydefine => ["mymod::mydefine"])
-      @code.find_definition("", "mymod::mydefine").name.should == "mymod::mydefine"
+      expect(@code.find_definition("mymod::mydefine").name).to eq("mymod::mydefine")
     end
   end
 end

data/spec/integration/ssl/autosign_spec.rb

@@ -121,7 +121,7 @@ describe "autosigning" do
       it "does not copy custom attributes to certificate" do
         cert = ca.sign(host.name)
         cert.custom_extensions.each do |ext|
-          expect(Puppet::SSL::Oids.subtree_of?('1.3.6.1.4.1.34380.2', ext['oid'])).to be_false
+          expect(Puppet::SSL::Oids.subtree_of?('1.3.6.1.4.1.34380.2', ext['oid'])).to be_falsey
         end
       end
     end

data/spec/integration/ssl/certificate_authority_spec.rb

@@ -24,7 +24,7 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
   it "should be able to generate a new host certificate" do
     ca.generate("newhost")
 
-    Puppet::SSL::Certificate.indirection.find("newhost").should be_instance_of(Puppet::SSL::Certificate)
+    expect(Puppet::SSL::Certificate.indirection.find("newhost")).to be_instance_of(Puppet::SSL::Certificate)
   end
 
   it "should be able to revoke a host certificate" do
@@ -41,7 +41,7 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
 
       ca.sign("luke.madstop.com")
 
-      Puppet::SSL::Certificate.indirection.find("luke.madstop.com").should be_instance_of(Puppet::SSL::Certificate)
+      expect(Puppet::SSL::Certificate.indirection.find("luke.madstop.com")).to be_instance_of(Puppet::SSL::Certificate)
     end
 
     it "should be able to sign multiple certificates" do
@@ -51,8 +51,8 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
       ca.sign("luke.madstop.com")
       ca.sign("other.madstop.com")
 
-      Puppet::SSL::Certificate.indirection.find("other.madstop.com").should be_instance_of(Puppet::SSL::Certificate)
-      Puppet::SSL::Certificate.indirection.find("luke.madstop.com").should be_instance_of(Puppet::SSL::Certificate)
+      expect(Puppet::SSL::Certificate.indirection.find("other.madstop.com")).to be_instance_of(Puppet::SSL::Certificate)
+      expect(Puppet::SSL::Certificate.indirection.find("luke.madstop.com")).to be_instance_of(Puppet::SSL::Certificate)
     end
 
     it "should save the signed certificate to the :signeddir" do
@@ -61,7 +61,7 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
       ca.sign("luke.madstop.com")
 
       client_cert = File.join(Puppet[:signeddir], "luke.madstop.com.pem")
-      File.read(client_cert).should == Puppet::SSL::Certificate.indirection.find("luke.madstop.com").content.to_s
+      expect(File.read(client_cert)).to eq(Puppet::SSL::Certificate.indirection.find("luke.madstop.com").content.to_s)
     end
 
     it "should save valid certificates" do
@@ -75,7 +75,7 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
         ca_cert = Puppet[:cacert]
         client_cert = File.join(Puppet[:signeddir], "luke.madstop.com.pem")
         output = %x{openssl verify -CAfile #{ca_cert} #{client_cert}}
-        $CHILD_STATUS.should == 0
+        expect($CHILD_STATUS).to eq(0)
       end
     end
 
@@ -120,7 +120,7 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
       end
       ca.revoke("luke.madstop.com")
 
-      ca.crl.content.revoked.map { |r| r.serial }.should == [2,3,4] # ca has serial 1
+      expect(ca.crl.content.revoked.map { |r| r.serial }).to eq([2,3,4]) # ca has serial 1
     end
 
   end
@@ -136,7 +136,7 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
     certs = hosts.collect { |host| Puppet::SSL::Certificate.indirection.find(host.name).content }
     serial_numbers = certs.collect(&:serial)
 
-    serial_numbers.sort.should == [2, 3, 4, 5, 6] # serial 1 is the ca certificate
+    expect(serial_numbers.sort).to eq([2, 3, 4, 5, 6]) # serial 1 is the ca certificate
   end
 
   def certificate_request_for(hostname)

data/spec/integration/ssl/certificate_request_spec.rb

@@ -36,13 +36,13 @@ describe Puppet::SSL::CertificateRequest do
     @csr.generate(@key)
     Puppet::SSL::CertificateRequest.indirection.save(@csr)
 
-    Puppet::SSL::CertificateRequest.indirection.find("luke.madstop.com").should be_instance_of(Puppet::SSL::CertificateRequest)
+    expect(Puppet::SSL::CertificateRequest.indirection.find("luke.madstop.com")).to be_instance_of(Puppet::SSL::CertificateRequest)
   end
 
   it "should save the completely CSR when saving" do
     @csr.generate(@key)
     Puppet::SSL::CertificateRequest.indirection.save(@csr)
 
-    Puppet::SSL::CertificateRequest.indirection.find("luke.madstop.com").content.to_s.should == @csr.content.to_s
+    expect(Puppet::SSL::CertificateRequest.indirection.find("luke.madstop.com").content.to_s).to eq(@csr.content.to_s)
   end
 end

data/spec/integration/ssl/host_spec.rb

@@ -25,7 +25,7 @@ describe Puppet::SSL::Host do
   }
 
   it "should be considered a CA host if its name is equal to 'ca'" do
-    Puppet::SSL::Host.new(Puppet::SSL::CA_NAME).should be_ca
+    expect(Puppet::SSL::Host.new(Puppet::SSL::CA_NAME)).to be_ca
   end
 
   describe "when managing its key" do
@@ -36,12 +36,12 @@ describe Puppet::SSL::Host do
     it "should save the key such that the Indirector can find it" do
       @host.generate_key
 
-      Puppet::SSL::Key.indirection.find(@host.name).content.to_s.should == @host.key.to_s
+      expect(Puppet::SSL::Key.indirection.find(@host.name).content.to_s).to eq(@host.key.to_s)
     end
 
     it "should save the private key into the :privatekeydir" do
       @host.generate_key
-      File.read(File.join(Puppet.settings[:privatekeydir], "luke.madstop.com.pem")).should == @host.key.to_s
+      expect(File.read(File.join(Puppet.settings[:privatekeydir], "luke.madstop.com.pem"))).to eq(@host.key.to_s)
     end
   end
 
@@ -53,12 +53,12 @@ describe Puppet::SSL::Host do
     it "should save the certificate request such that the Indirector can find it" do
       @host.generate_certificate_request
 
-      Puppet::SSL::CertificateRequest.indirection.find(@host.name).content.to_s.should == @host.certificate_request.to_s
+      expect(Puppet::SSL::CertificateRequest.indirection.find(@host.name).content.to_s).to eq(@host.certificate_request.to_s)
     end
 
     it "should save the private certificate request into the :privatekeydir" do
       @host.generate_certificate_request
-      File.read(File.join(Puppet.settings[:requestdir], "luke.madstop.com.pem")).should == @host.certificate_request.to_s
+      expect(File.read(File.join(Puppet.settings[:requestdir], "luke.madstop.com.pem"))).to eq(@host.certificate_request.to_s)
     end
   end
 
@@ -68,7 +68,7 @@ describe Puppet::SSL::Host do
       @ca = Puppet::SSL::Host.new(Puppet::SSL::Host.ca_name)
       @ca.generate_key
 
-      Puppet::FileSystem.exist?(File.join(Puppet[:privatekeydir], "ca.pem")).should be_false
+      expect(Puppet::FileSystem.exist?(File.join(Puppet[:privatekeydir], "ca.pem"))).to be_falsey
     end
   end
 
@@ -77,6 +77,6 @@ describe Puppet::SSL::Host do
     @ca = Puppet::SSL::CertificateAuthority.new
     @ca.sign(@host.name)
 
-    @host.ssl_store.verify(@host.certificate.content).should be_true
+    expect(@host.ssl_store.verify(@host.certificate.content)).to be_truthy
   end
 end

data/spec/integration/transaction_spec.rb

@@ -16,6 +16,10 @@ describe Puppet::Transaction do
     catalog
   end
 
+  def touch_path
+    Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32" : "/usr/bin:/bin"
+  end
+
   def usr_bin_touch(path)
     Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32/cmd.exe /c \"type NUL >> \"#{path}\"\"" : "/usr/bin/touch #{path}"
   end
@@ -64,7 +68,7 @@ describe Puppet::Transaction do
     catalog.add_resource resource
 
     catalog.apply
-    Puppet::FileSystem.exist?(path).should be_true
+    expect(Puppet::FileSystem.exist?(path)).to be_truthy
   end
 
   it "should not apply virtual exported resources" do
@@ -92,7 +96,7 @@ describe Puppet::Transaction do
     transaction.expects(:apply).never.with(resource, nil)
 
     transaction.evaluate
-    transaction.resource_status(resource).should be_skipped
+    expect(transaction.resource_status(resource)).to be_skipped
   end
 
   it "should not apply host resources on device" do
@@ -106,7 +110,7 @@ describe Puppet::Transaction do
     transaction.expects(:apply).never.with(resource, nil)
 
     transaction.evaluate
-    transaction.resource_status(resource).should be_skipped
+    expect(transaction.resource_status(resource)).to be_skipped
   end
 
   it "should apply device resources on device" do
@@ -120,7 +124,7 @@ describe Puppet::Transaction do
     transaction.expects(:apply).with(resource, nil)
 
     transaction.evaluate
-    transaction.resource_status(resource).should_not be_skipped
+    expect(transaction.resource_status(resource)).not_to be_skipped
   end
 
   it "should apply resources appliable on host and device on a device" do
@@ -134,7 +138,7 @@ describe Puppet::Transaction do
     transaction.expects(:apply).with(resource, nil)
 
     transaction.evaluate
-    transaction.resource_status(resource).should_not be_skipped
+    expect(transaction.resource_status(resource)).not_to be_skipped
   end
 
   # Verify that one component requiring another causes the contained
@@ -189,8 +193,28 @@ describe Puppet::Transaction do
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
-    Puppet::FileSystem.exist?(file1).should be_true
-    Puppet::FileSystem.exist?(file2).should be_true
+    expect(Puppet::FileSystem.exist?(file1)).to be_truthy
+    expect(Puppet::FileSystem.exist?(file2)).to be_truthy
+  end
+
+  it "does not refresh resources that have 'noop => true'" do
+    path = tmpfile("path")
+
+    notify = Puppet::Type.type(:notify).new(
+      :name    => "trigger",
+      :notify  => Puppet::Resource.new(:exec, "noop exec")
+    )
+
+    noop_exec = Puppet::Type.type(:exec).new(
+      :name    => "noop exec",
+      :path    => ENV["PATH"],
+      :command => touch(path),
+      :noop    => true
+    )
+
+    catalog = mk_catalog(notify, noop_exec)
+    catalog.apply
+    expect(Puppet::FileSystem.exist?(path)).to be_falsey
   end
 
   it "should apply no resources whatsoever if a pre_run_check fails" do
@@ -205,8 +229,8 @@ describe Puppet::Transaction do
     notify.expects(:pre_run_check).raises(Puppet::Error, "fail for testing")
 
     catalog = mk_catalog(file, notify)
-    expect { catalog.apply }.to raise_error(Puppet::Error, /Some pre-run checks failed/)
-    Puppet::FileSystem.exist?(path).should_not be_true
+    catalog.apply
+    expect(Puppet::FileSystem.exist?(path)).not_to be_truthy
   end
 
   it "should not let one failed refresh result in other refreshes failing" do
@@ -239,59 +263,71 @@ describe Puppet::Transaction do
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
-    Puppet::FileSystem.exist?(newfile).should be_true
+    expect(Puppet::FileSystem.exist?(newfile)).to be_truthy
   end
 
-  it "should still trigger skipped resources" do
-    catalog = mk_catalog
-    catalog.add_resource(*Puppet::Type.type(:schedule).mkdefaultschedules)
+  describe "skipping resources" do
+    let(:fname) { tmpfile("exec") }
 
-    Puppet[:ignoreschedules] = false
+    let(:file) do
+      Puppet::Type.type(:file).new(
+        :name => tmpfile("file"),
+        :ensure => "file",
+        :backup => false
+      )
+    end
 
-    file = Puppet::Type.type(:file).new(
-      :name => tmpfile("file"),
-      :ensure => "file",
-      :backup => false
-    )
+    let(:exec) do
+      Puppet::Type.type(:exec).new(
+        :name => touch(fname),
+        :path => touch_path,
+        :subscribe => Puppet::Resource.new("file", file.name)
+      )
+    end
 
-    fname = tmpfile("exec")
+    it "does not trigger unscheduled resources" do
+      catalog = mk_catalog
+      catalog.add_resource(*Puppet::Type.type(:schedule).mkdefaultschedules)
 
-    exec = Puppet::Type.type(:exec).new(
-      :name => touch(fname),
-      :path => Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32" : "/usr/bin:/bin",
-      :schedule => "monthly",
-      :subscribe => Puppet::Resource.new("file", file.name)
-    )
+      Puppet[:ignoreschedules] = false
 
-    catalog.add_resource(file, exec)
+      exec[:schedule] = "monthly"
 
-    # Run it once
-    catalog.apply
-    Puppet::FileSystem.exist?(fname).should be_true
+      catalog.add_resource(file, exec)
 
-    # Now remove it, so it can get created again
-    Puppet::FileSystem.unlink(fname)
+      # Run it once so further runs don't schedule the resource
+      catalog.apply
+      expect(Puppet::FileSystem.exist?(fname)).to be_truthy
 
-    file[:content] = "some content"
+      # Now remove it, so it can get created again
+      Puppet::FileSystem.unlink(fname)
 
-    catalog.apply
-    Puppet::FileSystem.exist?(fname).should be_true
+      file[:content] = "some content"
 
-    # Now remove it, so it can get created again
-    Puppet::FileSystem.unlink(fname)
+      catalog.apply
+      expect(Puppet::FileSystem.exist?(fname)).to be_falsey
+    end
 
-    # And tag our exec
-    exec.tag("testrun")
+    it "does not trigger untagged resources" do
+      catalog = mk_catalog
 
-    # And our file, so it runs
-    file.tag("norun")
+      Puppet[:tags] = "runonly"
+      file.tag("runonly")
 
-    Puppet[:tags] = "norun"
+      catalog.add_resource(file, exec)
+      catalog.apply
+      expect(Puppet::FileSystem.exist?(fname)).to be_falsey
+    end
 
-    file[:content] = "totally different content"
+    it "does not trigger resources with failed dependencies" do
+      catalog = mk_catalog
+      file[:path] = make_absolute("/foo/bar/baz")
 
-    catalog.apply
-    Puppet::FileSystem.exist?(fname).should be_true
+      catalog.add_resource(file, exec)
+      catalog.apply
+
+      expect(Puppet::FileSystem.exist?(fname)).to be_falsey
+    end
   end
 
   it "should not attempt to evaluate resources with failed dependencies" do
@@ -318,8 +354,8 @@ describe Puppet::Transaction do
     catalog = mk_catalog(exec, file1, file2)
     catalog.apply
 
-    Puppet::FileSystem.exist?(file1[:path]).should be_false
-    Puppet::FileSystem.exist?(file2[:path]).should be_false
+    expect(Puppet::FileSystem.exist?(file1[:path])).to be_falsey
+    expect(Puppet::FileSystem.exist?(file2[:path])).to be_falsey
   end
 
   it "should not trigger subscribing resources on failure" do
@@ -344,8 +380,8 @@ describe Puppet::Transaction do
     catalog = mk_catalog(exec, create_file1, create_file2)
     catalog.apply
 
-    Puppet::FileSystem.exist?(file1).should be_false
-    Puppet::FileSystem.exist?(file2).should be_false
+    expect(Puppet::FileSystem.exist?(file1)).to be_falsey
+    expect(Puppet::FileSystem.exist?(file2)).to be_falsey
   end
 
   # #801 -- resources only checked in noop should be rescheduled immediately.
@@ -357,6 +393,6 @@ describe Puppet::Transaction do
 
     trans = catalog.apply
 
-    trans.resource_harness.should be_scheduled(resource)
+    expect(trans.resource_harness).to be_scheduled(resource)
   end
 end