puppet 5.5.12 → 5.5.13

data/spec/unit/indirector/ssl_file_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/ssl_file'
@@ -6,16 +5,13 @@ require 'puppet/indirector/ssl_file'
 describe Puppet::Indirector::SslFile do
   include PuppetSpec::Files
 
-  before :all do
-    @indirection = stub 'indirection', :name => :testing, :model => @model
-    Puppet::Indirector::Indirection.expects(:instance).with(:testing).returns(@indirection)
+  before :each do
+    @indirection = Puppet::Indirector::Indirection.new(nil, :testing)
+
     module Testing; end
     @file_class = class Testing::MyType < Puppet::Indirector::SslFile
       self
     end
-  end
-  before :each do
-    @model = mock 'model'
 
     @setting = :certdir
     @file_class.store_in @setting
@@ -31,10 +27,11 @@ describe Puppet::Indirector::SslFile do
     @file_class.store_in nil
     @file_class.store_at nil
     @file_class.store_ca_at nil
+    @indirection.delete
   end
 
   it "should use :main and :ssl upon initialization" do
-    Puppet.settings.expects(:use).with(:main, :ssl)
+    expect(Puppet.settings).to receive(:use).with(:main, :ssl)
     @file_class.new
   end
 
@@ -49,7 +46,7 @@ describe Puppet::Indirector::SslFile do
   end
 
   it "should fail if no store directory or file location has been set" do
-    Puppet.settings.expects(:use).with(:main, :ssl)
+    expect(Puppet.settings).to receive(:use).with(:main, :ssl)
     @file_class.store_in nil
     @file_class.store_at nil
     expect {
@@ -59,17 +56,17 @@ describe Puppet::Indirector::SslFile do
 
   describe "when managing ssl files" do
     before do
-      Puppet.settings.stubs(:use)
+      allow(Puppet.settings).to receive(:use)
       @searcher = @file_class.new
 
-      @cert = stub 'certificate', :name => "myname"
+      @cert = double('certificate', :name => "myname")
       @certpath = File.join(@path, "myname.pem")
 
-      @request = stub 'request', :key => @cert.name, :instance => @cert
+      @request = double('request', :key => @cert.name, :instance => @cert)
     end
 
     it "should consider the file a ca file if the name is equal to what the SSL::Host class says is the CA name" do
-      Puppet::SSL::Host.expects(:ca_name).returns "amaca"
+      expect(Puppet::SSL::Host).to receive(:ca_name).and_return("amaca")
       expect(@searcher).to be_ca("amaca")
     end
 
@@ -81,7 +78,7 @@ describe Puppet::Indirector::SslFile do
 
         Puppet[:cakey] = File.expand_path("/ca/file")
 
-        @searcher.expects(:ca?).with(@cert.name).returns true
+        expect(@searcher).to receive(:ca?).with(@cert.name).and_return(true)
         expect(@searcher.path(@cert.name)).to eq(Puppet[:cakey])
       end
 
@@ -121,28 +118,28 @@ describe Puppet::Indirector::SslFile do
     describe "when finding certificates on disk" do
       describe "and no certificate is present" do
         it "should return nil" do
-          Puppet::FileSystem.expects(:exist?).with(@path).returns(true)
-          Dir.expects(:entries).with(@path).returns([])
-          Puppet::FileSystem.expects(:exist?).with(@certpath).returns(false)
+          expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
+          expect(Dir).to receive(:entries).with(@path).and_return([])
+          expect(Puppet::FileSystem).to receive(:exist?).with(@certpath).and_return(false)
 
           expect(@searcher.find(@request)).to be_nil
         end
       end
 
       describe "and a certificate is present" do
-        let(:cert) { mock 'cert' }
-        let(:model) { mock 'model' }
+        let(:cert) { double('cert') }
+        let(:model) { double('model') }
 
         before(:each) do
-          @file_class.stubs(:model).returns model
+          allow(@file_class).to receive(:model).and_return(model)
         end
 
         context "is readable" do
           it "should return an instance of the model, which it should use to read the certificate" do
-            Puppet::FileSystem.expects(:exist?).with(@certpath).returns true
+            expect(Puppet::FileSystem).to receive(:exist?).with(@certpath).and_return(true)
 
-            model.expects(:new).with("myname").returns cert
-            cert.expects(:read).with(@certpath)
+            expect(model).to receive(:new).with("myname").and_return(cert)
+            expect(cert).to receive(:read).with(@certpath)
 
             expect(@searcher.find(@request)).to equal(cert)
           end
@@ -150,10 +147,10 @@ describe Puppet::Indirector::SslFile do
 
         context "is unreadable" do
           it "should raise an exception" do
-            Puppet::FileSystem.expects(:exist?).with(@certpath).returns(true)
+            expect(Puppet::FileSystem).to receive(:exist?).with(@certpath).and_return(true)
 
-            model.expects(:new).with("myname").returns cert
-            cert.expects(:read).with(@certpath).raises(Errno::EACCES)
+            expect(model).to receive(:new).with("myname").and_return(cert)
+            expect(cert).to receive(:read).with(@certpath).and_raise(Errno::EACCES)
 
             expect {
               @searcher.find(@request)
@@ -164,25 +161,25 @@ describe Puppet::Indirector::SslFile do
 
       describe "and a certificate is present but has uppercase letters" do
         before do
-          @request = stub 'request', :key => "myhost"
+          @request = double('request', :key => "myhost")
         end
 
         # This is kind of more an integration test; it's for #1382, until
         # the support for upper-case certs can be removed around mid-2009.
         it "should rename the existing file to the lower-case path" do
           @path = @searcher.path("myhost")
-          Puppet::FileSystem.expects(:exist?).with(@path).returns(false)
+          expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(false)
           dir, file = File.split(@path)
-          Puppet::FileSystem.expects(:exist?).with(dir).returns true
-          Dir.expects(:entries).with(dir).returns [".", "..", "something.pem", file.upcase]
+          expect(Puppet::FileSystem).to receive(:exist?).with(dir).and_return(true)
+          expect(Dir).to receive(:entries).with(dir).and_return([".", "..", "something.pem", file.upcase])
 
-          File.expects(:rename).with(File.join(dir, file.upcase), @path)
+          expect(File).to receive(:rename).with(File.join(dir, file.upcase), @path)
 
-          cert = mock 'cert'
-          model = mock 'model'
-          @searcher.stubs(:model).returns model
-          @searcher.model.expects(:new).with("myhost").returns cert
-          cert.expects(:read).with(@path)
+          cert = double('cert')
+          model = double('model')
+          allow(@searcher).to receive(:model).and_return(model)
+          expect(@searcher.model).to receive(:new).with("myhost").and_return(cert)
+          expect(cert).to receive(:read).with(@path)
 
           @searcher.find(@request)
         end
@@ -191,27 +188,27 @@ describe Puppet::Indirector::SslFile do
 
     describe "when saving certificates to disk" do
       before do
-        FileTest.stubs(:directory?).returns true
-        FileTest.stubs(:writable?).returns true
+        allow(FileTest).to receive(:directory?).and_return(true)
+        allow(FileTest).to receive(:writable?).and_return(true)
       end
 
       it "should fail if the directory is absent" do
-        FileTest.expects(:directory?).with(File.dirname(@certpath)).returns false
+        expect(FileTest).to receive(:directory?).with(File.dirname(@certpath)).and_return(false)
         expect { @searcher.save(@request) }.to raise_error(Puppet::Error)
       end
 
       it "should fail if the directory is not writeable" do
-        FileTest.stubs(:directory?).returns true
-        FileTest.expects(:writable?).with(File.dirname(@certpath)).returns false
+        allow(FileTest).to receive(:directory?).and_return(true)
+        expect(FileTest).to receive(:writable?).with(File.dirname(@certpath)).and_return(false)
         expect { @searcher.save(@request) }.to raise_error(Puppet::Error)
       end
 
       it "should save to the path the output of converting the certificate to a string" do
-        fh = mock 'filehandle'
-        fh.expects(:print).with("mycert")
+        fh = double('filehandle')
+        expect(fh).to receive(:print).with("mycert")
 
-        @searcher.stubs(:write).yields fh
-        @cert.expects(:to_s).returns "mycert"
+        allow(@searcher).to receive(:write).and_yield(fh)
+        expect(@cert).to receive(:to_s).and_return("mycert")
 
         @searcher.save(@request)
       end
@@ -219,9 +216,9 @@ describe Puppet::Indirector::SslFile do
       describe "and a directory setting is set" do
         it "should use the Settings class to write the file" do
           @searcher.class.store_in @setting
-          fh = mock 'filehandle'
-          fh.stubs :print
-          Puppet.settings.setting(@setting).expects(:open_file).with(@certpath, 'w:ASCII').yields fh
+          fh = double('filehandle')
+          allow(fh).to receive(:print)
+          expect(Puppet.settings.setting(@setting)).to receive(:open_file).with(@certpath, 'w:ASCII').and_yield(fh)
 
           @searcher.save(@request)
         end
@@ -231,9 +228,9 @@ describe Puppet::Indirector::SslFile do
         it "should use the filehandle provided by the Settings" do
           @searcher.class.store_at @setting
 
-          fh = mock 'filehandle'
-          fh.stubs :print
-          Puppet.settings.setting(@setting).expects(:open).with('w:ASCII').yields fh
+          fh = double('filehandle')
+          allow(fh).to receive(:print)
+          expect(Puppet.settings.setting(@setting)).to receive(:open).with('w:ASCII').and_yield(fh)
           @searcher.save(@request)
         end
       end
@@ -244,10 +241,10 @@ describe Puppet::Indirector::SslFile do
           @searcher.class.store_ca_at :cakey
           Puppet[:cakey] = "castuff stub"
 
-          fh = mock 'filehandle'
-          fh.stubs :print
-          Puppet.settings.setting(:cakey).expects(:open).with('w:ASCII').yields fh
-          @searcher.stubs(:ca?).returns true
+          fh = double('filehandle')
+          allow(fh).to receive(:print)
+          expect(Puppet.settings.setting(:cakey)).to receive(:open).with('w:ASCII').and_yield(fh)
+          allow(@searcher).to receive(:ca?).and_return(true)
           @searcher.save(@request)
         end
       end
@@ -256,7 +253,7 @@ describe Puppet::Indirector::SslFile do
     describe "when destroying certificates" do
       describe "that do not exist" do
         before do
-          Puppet::FileSystem.expects(:exist?).with(Puppet::FileSystem.pathname(@certpath)).returns false
+          expect(Puppet::FileSystem).to receive(:exist?).with(Puppet::FileSystem.pathname(@certpath)).and_return(false)
         end
 
         it "should return false" do
@@ -267,49 +264,49 @@ describe Puppet::Indirector::SslFile do
       describe "that exist" do
         it "should unlink the certificate file" do
           path = Puppet::FileSystem.pathname(@certpath)
-          Puppet::FileSystem.expects(:exist?).with(path).returns true
-          Puppet::FileSystem.expects(:unlink).with(path)
+          expect(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
+          expect(Puppet::FileSystem).to receive(:unlink).with(path)
           @searcher.destroy(@request)
         end
 
         it "should log that is removing the file" do
-          Puppet::FileSystem.stubs(:exist?).returns true
-          Puppet::FileSystem.stubs(:unlink)
-          Puppet.expects(:notice)
+          allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+          allow(Puppet::FileSystem).to receive(:unlink)
+          expect(Puppet).to receive(:notice)
           @searcher.destroy(@request)
         end
       end
     end
 
     describe "when searching for certificates" do
-      let(:one) { stub 'one' }
-      let(:two) { stub 'two' }
+      let(:one) { double('one') }
+      let(:two) { double('two') }
       let(:one_path) { File.join(@path, 'one.pem') }
       let(:two_path) { File.join(@path, 'two.pem') }
-      let(:model) { mock 'model' }
+      let(:model) { double('model') }
 
       before :each do
-        @file_class.stubs(:model).returns model
+        allow(@file_class).to receive(:model).and_return(model)
       end
 
       it "should return a certificate instance for all files that exist" do
-        Dir.expects(:entries).with(@path).returns(%w{. .. one.pem two.pem})
+        expect(Dir).to receive(:entries).with(@path).and_return(%w{. .. one.pem two.pem})
 
-        model.expects(:new).with("one").returns one
-        one.expects(:read).with(one_path)
-        model.expects(:new).with("two").returns two
-        two.expects(:read).with(two_path)
+        expect(model).to receive(:new).with("one").and_return(one)
+        expect(one).to receive(:read).with(one_path)
+        expect(model).to receive(:new).with("two").and_return(two)
+        expect(two).to receive(:read).with(two_path)
 
         expect(@searcher.search(@request)).to eq([one, two])
       end
 
       it "should raise an exception if any file is unreadable" do
-        Dir.expects(:entries).with(@path).returns(%w{. .. one.pem two.pem})
+        expect(Dir).to receive(:entries).with(@path).and_return(%w{. .. one.pem two.pem})
 
-        model.expects(:new).with("one").returns(one)
-        one.expects(:read).with(one_path)
-        model.expects(:new).with("two").returns(two)
-        two.expects(:read).raises(Errno::EACCES)
+        expect(model).to receive(:new).with("one").and_return(one)
+        expect(one).to receive(:read).with(one_path)
+        expect(model).to receive(:new).with("two").and_return(two)
+        expect(two).to receive(:read).and_raise(Errno::EACCES)
 
         expect {
           @searcher.search(@request)
@@ -317,9 +314,9 @@ describe Puppet::Indirector::SslFile do
       end
 
       it "should skip any files that do not match /\.pem$/" do
-        Dir.expects(:entries).with(@path).returns(%w{. .. one two.notpem})
+        expect(Dir).to receive(:entries).with(@path).and_return(%w{. .. one two.notpem})
 
-        model.expects(:new).never
+        expect(model).not_to receive(:new)
 
         expect(@searcher.search(@request)).to eq([])
       end

data/spec/unit/indirector/status/local_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/status/local'

data/spec/unit/indirector/status/rest_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/status/rest'

data/spec/unit/indirector/store_configs_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/store_configs'

data/spec/unit/indirector/terminus_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/defaults'
 require 'puppet/indirector'
@@ -21,7 +20,7 @@ describe Puppet::Indirector::Terminus do
 
   after :all do
     # Remove the class, unlinking it from the rest of the system.
-    Puppet.send(:remove_const, :AbstractConcept)
+    Puppet.send(:remove_const, :AbstractConcept) if Puppet.const_defined?(:AbstractConcept)
   end
 
   let :terminus_class do Puppet::AbstractConcept::Freedom end
@@ -94,13 +93,13 @@ describe Puppet::Indirector::Terminus do
     end
 
     it "should provide a method for returning terminus classes by name and type" do
-      terminus = stub 'terminus_type', :name => :abstract, :indirection_name => :whatever
+      terminus = double('terminus_type', :name => :abstract, :indirection_name => :whatever)
       Puppet::Indirector::Terminus.register_terminus_class(terminus)
       expect(Puppet::Indirector::Terminus.terminus_class(:whatever, :abstract)).to equal(terminus)
     end
 
     it "should set up autoloading for any terminus class types requested" do
-      Puppet::Indirector::Terminus.expects(:instance_load).with(:test2, "puppet/indirector/test2")
+      expect(Puppet::Indirector::Terminus).to receive(:instance_load).with(:test2, "puppet/indirector/test2")
       Puppet::Indirector::Terminus.terminus_class(:test2, :whatever)
     end
 
@@ -108,12 +107,12 @@ describe Puppet::Indirector::Terminus do
       # Set up instance loading; it would normally happen automatically
       Puppet::Indirector::Terminus.instance_load :test1, "puppet/indirector/test1"
 
-      Puppet::Indirector::Terminus.instance_loader(:test1).expects(:load).with(:yay)
+      expect(Puppet::Indirector::Terminus.instance_loader(:test1)).to receive(:load).with(:yay)
       Puppet::Indirector::Terminus.terminus_class(:test1, :yay)
     end
 
     it "should fail when no indirection can be found" do
-      Puppet::Indirector::Indirection.expects(:instance).with(:abstract_concept).returns(nil)
+      expect(Puppet::Indirector::Indirection).to receive(:instance).with(:abstract_concept).and_return(nil)
       expect {
         class Puppet::AbstractConcept::Physics < Puppet::Indirector::Code
         end
@@ -121,8 +120,9 @@ describe Puppet::Indirector::Terminus do
     end
 
     it "should register the terminus class with the terminus base class" do
-      Puppet::Indirector::Terminus.expects(:register_terminus_class).with do |type|
-        type.indirection_name == :abstract_concept and type.name == :intellect
+      expect(Puppet::Indirector::Terminus).to receive(:register_terminus_class) do |type|
+        expect(type.indirection_name).to eq(:abstract_concept)
+        expect(type.name).to eq(:intellect)
       end
 
       begin
@@ -136,13 +136,13 @@ describe Puppet::Indirector::Terminus do
 
   describe "when parsing class constants for indirection and terminus names" do
     before :each do
-      Puppet::Indirector::Terminus.stubs(:register_terminus_class)
+      allow(Puppet::Indirector::Terminus).to receive(:register_terminus_class)
     end
 
     let :subclass do
-      subclass = mock 'subclass'
-      subclass.stubs(:to_s).returns("TestInd::OneTwo")
-      subclass.stubs(:mark_as_abstract_terminus)
+      subclass = double('subclass')
+      allow(subclass).to receive(:to_s).and_return("TestInd::OneTwo")
+      allow(subclass).to receive(:mark_as_abstract_terminus)
       subclass
     end
 
@@ -153,49 +153,51 @@ describe Puppet::Indirector::Terminus do
     end
 
     it "should use the last term in the constant for the terminus class name" do
-      subclass.expects(:name=).with(:one_two)
-      subclass.stubs(:indirection=)
+      expect(subclass).to receive(:name=).with(:one_two)
+      allow(subclass).to receive(:indirection=)
       Puppet::Indirector::Terminus.inherited(subclass)
     end
 
     it "should convert the terminus name to a downcased symbol" do
-      subclass.expects(:name=).with(:one_two)
-      subclass.stubs(:indirection=)
+      expect(subclass).to receive(:name=).with(:one_two)
+      allow(subclass).to receive(:indirection=)
       Puppet::Indirector::Terminus.inherited(subclass)
     end
 
     it "should use the second to last term in the constant for the indirection name" do
-      subclass.expects(:indirection=).with(:test_ind)
-      subclass.stubs(:name=)
-      subclass.stubs(:terminus_type=)
+      expect(subclass).to receive(:indirection=).with(:test_ind)
+      allow(subclass).to receive(:name=)
+      allow(subclass).to receive(:terminus_type=)
       Puppet::Indirector::Memory.inherited(subclass)
     end
 
     it "should convert the indirection name to a downcased symbol" do
-      subclass.expects(:indirection=).with(:test_ind)
-      subclass.stubs(:name=)
-      subclass.stubs(:terminus_type=)
+      expect(subclass).to receive(:indirection=).with(:test_ind)
+      allow(subclass).to receive(:name=)
+      allow(subclass).to receive(:terminus_type=)
       Puppet::Indirector::Memory.inherited(subclass)
     end
 
     it "should convert camel case to lower case with underscores as word separators" do
-      subclass.expects(:name=).with(:one_two)
-      subclass.stubs(:indirection=)
+      expect(subclass).to receive(:name=).with(:one_two)
+      allow(subclass).to receive(:indirection=)
 
       Puppet::Indirector::Terminus.inherited(subclass)
     end
   end
 
   describe "when creating terminus class types" do
-    before :all do
-      Puppet::Indirector::Terminus.stubs(:register_terminus_class)
+    before(:each) do
+      allow(Puppet::Indirector::Terminus).to receive(:register_terminus_class)
+    end
 
+    before :all do
       class Puppet::Indirector::Terminus::TestTerminusType < Puppet::Indirector::Terminus
       end
     end
 
     after :all do
-      Puppet::Indirector::Terminus.send(:remove_const, :TestTerminusType)
+      Puppet::Indirector::Terminus.send(:remove_const, :TestTerminusType) if Puppet::Indirector::Terminus.const_defined?(:TestTerminusType)
     end
 
     let :subclass do
@@ -217,7 +219,7 @@ describe Puppet::Indirector::Terminus do
 
   describe "when listing terminus classes" do
     it "should list the terminus files available to load" do
-      Puppet::Util::Autoload.any_instance.stubs(:files_to_load).returns ["/foo/bar/baz", "/max/runs/marathon"]
+      allow_any_instance_of(Puppet::Util::Autoload).to receive(:files_to_load).and_return(["/foo/bar/baz", "/max/runs/marathon"])
       expect(Puppet::Indirector::Terminus.terminus_classes('my_stuff')).to eq([:baz, :marathon])
     end
   end
@@ -241,7 +243,7 @@ describe Puppet::Indirector::Terminus do
     end
 
     describe "`instance` is not an instance of the model class" do
-      let(:instance) { mock "instance" }
+      let(:instance) { double("instance") }
 
       it "raises an error" do
         expect {