puppet 3.8.7 → 4.0.0.rc1

data/spec/unit/application/apply_spec.rb

@@ -23,7 +23,7 @@ describe Puppet::Application::Apply do
 
   [:debug,:loadclasses,:test,:verbose,:use_nodes,:detailed_exitcodes,:catalog, :write_catalog_summary].each do |option|
     it "should declare handle_#{option} method" do
-      @apply.should respond_to("handle_#{option}".to_sym)
+      expect(@apply).to respond_to("handle_#{option}".to_sym)
     end
 
     it "should store argument value when calling handle_#{option}" do
@@ -71,17 +71,17 @@ describe Puppet::Application::Apply do
       it "should set options[:verbose] to true" do
         @apply.setup_test
 
-        @apply.options[:verbose].should == true
+        expect(@apply.options[:verbose]).to eq(true)
       end
       it "should set options[:show_diff] to true" do
         Puppet.settings.override_default(:show_diff, false)
         @apply.setup_test
-        Puppet[:show_diff].should == true
+        expect(Puppet[:show_diff]).to eq(true)
       end
       it "should set options[:detailed_exitcodes] to true" do
         @apply.setup_test
 
-        @apply.options[:detailed_exitcodes].should == true
+        expect(@apply.options[:detailed_exitcodes]).to eq(true)
       end
     end
 
@@ -100,13 +100,13 @@ describe Puppet::Application::Apply do
     it "should set log level to debug if --debug was passed" do
       @apply.options[:debug] = true
       @apply.setup
-      Puppet::Log.level.should == :debug
+      expect(Puppet::Log.level).to eq(:debug)
     end
 
     it "should set log level to info if --verbose was passed" do
       @apply.options[:verbose] = true
       @apply.setup
-      Puppet::Log.level.should == :info
+      expect(Puppet::Log.level).to eq(:info)
     end
 
     it "should print puppet config if asked to in Puppet config" do
@@ -145,7 +145,7 @@ describe Puppet::Application::Apply do
     end
 
     it "should set default_file_terminus to `file_server` to be local" do
-      @apply.app_defaults[:default_file_terminus].should == :file_server
+      expect(@apply.app_defaults[:default_file_terminus]).to eq(:file_server)
     end
   end
 
@@ -227,7 +227,7 @@ describe Puppet::Application::Apply do
       it "should raise an error if a file is passed on command line and the file does not exist" do
         noexist = tmpfile('noexist.pp')
         @apply.command_line.stubs(:args).returns([noexist])
-        lambda { @apply.main }.should raise_error(RuntimeError, "Could not find file #{noexist}")
+        expect { @apply.main }.to raise_error(RuntimeError, "Could not find file #{noexist}")
       end
 
       it "should set the manifest to the first file and warn other files will be skipped" do
@@ -239,14 +239,14 @@ describe Puppet::Application::Apply do
         expect { @apply.main }.to exit_with 0
 
         msg = @logs.find {|m| m.message =~ /Only one file can be applied per run/ }
-        msg.message.should == 'Only one file can be applied per run.  Skipping starwarsI, starwarsII'
-        msg.level.should == :warning
+        expect(msg.message).to eq('Only one file can be applied per run.  Skipping starwarsI, starwarsII')
+        expect(msg.level).to eq(:warning)
       end
 
       it "should raise an error if we can't find the node" do
         Puppet::Node.indirection.expects(:find).returns(nil)
 
-        lambda { @apply.main }.should raise_error(RuntimeError, /Could not find node/)
+        expect { @apply.main }.to raise_error(RuntimeError, /Could not find node/)
       end
 
       it "should load custom classes if loadclasses" do
@@ -327,12 +327,12 @@ describe Puppet::Application::Apply do
 
         it "should set the facts name based on the node_name_fact" do
           expect { @apply.main }.to exit_with 0
-          @facts.name.should == 'other_node_name'
+          expect(@facts.name).to eq('other_node_name')
         end
 
         it "should set the node_name_value based on the node_name_fact" do
           expect { @apply.main }.to exit_with 0
-          Puppet[:node_name_value].should == 'other_node_name'
+          expect(Puppet[:node_name_value]).to eq('other_node_name')
         end
 
         it "should merge in our node the loaded facts" do
@@ -340,13 +340,13 @@ describe Puppet::Application::Apply do
 
           expect { @apply.main }.to exit_with 0
 
-          @node.parameters['key'].should == 'value'
+          expect(@node.parameters['key']).to eq('value')
         end
 
         it "should raise an error if we can't find the facts" do
           Puppet::Node::Facts.indirection.expects(:find).returns(nil)
 
-          lambda { @apply.main }.should raise_error
+          expect { @apply.main }.to raise_error
         end
       end
 
@@ -422,7 +422,7 @@ describe Puppet::Application::Apply do
 
       it "should fail helpfully if deserializing fails" do
         @apply.options[:catalog] = temporary_catalog('something syntactically invalid')
-        lambda { @apply.apply }.should raise_error(Puppet::Error)
+        expect { @apply.apply }.to raise_error(Puppet::Error)
       end
 
       it "should convert plain data structures into a catalog if deserialization does not do so" do

data/spec/unit/application/cert_spec.rb

@@ -9,54 +9,54 @@ describe Puppet::Application::Cert => true do
   end
 
   it "should operate in master run_mode" do
-    @cert_app.class.run_mode.name.should equal(:master)
+    expect(@cert_app.class.run_mode.name).to equal(:master)
   end
 
   it "should declare a main command" do
-    @cert_app.should respond_to(:main)
+    expect(@cert_app).to respond_to(:main)
   end
 
   Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject{ |m| m == :destroy }.each do |method|
     it "should declare option --#{method}" do
-      @cert_app.should respond_to("handle_#{method}".to_sym)
+      expect(@cert_app).to respond_to("handle_#{method}".to_sym)
     end
   end
 
   it "should set log level to info with the --verbose option" do
     @cert_app.handle_verbose(0)
-    Puppet::Log.level.should == :info
+    expect(Puppet::Log.level).to eq(:info)
   end
 
   it "should set log level to debug with the --debug option" do
     @cert_app.handle_debug(0)
-    Puppet::Log.level.should == :debug
+    expect(Puppet::Log.level).to eq(:debug)
   end
 
   it "should set the fingerprint digest with the --digest option" do
     @cert_app.handle_digest(:digest)
-    @cert_app.digest.should == :digest
+    expect(@cert_app.digest).to eq(:digest)
   end
 
   it "should set cert_mode to :destroy for --clean" do
     @cert_app.handle_clean(0)
-    @cert_app.subcommand.should == :destroy
+    expect(@cert_app.subcommand).to eq(:destroy)
   end
 
   it "should set all to true for --all" do
     @cert_app.handle_all(0)
-    @cert_app.all.should be_true
+    expect(@cert_app.all).to be_truthy
   end
 
   it "should set signed to true for --signed" do
     @cert_app.handle_signed(0)
-    @cert_app.signed.should be_true
+    expect(@cert_app.signed).to be_truthy
   end
 
   Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject { |m| m == :destroy }.each do |method|
     it "should set cert_mode to #{method} with option --#{method}" do
       @cert_app.send("handle_#{method}".to_sym, nil)
 
-      @cert_app.subcommand.should == method
+      expect(@cert_app.subcommand).to eq(method)
     end
   end
 
@@ -188,9 +188,9 @@ describe Puppet::Application::Cert => true do
 
           @cert_app.command_line.stubs(:args).returns(args)
           @cert_app.parse_options
-          @cert_app.subcommand.should == cmd.to_sym
+          expect(@cert_app.subcommand).to eq(cmd.to_sym)
 
-          args.should == ["fun.example.com"]
+          expect(args).to eq(["fun.example.com"])
         end
       end
     end
@@ -201,9 +201,9 @@ describe Puppet::Application::Cert => true do
 
         @cert_app.command_line.stubs(:args).returns(args)
         @cert_app.parse_options
-        @cert_app.subcommand.should == :destroy
+        expect(@cert_app.subcommand).to eq(:destroy)
 
-        args.should == ["fun.example.com"]
+        expect(args).to eq(["fun.example.com"])
       end
     end
 
@@ -214,7 +214,7 @@ describe Puppet::Application::Cert => true do
       @cert_app.expects(:puts).with("I called for help!")
 
       expect { @cert_app.parse_options }.to exit_with 0
-      @cert_app.subcommand.should be_nil
+      expect(@cert_app.subcommand).to be_nil
     end
   end
 end

data/spec/unit/application/certificate_spec.rb

@@ -9,7 +9,7 @@ describe Puppet::Application::Certificate do
     subject.command_line.stubs(:args).returns %w{list}
     subject.preinit
     subject.parse_options
-    subject.should respond_to(:handle_ca_location)
+    expect(subject).to respond_to(:handle_ca_location)
   end
 
   it "should accept the ca-location option" do
@@ -17,6 +17,6 @@ describe Puppet::Application::Certificate do
     subject.preinit
     subject.parse_options
     subject.setup
-    subject.arguments.should == [{ :ca_location => "local" }]
+    expect(subject.arguments).to eq([{ :ca_location => "local" }])
   end
 end

data/spec/unit/application/config_spec.rb

@@ -4,6 +4,6 @@ require 'puppet/application/config'
 
 describe Puppet::Application::Config do
   it "should be a subclass of Puppet::Application::FaceBase" do
-    Puppet::Application::Config.superclass.should equal(Puppet::Application::FaceBase)
+    expect(Puppet::Application::Config.superclass).to equal(Puppet::Application::FaceBase)
   end
 end

data/spec/unit/application/describe_spec.rb

@@ -9,16 +9,16 @@ describe Puppet::Application::Describe do
   end
 
   it "should declare a main command" do
-    @describe.should respond_to(:main)
+    expect(@describe).to respond_to(:main)
   end
 
   it "should declare a preinit block" do
-    @describe.should respond_to(:preinit)
+    expect(@describe).to respond_to(:preinit)
   end
 
   [:providers,:list,:meta].each do |option|
     it "should declare handle_#{option} method" do
-      @describe.should respond_to("handle_#{option}".to_sym)
+      expect(@describe).to respond_to("handle_#{option}".to_sym)
     end
 
     it "should store argument value when calling handle_#{option}" do
@@ -32,7 +32,7 @@ describe Puppet::Application::Describe do
     it "should set options[:parameters] to true" do
       @describe.preinit
 
-      @describe.options[:parameters].should be_true
+      expect(@describe.options[:parameters]).to be_truthy
     end
   end
 
@@ -40,7 +40,7 @@ describe Puppet::Application::Describe do
     it "should set options[:parameters] to false" do
       @describe.handle_short(nil)
 
-      @describe.options[:parameters].should be_false
+      expect(@describe.options[:parameters]).to be_falsey
     end
   end
 
@@ -49,7 +49,7 @@ describe Puppet::Application::Describe do
       @describe.command_line.stubs(:args).returns(['1','2'])
       @describe.setup
 
-      @describe.options[:types].should == ['1','2']
+      expect(@describe.options[:types]).to eq(['1','2'])
     end
   end
 

data/spec/unit/application/device_spec.rb

@@ -20,15 +20,15 @@ describe Puppet::Application::Device do
   end
 
   it "should operate in agent run_mode" do
-    @device.class.run_mode.name.should == :agent
+    expect(@device.class.run_mode.name).to eq(:agent)
   end
 
   it "should declare a main command" do
-    @device.should respond_to(:main)
+    expect(@device).to respond_to(:main)
   end
 
   it "should declare a preinit block" do
-    @device.should respond_to(:preinit)
+    expect(@device).to respond_to(:preinit)
   end
 
   describe "in preinit" do
@@ -45,7 +45,7 @@ describe Puppet::Application::Device do
     it "should init waitforcert to nil" do
       @device.preinit
 
-      @device.options[:waitforcert].should be_nil
+      expect(@device.options[:waitforcert]).to be_nil
     end
   end
 
@@ -56,7 +56,7 @@ describe Puppet::Application::Device do
 
     [:centrallogging, :debug, :verbose,].each do |option|
       it "should declare handle_#{option} method" do
-        @device.should respond_to("handle_#{option}".to_sym)
+        expect(@device).to respond_to("handle_#{option}".to_sym)
       end
 
       it "should store argument value when calling handle_#{option}" do
@@ -118,7 +118,7 @@ describe Puppet::Application::Device do
 
     it "should set args[:Port] with --port" do
       @device.handle_port("42")
-      @device.args[:Port].should == "42"
+      expect(@device.args[:Port]).to eq("42")
     end
 
   end
@@ -126,6 +126,7 @@ describe Puppet::Application::Device do
   describe "during setup" do
     before :each do
       @device.options.stubs(:[])
+      Puppet.stubs(:info)
       Puppet[:libdir] = "/dev/null/lib"
       Puppet::SSL::Host.stubs(:ca_location=)
       Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
@@ -150,13 +151,13 @@ describe Puppet::Application::Device do
       it "should set log level to debug if --debug was passed" do
         @device.options.stubs(:[]).with(:debug).returns(true)
         @device.setup_logs
-        Puppet::Util::Log.level.should == :debug
+        expect(Puppet::Util::Log.level).to eq(:debug)
       end
 
       it "should set log level to info if --verbose was passed" do
         @device.options.stubs(:[]).with(:verbose).returns(true)
         @device.setup_logs
-        Puppet::Util::Log.level.should == :info
+        expect(Puppet::Util::Log.level).to eq(:info)
       end
 
       [:verbose, :debug].each do |level|
@@ -209,12 +210,12 @@ describe Puppet::Application::Device do
 
     it "should default the catalog_terminus setting to 'rest'" do
       @device.initialize_app_defaults
-      Puppet[:catalog_terminus].should ==  :rest
+      expect(Puppet[:catalog_terminus]).to eq(:rest)
     end
 
     it "should default the node_terminus setting to 'rest'" do
       @device.initialize_app_defaults
-      Puppet[:node_terminus].should ==  :rest
+      expect(Puppet[:node_terminus]).to eq(:rest)
     end
 
     it "has an application default :catalog_cache_terminus setting of 'json'" do
@@ -242,7 +243,7 @@ describe Puppet::Application::Device do
 
     it "should default the facts_terminus setting to 'network_device'" do
       @device.initialize_app_defaults
-      Puppet[:facts_terminus].should == :network_device
+      expect(Puppet[:facts_terminus]).to eq(:network_device)
     end
   end
 
@@ -270,7 +271,6 @@ describe Puppet::Application::Device do
     before :each do
       @device.options.stubs(:[]).with(:fingerprint).returns(false)
       Puppet.stubs(:notice)
-      @device.options.stubs(:[]).with(:detailed_exitcodes).returns(false)
       @device.options.stubs(:[]).with(:client)
       Puppet::Util::NetworkDevice::Config.stubs(:devices).returns({})
     end
@@ -283,7 +283,7 @@ describe Puppet::Application::Device do
     it "should get the device list" do
       device_hash = stub_everything 'device hash'
       Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
-      expect { @device.main }.to exit_with 1
+      @device.main
     end
 
     it "should exit if the device list is empty" do
@@ -296,8 +296,8 @@ describe Puppet::Application::Device do
         Puppet[:confdir] = make_absolute("/dummy")
         Puppet[:certname] = "certname"
         @device_hash = {
-          "device1" => OpenStruct.new(:name => "device1", :url => "ssh://user:pass@testhost", :provider => "cisco"),
-          "device2" => OpenStruct.new(:name => "device2", :url => "https://user:pass@testhost/some/path", :provider => "rest"),
+          "device1" => OpenStruct.new(:name => "device1", :url => "url", :provider => "cisco"),
+          "device2" => OpenStruct.new(:name => "device2", :url => "url", :provider => "cisco"),
         }
         Puppet::Util::NetworkDevice::Config.stubs(:devices).returns(@device_hash)
         Puppet.stubs(:[]=)
@@ -310,76 +310,38 @@ describe Puppet::Application::Device do
 
       it "should set vardir to the device vardir" do
         Puppet.expects(:[]=).with(:vardir, make_absolute("/dummy/devices/device1"))
-        expect { @device.main }.to exit_with 1
+        @device.main
       end
 
       it "should set confdir to the device confdir" do
         Puppet.expects(:[]=).with(:confdir, make_absolute("/dummy/devices/device1"))
-        expect { @device.main }.to exit_with 1
+        @device.main
       end
 
       it "should set certname to the device certname" do
         Puppet.expects(:[]=).with(:certname, "device1")
         Puppet.expects(:[]=).with(:certname, "device2")
-        expect { @device.main }.to exit_with 1
+        @device.main
       end
 
       it "should make sure all the required folders and files are created" do
         Puppet.settings.expects(:use).with(:main, :agent, :ssl).twice
-        expect { @device.main }.to exit_with 1
+        @device.main
       end
 
       it "should initialize the device singleton" do
         Puppet::Util::NetworkDevice.expects(:init).with(@device_hash["device1"]).then.with(@device_hash["device2"])
-        expect { @device.main }.to exit_with 1
-      end
-
-      it "should print the device url scheme, host, and port" do
-        Puppet.expects(:info).with "starting applying configuration to device1 at ssh://testhost"
-        Puppet.expects(:info).with "starting applying configuration to device2 at https://testhost:443/some/path"
-        expect { @device.main }.to exit_with 1
+        @device.main
       end
 
       it "should setup the SSL context" do
         @device.expects(:setup_host).twice
-        expect { @device.main }.to exit_with 1
+        @device.main
       end
 
       it "should launch a configurer for this device" do
         @configurer.expects(:run).twice
-        expect { @device.main }.to exit_with 1
-      end
-
-      it "exits 1 when configurer raises error" do
-        @configurer.stubs(:run).raises(Puppet::Error).then.returns(0)
-        expect { @device.main }.to exit_with 1
-      end
-
-      it "exits 0 when run happens without puppet errors but with failed run" do
-        @configurer.stubs(:run).returns(6,2)
-        expect { @device.main }.to exit_with 0
-      end
-
-      it "exits 2 when --detailed-exitcodes and successful runs" do
-        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
-        @configurer.stubs(:run).returns(0,2)
-        expect { @device.main }.to exit_with 2
-      end
-
-      it "exits 1 when --detailed-exitcodes and failed parse" do
-        @configurer = stub_everything 'configurer'
-        Puppet::Configurer.stubs(:new).returns(@configurer)
-        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
-        @configurer.stubs(:run).returns(6,1)
-        expect { @device.main }.to exit_with 7
-      end
-
-      it "exits 6 when --detailed-exitcodes and failed run" do
-        @configurer = stub_everything 'configurer'
-        Puppet::Configurer.stubs(:new).returns(@configurer)
-        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
-        @configurer.stubs(:run).returns(6,2)
-        expect { @device.main }.to exit_with 6
+        @device.main
       end
 
       [:vardir, :confdir].each do |setting|
@@ -407,7 +369,7 @@ describe Puppet::Application::Device do
           end
 
 
-          expect { @device.main }.to exit_with 1
+          @device.main
 
           expect(found_devices).to eq(all_devices)
         end
@@ -437,7 +399,7 @@ describe Puppet::Application::Device do
         end
 
 
-        expect { @device.main }.to exit_with 1
+        @device.main
 
         # make sure that we were called with each of the defined devices
         expect(found_devices).to eq(all_devices)
@@ -446,7 +408,7 @@ describe Puppet::Application::Device do
       it "should expire all cached attributes" do
         Puppet::SSL::Host.expects(:reset).twice
 
-        expect { @device.main }.to exit_with 1
+        @device.main
       end
     end
   end