puppet 6.4.0-x64-mingw32 → 6.4.1-x64-mingw32

data/spec/unit/file_serving/mount/file_spec.rb

@@ -1,11 +1,10 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/file'
 
 module FileServingMountTesting
   def stub_facter(hostname)
-    Facter.stubs(:value).with("hostname").returns(hostname.sub(/\..+/, ''))
-    Facter.stubs(:value).with("domain").returns(hostname.sub(/^[^.]+\./, ''))
+    allow(Facter).to receive(:value).with("hostname").and_return(hostname.sub(/\..+/, ''))
+    allow(Facter).to receive(:value).with("domain").and_return(hostname.sub(/^[^.]+\./, ''))
   end
 end
 
@@ -15,8 +14,8 @@ describe Puppet::FileServing::Mount::File do
   end
 
   it "should be valid if it has a path" do
-    FileTest.stubs(:directory?).returns true
-    FileTest.stubs(:readable?).returns true
+    allow(FileTest).to receive(:directory?).and_return(true)
+    allow(FileTest).to receive(:readable?).and_return(true)
     mount = Puppet::FileServing::Mount::File.new("foo")
     mount.path = "/foo"
     expect { mount.validate }.not_to raise_error
@@ -29,13 +28,13 @@ describe Puppet::FileServing::Mount::File do
     end
 
     it "should fail if the path is not a directory" do
-      FileTest.expects(:directory?).returns(false)
+      expect(FileTest).to receive(:directory?).and_return(false)
       expect { @mount.path = @dir }.to raise_error(ArgumentError)
     end
 
     it "should fail if the path is not readable" do
-      FileTest.expects(:directory?).returns(true)
-      FileTest.expects(:readable?).returns(false)
+      expect(FileTest).to receive(:directory?).and_return(true)
+      expect(FileTest).to receive(:readable?).and_return(false)
       expect { @mount.path = @dir }.to raise_error(ArgumentError)
     end
   end
@@ -44,8 +43,8 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @host = "host.domain.com"
     end
@@ -85,9 +84,9 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @mount.path = "/mount"
       stub_facter("myhost.mydomain.com")
@@ -95,25 +94,25 @@ describe Puppet::FileServing::Mount::File do
     end
 
     it "should return nil if the file is absent" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
       expect(@mount.complete_path("/my/path", nil)).to be_nil
     end
 
     it "should write a log message if the file is absent" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
 
-      Puppet.expects(:info).with("File does not exist or is not accessible: /mount/my/path")
+      expect(Puppet).to receive(:info).with("File does not exist or is not accessible: /mount/my/path")
 
       @mount.complete_path("/my/path", nil)
     end
 
     it "should return the file path if the file is present" do
-      Puppet::FileSystem.stubs(:exist?).with("/my/path").returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).with("/my/path").and_return(true)
       expect(@mount.complete_path("/my/path", nil)).to eq("/mount/my/path")
     end
 
     it "should treat a nil file name as the path to the mount itself" do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
       expect(@mount.complete_path(nil, nil)).to eq("/mount")
     end
 
@@ -141,20 +140,20 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @mount.path = "/mount"
       stub_facter("myhost.mydomain.com")
       @host = "host.domain.com"
 
-      @request = stub 'request', :node => "foo"
+      @request = double('request', :node => "foo")
     end
 
     it "should return the results of the complete file path" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
-      @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
+      expect(@mount).to receive(:complete_path).with("/my/path", "foo").and_return("eh")
       expect(@mount.find("/my/path", @request)).to eq("eh")
     end
   end
@@ -163,26 +162,26 @@ describe Puppet::FileServing::Mount::File do
     include FileServingMountTesting
 
     before do
-      Puppet::FileSystem.stubs(:exist?).returns(true)
-      FileTest.stubs(:directory?).returns(true)
-      FileTest.stubs(:readable?).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+      allow(FileTest).to receive(:directory?).and_return(true)
+      allow(FileTest).to receive(:readable?).and_return(true)
       @mount = Puppet::FileServing::Mount::File.new("test")
       @mount.path = "/mount"
       stub_facter("myhost.mydomain.com")
       @host = "host.domain.com"
 
-      @request = stub 'request', :node => "foo"
+      @request = double('request', :node => "foo")
     end
 
     it "should return the results of the complete file path as an array" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
-      @mount.expects(:complete_path).with("/my/path", "foo").returns "eh"
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
+      expect(@mount).to receive(:complete_path).with("/my/path", "foo").and_return("eh")
       expect(@mount.search("/my/path", @request)).to eq(["eh"])
     end
 
     it "should return nil if the complete path is nil" do
-      Puppet::FileSystem.stubs(:exist?).returns(false)
-      @mount.expects(:complete_path).with("/my/path", "foo").returns nil
+      allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
+      expect(@mount).to receive(:complete_path).with("/my/path", "foo").and_return(nil)
       expect(@mount.search("/my/path", @request)).to be_nil
     end
   end

data/spec/unit/file_serving/mount/locales_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/locales'
 
@@ -6,67 +5,67 @@ describe Puppet::FileServing::Mount::Locales do
   before do
     @mount = Puppet::FileServing::Mount::Locales.new("locales")
 
-    @environment = stub 'environment', :module => nil
+    @environment = double('environment', :module => nil)
     @options = { :recurse => true }
-    @request = stub 'request', :environment => @environment, :options => @options
+    @request = double('request', :environment => @environment, :options => @options)
   end
 
   describe  "when finding files" do
     it "should use the provided environment to find the modules" do
-      @environment.expects(:modules).returns []
+      expect(@environment).to receive(:modules).and_return([])
 
       @mount.find("foo", @request)
     end
 
     it "should return nil if no module can be found with a matching locale" do
-      mod = mock 'module'
-      mod.stubs(:locale).with("foo/bar").returns nil
+      mod = double('module')
+      allow(mod).to receive(:locale).with("foo/bar").and_return(nil)
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to be_nil
     end
 
     it "should return the file path from the module" do
-      mod = mock 'module'
-      mod.stubs(:locale).with("foo/bar").returns "eh"
+      mod = double('module')
+      allow(mod).to receive(:locale).with("foo/bar").and_return("eh")
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to eq("eh")
     end
   end
 
   describe "when searching for files" do
     it "should use the node's environment to find the modules" do
-      @environment.expects(:modules).at_least_once.returns []
-      @environment.stubs(:modulepath).returns ["/tmp/modules"]
+      expect(@environment).to receive(:modules).at_least(:once).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/tmp/modules"])
 
       @mount.search("foo", @request)
     end
 
     it "should return modulepath if no modules can be found that have locales" do
-      mod = mock 'module'
-      mod.stubs(:locales?).returns false
+      mod = double('module')
+      allow(mod).to receive(:locales?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns ["/"]
-      @options.expects(:[]=).with(:recurse, false)
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/"])
+      expect(@options).to receive(:[]=).with(:recurse, false)
       expect(@mount.search("foo/bar", @request)).to eq(["/"])
     end
 
     it "should return nil if no modules can be found that have locales and modulepath is invalid" do
-      mod = mock 'module'
-      mod.stubs(:locales?).returns false
+      mod = double('module')
+      allow(mod).to receive(:locales?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns []
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return([])
       expect(@mount.search("foo/bar", @request)).to be_nil
     end
 
     it "should return the locale paths for each module that has locales" do
-      one = stub 'module', :locales? => true, :locale_directory => "/one"
-      two = stub 'module', :locales? => true, :locale_directory => "/two"
+      one = double('module', :locales? => true, :locale_directory => "/one")
+      two = double('module', :locales? => true, :locale_directory => "/two")
 
-      @environment.stubs(:modules).returns [one, two]
+      allow(@environment).to receive(:modules).and_return([one, two])
       expect(@mount.search("foo/bar", @request)).to eq(%w{/one /two})
     end
   end

data/spec/unit/file_serving/mount/modules_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/modules'
 
@@ -6,8 +5,8 @@ describe Puppet::FileServing::Mount::Modules do
   before do
     @mount = Puppet::FileServing::Mount::Modules.new("modules")
 
-    @environment = stub 'environment', :module => nil
-    @request = stub 'request', :environment => @environment
+    @environment = double('environment', :module => nil)
+    @request = double('request', :environment => @environment)
   end
 
   describe "when finding files" do
@@ -16,25 +15,25 @@ describe Puppet::FileServing::Mount::Modules do
     end
 
     it "should use the provided environment to find the module" do
-      @environment.expects(:module)
+      expect(@environment).to receive(:module)
 
       @mount.find("foo", @request)
     end
 
     it "should treat the first field of the relative path as the module name" do
-      @environment.expects(:module).with("foo")
+      expect(@environment).to receive(:module).with("foo")
       @mount.find("foo/bar/baz", @request)
     end
 
     it "should return nil if the specified module does not exist" do
-      @environment.expects(:module).with("foo").returns nil
+      expect(@environment).to receive(:module).with("foo")
       @mount.find("foo/bar/baz", @request)
     end
 
     it "should return the file path from the module" do
-      mod = mock 'module'
-      mod.expects(:file).with("bar/baz").returns "eh"
-      @environment.expects(:module).with("foo").returns mod
+      mod = double('module')
+      expect(mod).to receive(:file).with("bar/baz").and_return("eh")
+      expect(@environment).to receive(:module).with("foo").and_return(mod)
       expect(@mount.find("foo/bar/baz", @request)).to eq("eh")
     end
   end
@@ -45,25 +44,25 @@ describe Puppet::FileServing::Mount::Modules do
     end
 
     it "should use the node's environment to search the module" do
-      @environment.expects(:module)
+      expect(@environment).to receive(:module)
 
       @mount.search("foo", @request)
     end
 
     it "should treat the first field of the relative path as the module name" do
-      @environment.expects(:module).with("foo")
+      expect(@environment).to receive(:module).with("foo")
       @mount.search("foo/bar/baz", @request)
     end
 
     it "should return nil if the specified module does not exist" do
-      @environment.expects(:module).with("foo").returns nil
+      expect(@environment).to receive(:module).with("foo").and_return(nil)
       @mount.search("foo/bar/baz", @request)
     end
 
     it "should return the file path as an array from the module" do
-      mod = mock 'module'
-      mod.expects(:file).with("bar/baz").returns "eh"
-      @environment.expects(:module).with("foo").returns mod
+      mod = double('module')
+      expect(mod).to receive(:file).with("bar/baz").and_return("eh")
+      expect(@environment).to receive(:module).with("foo").and_return(mod)
       expect(@mount.search("foo/bar/baz", @request)).to eq(["eh"])
     end
   end

data/spec/unit/file_serving/mount/pluginfacts_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/pluginfacts'
 
@@ -6,67 +5,67 @@ describe Puppet::FileServing::Mount::PluginFacts do
   before do
     @mount = Puppet::FileServing::Mount::PluginFacts.new("pluginfacts")
 
-    @environment = stub 'environment', :module => nil
+    @environment = double('environment', :module => nil)
     @options = { :recurse => true }
-    @request = stub 'request', :environment => @environment, :options => @options
+    @request = double('request', :environment => @environment, :options => @options)
   end
 
   describe  "when finding files" do
     it "should use the provided environment to find the modules" do
-      @environment.expects(:modules).returns []
+      expect(@environment).to receive(:modules).and_return([])
 
       @mount.find("foo", @request)
     end
 
     it "should return nil if no module can be found with a matching plugin" do
-      mod = mock 'module'
-      mod.stubs(:pluginfact).with("foo/bar").returns nil
+      mod = double('module')
+      allow(mod).to receive(:pluginfact).with("foo/bar").and_return(nil)
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to be_nil
     end
 
     it "should return the file path from the module" do
-      mod = mock 'module'
-      mod.stubs(:pluginfact).with("foo/bar").returns "eh"
+      mod = double('module')
+      allow(mod).to receive(:pluginfact).with("foo/bar").and_return("eh")
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to eq("eh")
     end
   end
 
   describe "when searching for files" do
     it "should use the node's environment to find the modules" do
-      @environment.expects(:modules).at_least_once.returns []
-      @environment.stubs(:modulepath).returns ["/tmp/modules"]
+      expect(@environment).to receive(:modules).at_least(:once).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/tmp/modules"])
 
       @mount.search("foo", @request)
     end
 
     it "should return modulepath if no modules can be found that have plugins" do
-      mod = mock 'module'
-      mod.stubs(:pluginfacts?).returns false
+      mod = double('module')
+      allow(mod).to receive(:pluginfacts?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns ["/"]
-      @options.expects(:[]=).with(:recurse, false)
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/"])
+      expect(@options).to receive(:[]=).with(:recurse, false)
       expect(@mount.search("foo/bar", @request)).to eq(["/"])
     end
 
     it "should return nil if no modules can be found that have plugins and modulepath is invalid" do
-      mod = mock 'module'
-      mod.stubs(:pluginfacts?).returns false
+      mod = double('module')
+      allow(mod).to receive(:pluginfacts?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns []
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return([])
       expect(@mount.search("foo/bar", @request)).to be_nil
     end
 
     it "should return the plugin paths for each module that has plugins" do
-      one = stub 'module', :pluginfacts? => true, :plugin_fact_directory => "/one"
-      two = stub 'module', :pluginfacts? => true, :plugin_fact_directory => "/two"
+      one = double('module', :pluginfacts? => true, :plugin_fact_directory => "/one")
+      two = double('module', :pluginfacts? => true, :plugin_fact_directory => "/two")
 
-      @environment.stubs(:modules).returns [one, two]
+      allow(@environment).to receive(:modules).and_return([one, two])
       expect(@mount.search("foo/bar", @request)).to eq(%w{/one /two})
     end
   end

data/spec/unit/file_serving/mount/plugins_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/file_serving/mount/plugins'
 
@@ -6,67 +5,67 @@ describe Puppet::FileServing::Mount::Plugins do
   before do
     @mount = Puppet::FileServing::Mount::Plugins.new("plugins")
 
-    @environment = stub 'environment', :module => nil
+    @environment = double('environment', :module => nil)
     @options = { :recurse => true }
-    @request = stub 'request', :environment => @environment, :options => @options
+    @request = double('request', :environment => @environment, :options => @options)
   end
 
   describe  "when finding files" do
     it "should use the provided environment to find the modules" do
-      @environment.expects(:modules).returns []
+      expect(@environment).to receive(:modules).and_return([])
 
       @mount.find("foo", @request)
     end
 
     it "should return nil if no module can be found with a matching plugin" do
-      mod = mock 'module'
-      mod.stubs(:plugin).with("foo/bar").returns nil
+      mod = double('module')
+      allow(mod).to receive(:plugin).with("foo/bar").and_return(nil)
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to be_nil
     end
 
     it "should return the file path from the module" do
-      mod = mock 'module'
-      mod.stubs(:plugin).with("foo/bar").returns "eh"
+      mod = double('module')
+      allow(mod).to receive(:plugin).with("foo/bar").and_return("eh")
 
-      @environment.stubs(:modules).returns [mod]
+      allow(@environment).to receive(:modules).and_return([mod])
       expect(@mount.find("foo/bar", @request)).to eq("eh")
     end
   end
 
   describe "when searching for files" do
     it "should use the node's environment to find the modules" do
-      @environment.expects(:modules).at_least_once.returns []
-      @environment.stubs(:modulepath).returns ["/tmp/modules"]
+      expect(@environment).to receive(:modules).at_least(:once).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/tmp/modules"])
 
       @mount.search("foo", @request)
     end
 
     it "should return modulepath if no modules can be found that have plugins" do
-      mod = mock 'module'
-      mod.stubs(:plugins?).returns false
+      mod = double('module')
+      allow(mod).to receive(:plugins?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns ["/"]
-      @options.expects(:[]=).with(:recurse, false)
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return(["/"])
+      expect(@options).to receive(:[]=).with(:recurse, false)
       expect(@mount.search("foo/bar", @request)).to eq(["/"])
     end
 
     it "should return nil if no modules can be found that have plugins and modulepath is invalid" do
-      mod = mock 'module'
-      mod.stubs(:plugins?).returns false
+      mod = double('module')
+      allow(mod).to receive(:plugins?).and_return(false)
 
-      @environment.stubs(:modules).returns []
-      @environment.stubs(:modulepath).returns []
+      allow(@environment).to receive(:modules).and_return([])
+      allow(@environment).to receive(:modulepath).and_return([])
       expect(@mount.search("foo/bar", @request)).to be_nil
     end
 
     it "should return the plugin paths for each module that has plugins" do
-      one = stub 'module', :plugins? => true, :plugin_directory => "/one"
-      two = stub 'module', :plugins? => true, :plugin_directory => "/two"
+      one = double('module', :plugins? => true, :plugin_directory => "/one")
+      two = double('module', :plugins? => true, :plugin_directory => "/two")
 
-      @environment.stubs(:modules).returns [one, two]
+      allow(@environment).to receive(:modules).and_return([one, two])
       expect(@mount.search("foo/bar", @request)).to eq(%w{/one /two})
     end
   end