puppet 2.7.18 → 2.7.19

data/spec/shared_behaviours/path_parameters.rb

@@ -46,7 +46,7 @@ shared_examples_for "all pathname parameters with arrays" do |win32|
         it "should #{reject ? 'reject' : 'accept'} #{set.join(", ")}" do
           if reject then
             expect { instance(data) }.
-              should raise_error Puppet::Error, /fully qualified/
+              to raise_error Puppet::Error, /fully qualified/
           else
             instance = instance(data)
             instance[@param].should == data
@@ -56,7 +56,7 @@ shared_examples_for "all pathname parameters with arrays" do |win32|
         it "should #{reject ? 'reject' : 'accept'} #{set.join(", ")} doubled" do
           if reject then
             expect { instance(data + data) }.
-              should raise_error Puppet::Error, /fully qualified/
+              to raise_error Puppet::Error, /fully qualified/
           else
             instance = instance(data + data)
             instance[@param].should == (data + data)
@@ -101,7 +101,7 @@ shared_examples_for "all path parameters" do |param, options|
     it "should give a useful error when the path is not absolute" do
       path = 'foo'
       expect { instance(path) }.
-        should raise_error Puppet::Error, /fully qualified/
+        to raise_error Puppet::Error, /fully qualified/
     end
 
     { "Unix" => '/', "Win32" => '\\' }.each do |style, slash|
@@ -109,7 +109,7 @@ shared_examples_for "all path parameters" do |param, options|
         it "should reject drive letter '#{drive}' with #{style} path separators" do
           path = "#{drive}:#{slash}Program Files"
           expect { instance(path) }.
-            should raise_error Puppet::Error, /fully qualified/
+            to raise_error Puppet::Error, /fully qualified/
         end
       end
     end
@@ -128,7 +128,7 @@ shared_examples_for "all path parameters" do |param, options|
     it "should give a useful error when the path is not absolute" do
       path = 'foo'
       expect { instance(path) }.
-        should raise_error Puppet::Error, /fully qualified/
+        to raise_error Puppet::Error, /fully qualified/
     end
 
     it "also accepts Unix style path separators" do

data/spec/shared_behaviours/things_that_declare_options.rb

@@ -52,7 +52,7 @@ shared_examples_for "things that declare options" do
         option "--foo"
         option "--foo"
       end
-    }.should raise_error ArgumentError, /Option foo conflicts with existing option foo/i
+    }.to raise_error ArgumentError, /Option foo conflicts with existing option foo/i
   end
 
   it "should detect conflicts in short options" do
@@ -61,7 +61,7 @@ shared_examples_for "things that declare options" do
         option "-f"
         option "-f"
       end
-    }.should raise_error ArgumentError, /Option f conflicts with existing option f/
+    }.to raise_error ArgumentError, /Option f conflicts with existing option f/
   end
 
   ["-f", "--foo"].each do |option|
@@ -72,7 +72,7 @@ shared_examples_for "things that declare options" do
           add_options_to do
             option input, input
           end
-        }.should raise_error ArgumentError, /duplicates existing alias/
+        }.to raise_error ArgumentError, /duplicates existing alias/
       end
     end
   end
@@ -90,13 +90,13 @@ shared_examples_for "things that declare options" do
           option *base
           option *conflict
         end
-      }.should raise_error ArgumentError, /conflicts with existing option/
+      }.to raise_error ArgumentError, /conflicts with existing option/
     end
   end
 
   it "should fail if we are not consistent about taking an argument" do
     expect { add_options_to do option "--foo=bar", "--bar" end }.
-      should raise_error ArgumentError, /inconsistent about taking an argument/
+      to raise_error ArgumentError, /inconsistent about taking an argument/
   end
 
   it "should not accept optional arguments" do

data/spec/unit/application/facts_spec.rb

@@ -21,7 +21,7 @@ describe Puppet::Application::Facts do
 
     expect {
       expect { subject.run }.to exit_with 0
-    }.should have_printed(/object:Puppet::Node::Facts/)
+    }.to have_printed(/object:Puppet::Node::Facts/)
 
     @logs.should be_empty
   end

data/spec/unit/application_spec.rb

@@ -32,9 +32,11 @@ describe Puppet::Application do
     end
 
     it "should exit if it can't find a class" do
-      reg = "Unable to find application 'ThisShallNeverEverEverExist'.  "
-      reg += "no such file to load -- puppet/application/thisshallneverevereverexist"
-      @klass.expects(:puts).with(reg)
+      @klass.expects(:puts).with do |value|
+        value =~ /Unable to find application 'ThisShallNeverEverEverExist'/ and
+          value =~ /puppet\/application\/thisshallneverevereverexist/ and
+          value =~ /no such file to load|cannot load such file/
+      end
 
       expect { @klass.find("ThisShallNeverEverEverExist") }.to exit_with 1
     end
@@ -80,7 +82,7 @@ describe Puppet::Application do
 
       app.class.run_mode.name.should == :agent
       $puppet_application_mode.name.should == :agent
-    }.should_not raise_error
+    }.to_not raise_error
 
     Puppet[:run_mode].should == "agent"
   end
@@ -93,7 +95,7 @@ describe Puppet::Application do
       $puppet_application_mode.name.should == :master
       app.set_run_mode app.class.run_mode "agent"
       $puppet_application_mode.name.should == :agent
-    }.should raise_error
+    }.to raise_error
   end
 
   it "should explode when an invalid run mode is set at runtime, for great victory"
@@ -432,7 +434,7 @@ describe Puppet::Application do
     it "should not fail if the route file doesn't exist" do
       Puppet[:route_file] = "/dev/null/non-existent"
 
-      expect { @app.configure_indirector_routes }.should_not raise_error
+      expect { @app.configure_indirector_routes }.to_not raise_error
     end
 
     it "should raise an error if the routes file is invalid" do
@@ -443,7 +445,7 @@ describe Puppet::Application do
         ROUTES
       end
 
-      expect { @app.configure_indirector_routes }.should raise_error
+      expect { @app.configure_indirector_routes }.to raise_error
     end
   end
 
@@ -565,7 +567,7 @@ describe Puppet::Application do
             raise "I can't believe it, it works!"
           end
 
-          lambda { @app.handle_test2 }.should raise_error
+          expect { @app.handle_test2 }.to raise_error
         end
 
         it "should declare the option to OptionParser" do

data/spec/unit/configurer_spec.rb

@@ -430,9 +430,18 @@ describe Puppet::Configurer do
     end
 
     it "should log but not fail if saving the last run summary fails" do
-      Puppet::Util::FileLocking.expects(:writelock).raises "exception"
+      # The mock will raise an exception on any method used.  This should
+      # simulate a nice hard failure from the underlying OS for us.
+      fh = Class.new(Object) do
+        def method_missing(*args)
+          raise "failed to do #{args[0]}"
+        end
+      end.new
+
+      Puppet::Util.expects(:replace_file).yields(fh)
+
       Puppet.expects(:err)
-      lambda { @configurer.save_last_run_summary(@report) }.should_not raise_error
+      expect { @configurer.save_last_run_summary(@report) }.should_not raise_error
     end
   end
 

data/spec/unit/face/ca_spec.rb

@@ -40,7 +40,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
           :host => 'random-host', :valid => false,
           :error => 'Could not find a certificate for random-host'
         }
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should not explode if there is only a CSR" do
@@ -50,7 +50,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
           :host => 'random-host', :valid => false,
           :error => 'Could not find a certificate for random-host'
         }
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should verify a signed certificate" do
@@ -69,7 +69,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
           :host => 'random-host', :valid => false,
           :error => 'certificate revoked'
         }
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should verify a revoked certificate if CRL use was turned off" do
@@ -93,14 +93,14 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     it "should not explode if there is no certificate" do
       expect {
         subject.fingerprint('random-host').should be_nil
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should fingerprint a CSR" do
       make_certs('random-host', [])
       expect {
         subject.fingerprint('random-host').should =~ /^[0-9A-F:]+$/
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should fingerprint a certificate" do
@@ -128,14 +128,14 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     it "should not explode if there is no certificate" do
       expect {
         subject.print('random-host').should be_nil
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should return nothing if there is only a CSR" do
       make_certs('random-host', [])
       expect {
         subject.print('random-host').should be_nil
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should return the certificate content if there is a cert" do
@@ -155,7 +155,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
       expect {
         subject.sign('random-host').
           should == 'Could not find certificate request for random-host'
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should not explode if there is a signed cert" do
@@ -163,7 +163,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
       expect {
         subject.sign('random-host').
           should == 'Could not find certificate request for random-host'
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should sign a CSR if one exists" do
@@ -216,14 +216,14 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
       make_certs('random-host', [])
       expect {
         subject.generate('random-host').should =~ /already has a certificate request/
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should not explode if the certificate with that name already exists" do
       make_certs([], 'random-host')
       expect {
         subject.generate('random-host').should =~ /already has a certificate/
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "should include the specified DNS alt names" do
@@ -242,7 +242,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     let :action do Puppet::Face[:ca, '0.1.0'].get_action(:revoke) end
 
     it "should not explode when asked to revoke something that doesn't exist" do
-      expect { subject.revoke('nonesuch') }.should_not raise_error
+      expect { subject.revoke('nonesuch') }.to_not raise_error
     end
 
     it "should let the user know what went wrong" do
@@ -267,7 +267,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     let :action do Puppet::Face[:ca, '0.1.0'].get_action(:destroy) end
 
     it "should not explode when asked to delete something that doesn't exist" do
-      expect { subject.destroy('nonesuch') }.should_not raise_error
+      expect { subject.destroy('nonesuch') }.to_not raise_error
     end
 
     it "should let the user know if nothing was deleted" do
@@ -325,7 +325,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
         it "should not fail when a matcher is passed" do
           expect {
             subject.list(type.merge :subject => '.').should == []
-          }.should_not raise_error
+          }.to_not raise_error
         end
 
         context "when_rendering :console" do
@@ -394,7 +394,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
         else
           raise "#{action} has arity #{subject.method(action).arity}"
         end
-      }.should raise_error(/Not a CA/)
+      }.to raise_error(/Not a CA/)
     end
   end
 end

data/spec/unit/face/help_spec.rb

@@ -12,20 +12,20 @@ describe Puppet::Face[:help, '0.0.1'] do
   end
 
   it "should accept a call with no arguments" do
-    expect { subject.help() }.should_not raise_error
+    expect { subject.help() }.to_not raise_error
   end
 
   it "should accept a face name" do
-    expect { subject.help(:help) }.should_not raise_error
+    expect { subject.help(:help) }.to_not raise_error
   end
 
   it "should accept a face and action name" do
-    expect { subject.help(:help, :help) }.should_not raise_error
+    expect { subject.help(:help, :help) }.to_not raise_error
   end
 
   it "should fail if more than a face and action are given" do
     expect { subject.help(:help, :help, :for_the_love_of_god) }.
-      should raise_error ArgumentError
+      to raise_error ArgumentError
   end
 
   it "should treat :current and 'current' identically" do
@@ -35,7 +35,7 @@ describe Puppet::Face[:help, '0.0.1'] do
 
   it "should complain when the request version of a face is missing" do
     expect { subject.help(:huzzah, :bar, :version => '17.0.0') }.
-      should raise_error Puppet::Error
+      to raise_error Puppet::Error
   end
 
   it "should find a face by version" do

data/spec/unit/face/module/install_spec.rb

@@ -88,15 +88,26 @@ describe "puppet module install" do
 
           Puppet.settings[:modulepath].should == fakemodpath
         end
+
+        it "should expand the target directory derived from the modulepath" do
+          options[:modulepath] = "modules"
+          expanded_path = File.expand_path("modules")
+          expected_options.merge!(options)
+          expected_options[:target_dir] = expanded_path
+          expected_options[:modulepath] = "modules"
+
+          Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+          subject.install("puppetlabs-apache", options)
+        end
       end
 
       describe "when target-dir option is passed" do
-        it "should expand the target directory" do
+        it "should expand the target directory when target_dir is set" do
           options[:target_dir] = "modules"
           expanded_path = File.expand_path("modules")
           expected_options.merge!(options)
           expected_options[:target_dir] = expanded_path
-          expected_options[:modulepath] = "#{expanded_path}#{sep}#{fakemodpath}"
+          expected_options[:modulepath] = "modules#{sep}#{fakemodpath}"
 
           Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
           subject.install("puppetlabs-apache", options)

data/spec/unit/face/node_spec.rb

@@ -48,26 +48,27 @@ describe Puppet::Face[:node, '0.0.1'] do
     end
 
     it "should not accept a call with no arguments" do
-      expect { subject.clean() }.should raise_error
+      expect { subject.clean() }.to raise_error
     end
 
     it "should accept a node name" do
-      expect { subject.clean('hostname') }.should_not raise_error
+      expect { subject.clean('hostname') }.to_not raise_error
     end
 
     it "should accept more than one node name" do
       expect do
         subject.clean('hostname', 'hostname2', {})
-      end.should_not raise_error
+      end.to_not raise_error
 
       expect do
         subject.clean('hostname', 'hostname2', 'hostname3', { :unexport => true })
-      end.should_not raise_error
+      end.to_not raise_error
     end
 
     it "should accept the option --unexport" do
-      expect { subject.help('hostname', :unexport => true) }.
-        should_not raise_error ArgumentError
+      expect {
+        subject.help('hostname', :unexport => true)
+      }.to_not raise_error(ArgumentError)
     end
 
     context "clean action" do

data/spec/unit/indirector/certificate_request/ca_spec.rb

@@ -48,7 +48,7 @@ describe Puppet::SSL::CertificateRequest::Ca, :unless => Puppet.features.microso
     host.generate_certificate_request
     @ca.sign(host.name)
 
-    expect { Puppet::SSL::Host.indirection.find("bar").generate_certificate_request }.should raise_error(/ignoring certificate request/)
+    expect { Puppet::SSL::Host.indirection.find("bar").generate_certificate_request }.to raise_error(/ignoring certificate request/)
 
     Puppet::SSL::Certificate.indirection.find("bar").name.should == "bar"
     Puppet::SSL::CertificateRequest.indirection.find("bar").should be_nil

data/spec/unit/indirector/envelope_spec.rb

@@ -8,19 +8,6 @@ describe Puppet::Indirector::Envelope do
     @instance.extend(Puppet::Indirector::Envelope)
   end
 
-  it "should have an expiration accessor" do
-    @instance.expiration = "testing"
-    @instance.expiration.should == "testing"
-  end
-
-  it "should have an expiration setter" do
-    @instance.should respond_to(:expiration=)
-  end
-
-  it "should have a means of testing whether it is expired" do
-    @instance.should respond_to(:expired?)
-  end
-
   describe "when testing if it is expired" do
     it "should return false if there is no expiration set" do
       @instance.should_not be_expired

data/spec/unit/indirector/facts/inventory_service_spec.rb

@@ -16,7 +16,7 @@ describe Puppet::Node::Facts::InventoryService do
 
     expect {
       subject.save(request)
-    }.should_not raise_error
+    }.to_not raise_error
   end
 end
 

data/spec/unit/indirector/queue_spec.rb

@@ -49,7 +49,7 @@ describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
   it "should require PSON" do
     Puppet.features.expects(:pson?).returns false
 
-    lambda { @store_class.new }.should raise_error(ArgumentError)
+    expect { @store_class.new }.to raise_error(ArgumentError)
   end
 
   it 'should use the correct client type and queue' do
@@ -75,7 +75,7 @@ describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
     it "should catch any exceptions raised" do
       @store.client.expects(:publish_message).raises ArgumentError
 
-      lambda { @store.save(@request) }.should raise_error(Puppet::Error)
+      expect { @store.save(@request) }.to raise_error(Puppet::Error)
     end
   end
 
@@ -110,7 +110,7 @@ describe Puppet::Indirector::Queue, :if => Puppet.features.pson? do
     it "should log but not propagate errors" do
       @store_class.client.expects(:subscribe).yields("foo")
       @store_class.expects(:intern).raises(ArgumentError)
-      expect { @store_class.subscribe {|o| o } }.should_not raise_error
+      expect { @store_class.subscribe {|o| o } }.to_not raise_error
 
       @logs.length.should == 1
       @logs.first.message.should =~ /Error occured with subscription to queue my_queue for indirection my_queue: ArgumentError/