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

data/spec/unit/ssl/inventory_spec.rb

@@ -12,7 +12,7 @@ describe Puppet::SSL::Inventory, :unless => Puppet.features.microsoft_windows? d
   describe "when initializing" do
     it "should set its path to the inventory file" do
       Puppet[:cert_inventory] = cert_inventory
-      @class.new.path.should == cert_inventory
+      expect(@class.new.path).to eq(cert_inventory)
     end
   end
 
@@ -82,68 +82,45 @@ describe Puppet::SSL::Inventory, :unless => Puppet.features.microsoft_windows? d
       end
 
       it "should print the serial number as a 4 digit hex number in the first field" do
-        @inventory.format(@cert).split[0].should == "0x000f" # 15 in hex
+        expect(@inventory.format(@cert).split[0]).to eq("0x000f") # 15 in hex
       end
 
       it "should print the not_before date in '%Y-%m-%dT%H:%M:%S%Z' format in the second field" do
         @cert.not_before.expects(:strftime).with('%Y-%m-%dT%H:%M:%S%Z').returns "before_time"
 
-        @inventory.format(@cert).split[1].should == "before_time"
+        expect(@inventory.format(@cert).split[1]).to eq("before_time")
       end
 
       it "should print the not_after date in '%Y-%m-%dT%H:%M:%S%Z' format in the third field" do
         @cert.not_after.expects(:strftime).with('%Y-%m-%dT%H:%M:%S%Z').returns "after_time"
 
-        @inventory.format(@cert).split[2].should == "after_time"
+        expect(@inventory.format(@cert).split[2]).to eq("after_time")
       end
 
       it "should print the subject in the fourth field" do
-        @inventory.format(@cert).split[3].should == "mycert"
+        expect(@inventory.format(@cert).split[3]).to eq("mycert")
       end
 
       it "should add a carriage return" do
-        @inventory.format(@cert).should =~ /\n$/
+        expect(@inventory.format(@cert)).to match(/\n$/)
       end
 
       it "should produce a line consisting of the serial number, start date, expiration date, and subject" do
         # Just make sure our serial and subject bracket the lines.
-        @inventory.format(@cert).should =~ /^0x.+mycert$/
+        expect(@inventory.format(@cert)).to match(/^0x.+mycert$/)
       end
     end
 
-    it "should be able to find a given host's serial number" do
-      @inventory.should respond_to(:serial)
-    end
-
-    describe "and finding a serial number" do
-      it "should return nil if the inventory file is missing" do
-        Puppet::FileSystem.expects(:exist?).with(cert_inventory).returns false
-        @inventory.serial(:whatever).should be_nil
-      end
-
-      it "should return the serial number from the line matching the provided name" do
-        File.expects(:readlines).with(cert_inventory).returns ["0x00f blah blah /CN=me\n", "0x001 blah blah /CN=you\n"]
-
-        @inventory.serial("me").should == 15
-      end
-
-      it "should return the number as an integer" do
-        File.expects(:readlines).with(cert_inventory).returns ["0x00f blah blah /CN=me\n", "0x001 blah blah /CN=you\n"]
-
-        @inventory.serial("me").should == 15
-      end
-    end
-
-    describe "and finding all serial numbers" do
-      it "should return nil if the inventory file is missing" do
+    describe "and finding serial numbers" do
+      it "should return an empty array if the inventory file is missing" do
         Puppet::FileSystem.expects(:exist?).with(cert_inventory).returns false
-        @inventory.serials(:whatever).should be_empty
+        expect(@inventory.serials(:whatever)).to be_empty
       end
 
       it "should return the all the serial numbers from the lines matching the provided name" do
         File.expects(:readlines).with(cert_inventory).returns ["0x00f blah blah /CN=me\n", "0x001 blah blah /CN=you\n", "0x002 blah blah /CN=me\n"]
 
-        @inventory.serials("me").should == [15, 2]
+        expect(@inventory.serials("me")).to eq([15, 2])
       end
     end
   end

data/spec/unit/ssl/key_spec.rb

@@ -9,23 +9,23 @@ describe Puppet::SSL::Key do
   end
 
   it "should be extended with the Indirector module" do
-    @class.singleton_class.should be_include(Puppet::Indirector)
+    expect(@class.singleton_class).to be_include(Puppet::Indirector)
   end
 
   it "should indirect key" do
-    @class.indirection.name.should == :key
+    expect(@class.indirection.name).to eq(:key)
   end
 
   it "should only support the text format" do
-    @class.supported_formats.should == [:s]
+    expect(@class.supported_formats).to eq([:s])
   end
 
   it "should have a method for determining whether it's a CA key" do
-    @class.new("test").should respond_to(:ca?)
+    expect(@class.new("test")).to respond_to(:ca?)
   end
 
   it "should consider itself a ca key if its name matches the CA_NAME" do
-    @class.new(Puppet::SSL::Host.ca_name).should be_ca
+    expect(@class.new(Puppet::SSL::Host.ca_name)).to be_ca
   end
 
   describe "when initializing" do
@@ -33,18 +33,18 @@ describe Puppet::SSL::Key do
       Puppet[:capass] = File.expand_path("/ca/pass")
 
       key = Puppet::SSL::Key.new(Puppet::SSL::Host.ca_name)
-      key.password_file.should == Puppet[:capass]
+      expect(key.password_file).to eq(Puppet[:capass])
     end
 
     it "should downcase its name" do
-      @class.new("MyName").name.should == "myname"
+      expect(@class.new("MyName").name).to eq("myname")
     end
 
     it "should set its password file to the default password file if it is not the CA key" do
       Puppet[:passfile] = File.expand_path("/normal/pass")
 
       key = Puppet::SSL::Key.new("notca")
-      key.password_file.should == Puppet[:passfile]
+      expect(key.password_file).to eq(Puppet[:passfile])
     end
   end
 
@@ -54,11 +54,11 @@ describe Puppet::SSL::Key do
     end
 
     it "should have a name attribute" do
-      @key.name.should == "myname"
+      expect(@key.name).to eq("myname")
     end
 
     it "should have a content attribute" do
-      @key.should respond_to(:content)
+      expect(@key).to respond_to(:content)
     end
 
     it "should be able to read keys from disk" do
@@ -66,8 +66,8 @@ describe Puppet::SSL::Key do
       File.expects(:read).with(path).returns("my key")
       key = mock 'key'
       OpenSSL::PKey::RSA.expects(:new).returns(key)
-      @key.read(path).should equal(key)
-      @key.content.should equal(key)
+      expect(@key.read(path)).to equal(key)
+      expect(@key.content).to equal(key)
     end
 
     it "should not try to use the provided password file if the file does not exist" do
@@ -93,25 +93,25 @@ describe Puppet::SSL::Key do
 
       key = mock 'key'
       OpenSSL::PKey::RSA.expects(:new).with("my key", "my password").returns(key)
-      @key.read(path).should equal(key)
-      @key.content.should equal(key)
+      expect(@key.read(path)).to equal(key)
+      expect(@key.content).to equal(key)
     end
 
     it "should return an empty string when converted to a string with no key" do
-      @key.to_s.should == ""
+      expect(@key.to_s).to eq("")
     end
 
     it "should convert the key to pem format when converted to a string" do
       key = mock 'key', :to_pem => "pem"
       @key.content = key
-      @key.to_s.should == "pem"
+      expect(@key.to_s).to eq("pem")
     end
 
     it "should have a :to_text method that it delegates to the actual key" do
       real_key = mock 'key'
       real_key.expects(:to_text).returns "keytext"
       @key.content = real_key
-      @key.to_text.should == "keytext"
+      expect(@key.to_text).to eq("keytext")
     end
   end
 
@@ -138,18 +138,18 @@ describe Puppet::SSL::Key do
     it "should set the content to the generated key" do
       OpenSSL::PKey::RSA.stubs(:new).returns(@key)
       @instance.generate
-      @instance.content.should equal(@key)
+      expect(@instance.content).to equal(@key)
     end
 
     it "should return the generated key" do
       OpenSSL::PKey::RSA.stubs(:new).returns(@key)
-      @instance.generate.should equal(@key)
+      expect(@instance.generate).to equal(@key)
     end
 
     it "should return the key in pem format" do
       @instance.generate
       @instance.content.expects(:to_pem).returns "my normal key"
-      @instance.to_s.should == "my normal key"
+      expect(@instance.to_s).to eq("my normal key")
     end
 
     describe "with a password file set" do
@@ -159,7 +159,7 @@ describe Puppet::SSL::Key do
 
         @instance.password_file = "/path/to/pass"
 
-        @instance.password.should be_nil
+        expect(@instance.password).to be_nil
       end
 
       it "should return the contents of the password file as its password" do
@@ -168,7 +168,7 @@ describe Puppet::SSL::Key do
 
         @instance.password_file = "/path/to/pass"
 
-        @instance.password.should == "my password"
+        expect(@instance.password).to eq("my password")
       end
 
       it "should export the private key to text using the password" do
@@ -184,7 +184,7 @@ describe Puppet::SSL::Key do
         OpenSSL::Cipher::DES.expects(:new).with(:EDE3, :CBC).returns cipher
         @key.expects(:export).with(cipher, "my password").returns "my encrypted key"
 
-        @instance.to_s.should == "my encrypted key"
+        expect(@instance.to_s).to eq("my encrypted key")
       end
     end
   end

data/spec/unit/ssl/oids_spec.rb

@@ -5,14 +5,27 @@ describe Puppet::SSL::Oids do
   describe "defining application OIDs" do
 
     {
-      'puppetlabs' => '1.3.6.1.4.1.34380',
-      'ppCertExt' => '1.3.6.1.4.1.34380.1',
-      'ppRegCertExt' => '1.3.6.1.4.1.34380.1.1',
-      'pp_uuid' => '1.3.6.1.4.1.34380.1.1.1',
-      'pp_instance_id' => '1.3.6.1.4.1.34380.1.1.2',
-      'pp_image_name' => '1.3.6.1.4.1.34380.1.1.3',
-      'pp_preshared_key' => '1.3.6.1.4.1.34380.1.1.4',
-      'ppPrivCertExt' => '1.3.6.1.4.1.34380.1.2',
+      'puppetlabs'          => '1.3.6.1.4.1.34380',
+      'ppCertExt'           => '1.3.6.1.4.1.34380.1',
+      'ppRegCertExt'        => '1.3.6.1.4.1.34380.1.1',
+      'pp_uuid'             => '1.3.6.1.4.1.34380.1.1.1',
+      'pp_instance_id'      => '1.3.6.1.4.1.34380.1.1.2',
+      'pp_image_name'       => '1.3.6.1.4.1.34380.1.1.3',
+      'pp_preshared_key'    => '1.3.6.1.4.1.34380.1.1.4',
+      'pp_cost_center'      => "1.3.6.1.4.1.34380.1.1.5",
+      'pp_product'          => "1.3.6.1.4.1.34380.1.1.6",
+      'pp_project'          => "1.3.6.1.4.1.34380.1.1.7",
+      'pp_application'      => "1.3.6.1.4.1.34380.1.1.8",
+      'pp_service'          => "1.3.6.1.4.1.34380.1.1.9",
+      'pp_employee'         => "1.3.6.1.4.1.34380.1.1.10",
+      'pp_created_by'       => "1.3.6.1.4.1.34380.1.1.11",
+      'pp_environment'      => "1.3.6.1.4.1.34380.1.1.12",
+      'pp_role'             => "1.3.6.1.4.1.34380.1.1.13",
+      'pp_software_version' => "1.3.6.1.4.1.34380.1.1.14",
+      'pp_department'       => "1.3.6.1.4.1.34380.1.1.15",
+      'pp_cluster'          => "1.3.6.1.4.1.34380.1.1.16",
+      'pp_provisioner'      => "1.3.6.1.4.1.34380.1.1.17",
+      'ppPrivCertExt'       => '1.3.6.1.4.1.34380.1.2',
     }.each_pair do |sn, oid|
       it "defines #{sn} as #{oid}" do
         object_id = OpenSSL::ASN1::ObjectId.new(sn)
@@ -24,25 +37,25 @@ describe Puppet::SSL::Oids do
   describe "checking if an OID is a subtree of another OID" do
 
     it "can determine if an OID is contained in another OID" do
-      described_class.subtree_of?('1.3.6.1', '1.3.6.1.4.1').should be_true
-      described_class.subtree_of?('1.3.6.1.4.1', '1.3.6.1').should be_false
+      expect(described_class.subtree_of?('1.3.6.1', '1.3.6.1.4.1')).to be_truthy
+      expect(described_class.subtree_of?('1.3.6.1.4.1', '1.3.6.1')).to be_falsey
     end
 
     it "returns true if an OID is compared against itself and exclusive is false" do
-      described_class.subtree_of?('1.3.6.1', '1.3.6.1', false).should be_true
+      expect(described_class.subtree_of?('1.3.6.1', '1.3.6.1', false)).to be_truthy
     end
 
     it "returns false if an OID is compared against itself and exclusive is true" do
-      described_class.subtree_of?('1.3.6.1', '1.3.6.1', true).should be_false
+      expect(described_class.subtree_of?('1.3.6.1', '1.3.6.1', true)).to be_falsey
     end
 
     it "can compare OIDs defined as short names" do
-      described_class.subtree_of?('IANA', '1.3.6.1.4.1').should be_true
-      described_class.subtree_of?('1.3.6.1', 'enterprises').should be_true
+      expect(described_class.subtree_of?('IANA', '1.3.6.1.4.1')).to be_truthy
+      expect(described_class.subtree_of?('1.3.6.1', 'enterprises')).to be_truthy
     end
 
     it "returns false when an invalid OID shortname is passed" do
-      described_class.subtree_of?('IANA', 'bananas').should be_false
+      expect(described_class.subtree_of?('IANA', 'bananas')).to be_falsey
     end
   end
 end

data/spec/unit/ssl/validator_spec.rb

@@ -9,7 +9,6 @@ describe Puppet::SSL::Validator::DefaultValidator do
   let(:ssl_configuration) do
     Puppet::SSL::Configuration.new(
       Puppet[:localcacert],
-      :ca_chain_file => Puppet[:ssl_client_ca_chain],
       :ca_auth_file  => Puppet[:ssl_client_ca_auth])
   end
 
@@ -125,14 +124,14 @@ describe Puppet::SSL::Validator::DefaultValidator do
 
         it 'does not make the error available via #verify_errors' do
           subject.call(true, ssl_context)
-          subject.verify_errors.should == []
+          expect(subject.verify_errors).to eq([])
         end
       end
 
       context 'and the chain is valid' do
         it 'is true for each CA certificate in the chain' do
           (cert_chain.length - 1).times do
-            subject.call(true, ssl_context).should be_true
+            expect(subject.call(true, ssl_context)).to be_truthy
           end
         end
 
@@ -140,7 +139,7 @@ describe Puppet::SSL::Validator::DefaultValidator do
           (cert_chain.length - 1).times do
             subject.call(true, ssl_context)
           end
-          subject.call(true, ssl_context).should be_true
+          expect(subject.call(true, ssl_context)).to be_truthy
         end
       end
 
@@ -153,7 +152,7 @@ describe Puppet::SSL::Validator::DefaultValidator do
 
         it 'is true for each CA certificate in the chain' do
           (cert_chain.length - 1).times do
-            subject.call(true, ssl_context).should be_true
+            expect(subject.call(true, ssl_context)).to be_truthy
           end
         end
 
@@ -161,7 +160,7 @@ describe Puppet::SSL::Validator::DefaultValidator do
           (cert_chain.length - 1).times do
             subject.call(true, ssl_context)
           end
-          subject.call(true, ssl_context).should be_false
+          expect(subject.call(true, ssl_context)).to be_falsey
         end
       end
 
@@ -171,12 +170,12 @@ describe Puppet::SSL::Validator::DefaultValidator do
         end
 
         it 'is false' do
-          subject.call(true, ssl_context).should be_false
+          expect(subject.call(true, ssl_context)).to be_falsey
         end
 
         it 'makes the error available through #verify_errors' do
           subject.call(true, ssl_context)
-          subject.verify_errors.should == ["BOOM!"]
+          expect(subject.verify_errors).to eq(["BOOM!"])
         end
       end
     end
@@ -221,7 +220,7 @@ describe Puppet::SSL::Validator::DefaultValidator do
       end
 
       it 'is true' do
-        subject.valid_peer?.should be_true
+        expect(subject.valid_peer?).to be_truthy
       end
     end
 
@@ -231,12 +230,12 @@ describe Puppet::SSL::Validator::DefaultValidator do
       end
 
       it 'is false' do
-        subject.valid_peer?.should be_false
+        expect(subject.valid_peer?).to be_falsey
       end
 
       it 'makes a helpful error message available via #verify_errors' do
         subject.valid_peer?
-        subject.verify_errors.should == [expected_authz_error_msg]
+        expect(subject.verify_errors).to eq([expected_authz_error_msg])
       end
     end
   end
@@ -244,31 +243,31 @@ describe Puppet::SSL::Validator::DefaultValidator do
   describe '#has_authz_peer_cert' do
     context 'when the Root CA is listed as authorized' do
       it 'returns true when the SSL cert is issued by the Master CA' do
-        subject.has_authz_peer_cert(cert_chain, [root_ca_cert]).should be_true
+        expect(subject.has_authz_peer_cert(cert_chain, [root_ca_cert])).to be_truthy
       end
 
       it 'returns true when the SSL cert is issued by the Agent CA' do
-        subject.has_authz_peer_cert(cert_chain_agent_ca, [root_ca_cert]).should be_true
+        expect(subject.has_authz_peer_cert(cert_chain_agent_ca, [root_ca_cert])).to be_truthy
       end
     end
 
     context 'when the Master CA is listed as authorized' do
       it 'returns false when the SSL cert is issued by the Master CA' do
-        subject.has_authz_peer_cert(cert_chain, [master_ca_cert]).should be_true
+        expect(subject.has_authz_peer_cert(cert_chain, [master_ca_cert])).to be_truthy
       end
 
       it 'returns true when the SSL cert is issued by the Agent CA' do
-        subject.has_authz_peer_cert(cert_chain_agent_ca, [master_ca_cert]).should be_false
+        expect(subject.has_authz_peer_cert(cert_chain_agent_ca, [master_ca_cert])).to be_falsey
       end
     end
 
     context 'when the Agent CA is listed as authorized' do
       it 'returns true when the SSL cert is issued by the Master CA' do
-        subject.has_authz_peer_cert(cert_chain, [agent_ca_cert]).should be_false
+        expect(subject.has_authz_peer_cert(cert_chain, [agent_ca_cert])).to be_falsey
       end
 
       it 'returns true when the SSL cert is issued by the Agent CA' do
-        subject.has_authz_peer_cert(cert_chain_agent_ca, [agent_ca_cert]).should be_true
+        expect(subject.has_authz_peer_cert(cert_chain_agent_ca, [agent_ca_cert])).to be_truthy
       end
     end
   end

data/spec/unit/status_spec.rb

@@ -7,25 +7,25 @@ describe Puppet::Status do
   include JSONMatchers
 
   it "should implement find" do
-    Puppet::Status.indirection.find( :default ).should be_is_a(Puppet::Status)
-    Puppet::Status.indirection.find( :default ).status["is_alive"].should == true
+    expect(Puppet::Status.indirection.find( :default )).to be_is_a(Puppet::Status)
+    expect(Puppet::Status.indirection.find( :default ).status["is_alive"]).to eq(true)
   end
 
   it "should default to is_alive is true" do
-    Puppet::Status.new.status["is_alive"].should == true
+    expect(Puppet::Status.new.status["is_alive"]).to eq(true)
   end
 
   it "should return a pson hash" do
-    Puppet::Status.new.status.to_pson.should == '{"is_alive":true}'
+    expect(Puppet::Status.new.status.to_pson).to eq('{"is_alive":true}')
   end
 
   it "should render to a pson hash" do
-    PSON::pretty_generate(Puppet::Status.new).should =~ /"is_alive":\s*true/
+    expect(PSON::pretty_generate(Puppet::Status.new)).to match(/"is_alive":\s*true/)
   end
 
   it "should accept a hash from pson" do
     status = Puppet::Status.new( { "is_alive" => false } )
-    status.status.should == { "is_alive" => false }
+    expect(status.status).to eq({ "is_alive" => false })
   end
 
   it "should have a name" do
@@ -36,12 +36,6 @@ describe Puppet::Status do
     Puppet::Status.new.name = "status"
   end
 
-  it "can do a round-trip serialization via YAML" do
-    status = Puppet::Status.new
-    new_status = Puppet::Status.convert_from('yaml', status.render('yaml'))
-    new_status.should equal_attributes_of(status)
-  end
-
   it "serializes to PSON that conforms to the status schema" do
     status = Puppet::Status.new
     status.version = Puppet.version