puppet 5.5.12 → 5.5.13

data/spec/unit/file_serving/configuration_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/configuration'
@@ -25,17 +24,16 @@ describe Puppet::FileServing::Configuration do
   end
 
   describe "when initializing" do
-
     it "should work without a configuration file" do
-      Puppet::FileSystem.stubs(:exist?).with(@path).returns(false)
+      allow(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(false)
       expect { Puppet::FileServing::Configuration.configuration }.to_not raise_error
     end
 
     it "should parse the configuration file if present" do
-      Puppet::FileSystem.stubs(:exist?).with(@path).returns(true)
-      @parser = mock 'parser'
-      @parser.expects(:parse).returns({})
-      Puppet::FileServing::Configuration::Parser.stubs(:new).returns(@parser)
+      allow(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
+      @parser = double('parser')
+      expect(@parser).to receive(:parse).and_return({})
+      allow(Puppet::FileServing::Configuration::Parser).to receive(:new).and_return(@parser)
       Puppet::FileServing::Configuration.configuration
     end
 
@@ -45,38 +43,37 @@ describe Puppet::FileServing::Configuration do
   end
 
   describe "when parsing the configuration file" do
-
     before do
-      Puppet::FileSystem.stubs(:exist?).with(@path).returns(true)
-      @parser = mock 'parser'
-      Puppet::FileServing::Configuration::Parser.stubs(:new).returns(@parser)
+      allow(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
+      @parser = double('parser')
+      allow(Puppet::FileServing::Configuration::Parser).to receive(:new).and_return(@parser)
     end
 
     it "should set the mount list to the results of parsing" do
-      @parser.expects(:parse).returns("one" => mock("mount"))
+      expect(@parser).to receive(:parse).and_return("one" => double("mount"))
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("one")).to be_truthy
     end
 
     it "should not raise exceptions" do
-      @parser.expects(:parse).raises(ArgumentError)
+      expect(@parser).to receive(:parse).and_raise(ArgumentError)
       expect { Puppet::FileServing::Configuration.configuration }.to_not raise_error
     end
 
     it "should replace the existing mount list with the results of reparsing" do
-      @parser.expects(:parse).returns("one" => mock("mount"))
+      expect(@parser).to receive(:parse).and_return("one" => double("mount"))
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("one")).to be_truthy
       # Now parse again
-      @parser.expects(:parse).returns("two" => mock('other'))
+      expect(@parser).to receive(:parse).and_return("two" => double('other'))
       config.send(:readconfig, false)
       expect(config.mounted?("one")).to be_falsey
       expect(config.mounted?("two")).to be_truthy
     end
 
     it "should not replace the mount list until the file is entirely parsed successfully" do
-      @parser.expects(:parse).returns("one" => mock("mount"))
-      @parser.expects(:parse).raises(ArgumentError)
+      expect(@parser).to receive(:parse).and_return("one" => double("mount"))
+      expect(@parser).to receive(:parse).and_raise(ArgumentError)
       config = Puppet::FileServing::Configuration.configuration
       # Now parse again, so the exception gets thrown
       config.send(:readconfig, false)
@@ -84,7 +81,7 @@ describe Puppet::FileServing::Configuration do
     end
 
     it "should add modules, plugins, and tasks mounts even if the file does not exist" do
-      Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
+      expect(Puppet::FileSystem).to receive(:exist?).and_return(false) # the file doesn't exist
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("modules")).to be_truthy
       expect(config.mounted?("plugins")).to be_truthy
@@ -92,43 +89,43 @@ describe Puppet::FileServing::Configuration do
     end
 
     it "should allow all access to modules, plugins, and tasks if no fileserver.conf exists" do
-      Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
-      modules = stub 'modules', :empty? => true
-      Puppet::FileServing::Mount::Modules.stubs(:new).returns(modules)
-      modules.expects(:allow).with('*')
+      expect(Puppet::FileSystem).to receive(:exist?).and_return(false) # the file doesn't exist
+      modules = double('modules', :empty? => true)
+      allow(Puppet::FileServing::Mount::Modules).to receive(:new).and_return(modules)
+      expect(modules).to receive(:allow).with('*')
 
-      plugins = stub 'plugins', :empty? => true
-      Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
-      plugins.expects(:allow).with('*')
+      plugins = double('plugins', :empty? => true)
+      allow(Puppet::FileServing::Mount::Plugins).to receive(:new).and_return(plugins)
+      expect(plugins).to receive(:allow).with('*')
 
-      tasks = stub 'tasks', :empty? => true
-      Puppet::FileServing::Mount::Tasks.stubs(:new).returns(tasks)
-      tasks.expects(:allow).with('*')
+      tasks = double('tasks', :empty? => true)
+      allow(Puppet::FileServing::Mount::Tasks).to receive(:new).and_return(tasks)
+      expect(tasks).to receive(:allow).with('*')
 
       Puppet::FileServing::Configuration.configuration
     end
 
     it "should not allow access from all to modules, plugins, and tasks if the fileserver.conf provided some rules" do
-      Puppet::FileSystem.expects(:exist?).returns false # the file doesn't exist
+      expect(Puppet::FileSystem).to receive(:exist?).and_return(false) # the file doesn't exist
 
-      modules = stub 'modules', :empty? => false
-      Puppet::FileServing::Mount::Modules.stubs(:new).returns(modules)
-      modules.expects(:allow).with('*').never
+      modules = double('modules', :empty? => false)
+      allow(Puppet::FileServing::Mount::Modules).to receive(:new).and_return(modules)
+      expect(modules).not_to receive(:allow).with('*')
 
-      plugins = stub 'plugins', :empty? => false
-      Puppet::FileServing::Mount::Plugins.stubs(:new).returns(plugins)
-      plugins.expects(:allow).with('*').never
+      plugins = double('plugins', :empty? => false)
+      allow(Puppet::FileServing::Mount::Plugins).to receive(:new).and_return(plugins)
+      expect(plugins).not_to receive(:allow).with('*')
 
-      tasks = stub 'tasks', :empty? => false
-      Puppet::FileServing::Mount::Tasks.stubs(:new).returns(tasks)
-      tasks.expects(:allow).with('*').never
+      tasks = double('tasks', :empty? => false)
+      allow(Puppet::FileServing::Mount::Tasks).to receive(:new).and_return(tasks)
+      expect(tasks).not_to receive(:allow).with('*')
 
       Puppet::FileServing::Configuration.configuration
     end
 
     it "should add modules, plugins, and tasks mounts even if they are not returned by the parser" do
-      @parser.expects(:parse).returns("one" => mock("mount"))
-      Puppet::FileSystem.expects(:exist?).returns true # the file doesn't exist
+      expect(@parser).to receive(:parse).and_return("one" => double("mount"))
+      expect(Puppet::FileSystem).to receive(:exist?).and_return(true) # the file doesn't exist
       config = Puppet::FileServing::Configuration.configuration
       expect(config.mounted?("modules")).to be_truthy
       expect(config.mounted?("plugins")).to be_truthy
@@ -139,16 +136,16 @@ describe Puppet::FileServing::Configuration do
   describe "when finding the specified mount" do
     it "should choose the named mount if one exists" do
       config = Puppet::FileServing::Configuration.configuration
-      config.expects(:mounts).returns("one" => "foo")
-      expect(config.find_mount("one", mock('env'))).to eq("foo")
+      expect(config).to receive(:mounts).and_return("one" => "foo")
+      expect(config.find_mount("one", double('env'))).to eq("foo")
     end
 
     it "should return nil if there is no such named mount" do
       config = Puppet::FileServing::Configuration.configuration
 
-      env = mock 'environment'
-      mount = mock 'mount'
-      config.stubs(:mounts).returns("modules" => mount)
+      env = double('environment')
+      mount = double('mount')
+      allow(config).to receive(:mounts).and_return("modules" => mount)
 
       expect(config.find_mount("foo", env)).to be_nil
     end
@@ -156,66 +153,66 @@ describe Puppet::FileServing::Configuration do
 
   describe "#split_path" do
     let(:config) { Puppet::FileServing::Configuration.configuration }
-    let(:request) { stub 'request', :key => "foo/bar/baz", :options => {}, :node => nil, :environment => mock("env") }
+    let(:request) { double('request', :key => "foo/bar/baz", :options => {}, :node => nil, :environment => double("env")) }
 
     before do
-      config.stubs(:find_mount)
+      allow(config).to receive(:find_mount)
     end
 
     it "should reread the configuration" do
-      config.expects(:readconfig)
+      expect(config).to receive(:readconfig)
 
       config.split_path(request)
     end
 
     it "should treat the first field of the URI path as the mount name" do
-      config.expects(:find_mount).with { |name, node| name == "foo" }
+      expect(config).to receive(:find_mount).with("foo", anything)
 
       config.split_path(request)
     end
 
     it "should fail if the mount name is not alpha-numeric" do
-      request.expects(:key).returns "foo&bar/asdf"
+      expect(request).to receive(:key).and_return("foo&bar/asdf")
 
       expect { config.split_path(request) }.to raise_error(ArgumentError)
     end
 
     it "should support dashes in the mount name" do
-      request.expects(:key).returns "foo-bar/asdf"
+      expect(request).to receive(:key).and_return("foo-bar/asdf")
 
       expect { config.split_path(request) }.to_not raise_error
     end
 
     it "should use the mount name and environment to find the mount" do
-      config.expects(:find_mount).with { |name, env| name == "foo" and env == request.environment }
-      request.stubs(:node).returns("mynode")
+      expect(config).to receive(:find_mount).with("foo", request.environment)
+      allow(request).to receive(:node).and_return("mynode")
 
       config.split_path(request)
     end
 
     it "should return nil if the mount cannot be found" do
-      config.expects(:find_mount).returns nil
+      expect(config).to receive(:find_mount).and_return(nil)
 
       expect(config.split_path(request)).to be_nil
     end
 
     it "should return the mount and the relative path if the mount is found" do
-      mount = stub 'mount', :name => "foo"
-      config.expects(:find_mount).returns mount
+      mount = double('mount', :name => "foo")
+      expect(config).to receive(:find_mount).and_return(mount)
 
       expect(config.split_path(request)).to eq([mount, "bar/baz"])
     end
 
     it "should remove any double slashes" do
-      request.stubs(:key).returns "foo/bar//baz"
-      mount = stub 'mount', :name => "foo"
-      config.expects(:find_mount).returns mount
+      allow(request).to receive(:key).and_return("foo/bar//baz")
+      mount = double('mount', :name => "foo")
+      expect(config).to receive(:find_mount).and_return(mount)
 
       expect(config.split_path(request)).to eq([mount, "bar/baz"])
     end
 
     it "should fail if the path contains .." do
-      request.stubs(:key).returns 'module/foo/../../bar'
+      allow(request).to receive(:key).and_return('module/foo/../../bar')
 
       expect do
         config.split_path(request)
@@ -223,17 +220,17 @@ describe Puppet::FileServing::Configuration do
     end
 
     it "should return the relative path as nil if it is an empty string" do
-      request.expects(:key).returns "foo"
-      mount = stub 'mount', :name => "foo"
-      config.expects(:find_mount).returns mount
+      expect(request).to receive(:key).and_return("foo")
+      mount = double('mount', :name => "foo")
+      expect(config).to receive(:find_mount).and_return(mount)
 
       expect(config.split_path(request)).to eq([mount, nil])
     end
 
     it "should add 'modules/' to the relative path if the modules mount is used but not specified, for backward compatibility" do
-      request.expects(:key).returns "foo/bar"
-      mount = stub 'mount', :name => "modules"
-      config.expects(:find_mount).returns mount
+      expect(request).to receive(:key).and_return("foo/bar")
+      mount = double('mount', :name => "modules")
+      expect(config).to receive(:find_mount).and_return(mount)
 
       expect(config.split_path(request)).to eq([mount, "foo/bar"])
     end

data/spec/unit/file_serving/content_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/content'
@@ -25,7 +24,7 @@ describe Puppet::FileServing::Content do
   it "should not retrieve and store its contents when its attributes are collected" do
     content = Puppet::FileServing::Content.new(path)
 
-    File.expects(:read).with(path).never
+    expect(File).not_to receive(:read).with(path)
     content.collect
 
     expect(content.instance_variable_get("@content")).to be_nil
@@ -47,10 +46,10 @@ describe Puppet::FileServing::Content do
   end
 
   it "should create an instance with a fake file name and correct content when converting from binary" do
-    instance = mock 'instance'
-    Puppet::FileServing::Content.expects(:new).with("/this/is/a/fake/path").returns instance
+    instance = double('instance')
+    expect(Puppet::FileServing::Content).to receive(:new).with("/this/is/a/fake/path").and_return(instance)
 
-    instance.expects(:content=).with "foo/bar"
+    expect(instance).to receive(:content=).with("foo/bar")
 
     expect(Puppet::FileServing::Content.from_binary("foo/bar")).to equal(instance)
   end
@@ -58,7 +57,7 @@ describe Puppet::FileServing::Content do
   it "should return an opened File when converted to binary" do
     content = Puppet::FileServing::Content.new(path)
 
-    File.expects(:new).with(path, "rb").returns :file
+    expect(File).to receive(:new).with(path, "rb").and_return(:file)
 
     expect(content.to_binary).to eq(:file)
   end
@@ -70,7 +69,7 @@ describe Puppet::FileServing::Content, "when returning the contents" do
 
   it "should fail if the file is a symlink and links are set to :manage" do
     content.links = :manage
-    Puppet::FileSystem.expects(:lstat).with(path).returns stub("stat", :ftype => "symlink")
+    expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(double("stat", :ftype => "symlink"))
     expect { content.content }.to raise_error(ArgumentError)
   end
 
@@ -84,14 +83,14 @@ describe Puppet::FileServing::Content, "when returning the contents" do
   end
 
   it "should return the contents of the path if the file exists" do
-    Puppet::FileSystem.expects(:stat).with(path).returns(stub('stat', :ftype => 'file'))
-    Puppet::FileSystem.expects(:binread).with(path).returns(:mycontent)
+    expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(double('stat', :ftype => 'file'))
+    expect(Puppet::FileSystem).to receive(:binread).with(path).and_return(:mycontent)
     expect(content.content).to eq(:mycontent)
   end
 
   it "should cache the returned contents" do
-    Puppet::FileSystem.expects(:stat).with(path).returns(stub('stat', :ftype => 'file'))
-    Puppet::FileSystem.expects(:binread).with(path).returns(:mycontent)
+    expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(double('stat', :ftype => 'file'))
+    expect(Puppet::FileSystem).to receive(:binread).with(path).and_return(:mycontent)
     content.content
     # The second run would throw a failure if the content weren't being cached.
     content.content

data/spec/unit/file_serving/fileset_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/fileset'
@@ -18,49 +17,49 @@ describe Puppet::FileServing::Fileset do
 
     it "removes a trailing file path separator" do
       path_with_separator = "#{somefile}#{File::SEPARATOR}"
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       fileset = Puppet::FileServing::Fileset.new(path_with_separator)
       expect(fileset.path).to eq(somefile)
     end
 
     it "can be created from the root directory" do
       path = File.expand_path(File::SEPARATOR)
-      Puppet::FileSystem.expects(:lstat).with(path).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(double('stat'))
       fileset = Puppet::FileServing::Fileset.new(path)
       expect(fileset.path).to eq(path)
     end
 
     it "fails if its path does not exist" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).raises(Errno::ENOENT)
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_raise(Errno::ENOENT)
       expect { Puppet::FileServing::Fileset.new(somefile) }.to raise_error(ArgumentError, "Fileset paths must exist")
     end
 
     it "accepts a 'recurse' option" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       set = Puppet::FileServing::Fileset.new(somefile, :recurse => true)
       expect(set.recurse).to be_truthy
     end
 
     it "accepts a 'recurselimit' option" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       set = Puppet::FileServing::Fileset.new(somefile, :recurselimit => 3)
       expect(set.recurselimit).to eq(3)
     end
 
     it "accepts an 'ignore' option" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       set = Puppet::FileServing::Fileset.new(somefile, :ignore => ".svn")
       expect(set.ignore).to eq([".svn"])
     end
 
     it "accepts a 'links' option" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       set = Puppet::FileServing::Fileset.new(somefile, :links => :manage)
       expect(set.links).to eq(:manage)
     end
 
     it "accepts a 'checksum_type' option" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       set = Puppet::FileServing::Fileset.new(somefile, :checksum_type => :test)
       expect(set.checksum_type).to eq(:test)
     end
@@ -70,22 +69,22 @@ describe Puppet::FileServing::Fileset do
     end
 
     it "defaults to 'false' for recurse" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       expect(Puppet::FileServing::Fileset.new(somefile).recurse).to eq(false)
     end
 
     it "defaults to :infinite for recurselimit" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       expect(Puppet::FileServing::Fileset.new(somefile).recurselimit).to eq(:infinite)
     end
 
     it "defaults to an empty ignore list" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       expect(Puppet::FileServing::Fileset.new(somefile).ignore).to eq([])
     end
 
     it "defaults to :manage for links" do
-      Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+      expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       expect(Puppet::FileServing::Fileset.new(somefile).links).to eq(:manage)
     end
 
@@ -93,7 +92,7 @@ describe Puppet::FileServing::Fileset do
       let(:values) { { :links => :manage, :ignore => %w{a b}, :recurse => true, :recurselimit => 1234 } }
 
       before :each do
-        Puppet::FileSystem.expects(:lstat).with(somefile).returns stub('stat')
+        expect(Puppet::FileSystem).to receive(:lstat).with(somefile).and_return(double('stat'))
       end
 
       [:recurse, :recurselimit, :ignore, :links].each do |option|
@@ -130,16 +129,16 @@ describe Puppet::FileServing::Fileset do
   context "when recursing" do
     before do
       @path = make_absolute("/my/path")
-      Puppet::FileSystem.stubs(:lstat).with(@path).returns stub('stat', :directory? => true)
+      allow(Puppet::FileSystem).to receive(:lstat).with(@path).and_return(double('stat', :directory? => true))
 
       @fileset = Puppet::FileServing::Fileset.new(@path)
 
-      @dirstat = stub 'dirstat', :directory? => true
-      @filestat = stub 'filestat', :directory? => false
+      @dirstat = double('dirstat', :directory? => true)
+      @filestat = double('filestat', :directory? => false)
     end
 
     def mock_dir_structure(path, stat_method = :lstat)
-      Puppet::FileSystem.stubs(stat_method).with(path).returns @dirstat
+      allow(Puppet::FileSystem).to receive(stat_method).with(path).and_return(@dirstat)
 
       # Keep track of the files we're stubbing.
       @files = %w{.}
@@ -147,53 +146,59 @@ describe Puppet::FileServing::Fileset do
       top_names = %w{one two .svn CVS}
       sub_names = %w{file1 file2 .svn CVS 0 false}
 
-      Dir.stubs(:entries).with(path, encoding: Encoding::UTF_8).returns(top_names)
+      allow(Dir).to receive(:entries).with(path, encoding: Encoding::UTF_8).and_return(top_names)
       top_names.each do |subdir|
         @files << subdir # relative path
         subpath = File.join(path, subdir)
-        Puppet::FileSystem.stubs(stat_method).with(subpath).returns @dirstat
-        Dir.stubs(:entries).with(subpath, encoding: Encoding::UTF_8).returns(sub_names)
+        allow(Puppet::FileSystem).to receive(stat_method).with(subpath).and_return(@dirstat)
+        allow(Dir).to receive(:entries).with(subpath, encoding: Encoding::UTF_8).and_return(sub_names)
         sub_names.each do |file|
           @files << File.join(subdir, file) # relative path
           subfile_path = File.join(subpath, file)
-          Puppet::FileSystem.stubs(stat_method).with(subfile_path).returns(@filestat)
+          allow(Puppet::FileSystem).to receive(stat_method).with(subfile_path).and_return(@filestat)
         end
       end
     end
 
-    MockStat = Struct.new(:path, :directory) do
-      # struct doesn't support thing ending in ?
-      def directory?
-        directory
+    def setup_mocks_for_dir(mock_dir, base_path)
+      path = File.join(base_path, mock_dir.name)
+      allow(Puppet::FileSystem).to receive(:lstat).with(path).and_return(MockStat.new(path, true))
+      allow(Dir).to receive(:entries).with(path, encoding: Encoding::UTF_8).and_return(['.', '..'] + mock_dir.entries.map(&:name))
+      mock_dir.entries.each do |entry|
+        setup_mocks_for_entry(entry, path)
       end
     end
 
-    MockDirectory = Struct.new(:name, :entries) do
-      def mock(base_path)
-        extend Mocha::API
-        path = File.join(base_path, name)
-        Puppet::FileSystem.stubs(:lstat).with(path).returns MockStat.new(path, true)
-        Dir.stubs(:entries).with(path, encoding: Encoding::UTF_8).returns(['.', '..'] + entries.map(&:name))
-        entries.each do |entry|
-          entry.mock(path)
-        end
+    def setup_mocks_for_file(mock_file, base_path)
+      path = File.join(base_path, mock_file.name)
+      allow(Puppet::FileSystem).to receive(:lstat).with(path).and_return(MockStat.new(path, false))
+    end
+
+    def setup_mocks_for_entry(entry, base_path)
+      case entry
+      when MockDirectory
+        setup_mocks_for_dir(entry, base_path)
+      when MockFile
+        setup_mocks_for_file(entry, base_path)
       end
     end
 
-    MockFile = Struct.new(:name) do
-      def mock(base_path)
-        extend Mocha::API
-        path = File.join(base_path, name)
-        Puppet::FileSystem.stubs(:lstat).with(path).returns MockStat.new(path, false)
+    MockStat = Struct.new(:path, :directory) do
+      # struct doesn't support thing ending in ?
+      def directory?
+        directory
       end
     end
 
+    MockDirectory = Struct.new(:name, :entries)
+    MockFile = Struct.new(:name)
+
     it "doesn't ignore pending directories when the last entry at the top level is a file" do
       structure = MockDirectory.new('path',
                     [MockDirectory.new('dir1',
                                    [MockDirectory.new('a', [MockFile.new('f')])]),
                      MockFile.new('file')])
-      structure.mock(make_absolute('/your'))
+      setup_mocks_for_dir(structure, make_absolute('/your'))
       fileset = Puppet::FileServing::Fileset.new(make_absolute('/your/path'))
       fileset.recurse = true
       fileset.links = :manage
@@ -276,8 +281,8 @@ describe Puppet::FileServing::Fileset do
 
     it "works when paths have regexp significant characters" do
       @path = make_absolute("/my/path/rV1x2DafFr0R6tGG+1bbk++++TM")
-      stat = stub('dir_stat', :directory? => true)
-      Puppet::FileSystem.expects(:lstat).with(@path).returns stub(@path, :stat => stat, :lstat => stat)
+      stat = double('dir_stat', :directory? => true)
+      expect(Puppet::FileSystem).to receive(:lstat).with(@path).and_return(double(@path, :stat => stat, :lstat => stat))
       @fileset = Puppet::FileServing::Fileset.new(@path)
       mock_dir_structure(@path)
       @fileset.recurse = true
@@ -287,15 +292,15 @@ describe Puppet::FileServing::Fileset do
 
   it "manages the links to missing files" do
     path = make_absolute("/my/path")
-    stat = stub 'stat', :directory? => true
+    stat = double('stat', :directory? => true)
 
-    Puppet::FileSystem.expects(:stat).with(path).returns stat
-    Puppet::FileSystem.expects(:lstat).with(path).returns stat
+    expect(Puppet::FileSystem).to receive(:stat).with(path).and_return(stat)
+    expect(Puppet::FileSystem).to receive(:lstat).with(path).and_return(stat)
 
     link_path = File.join(path, "mylink")
-    Puppet::FileSystem.expects(:stat).with(link_path).raises(Errno::ENOENT)
+    expect(Puppet::FileSystem).to receive(:stat).with(link_path).and_raise(Errno::ENOENT)
 
-    Dir.stubs(:entries).with(path, encoding: Encoding::UTF_8).returns(["mylink"])
+    allow(Dir).to receive(:entries).with(path, encoding: Encoding::UTF_8).and_return(["mylink"])
 
     fileset = Puppet::FileServing::Fileset.new(path)
 
@@ -308,20 +313,20 @@ describe Puppet::FileServing::Fileset do
   context "when merging other filesets" do
     before do
       @paths = [make_absolute("/first/path"), make_absolute("/second/path"), make_absolute("/third/path")]
-      Puppet::FileSystem.stubs(:lstat).returns stub('stat', :directory? => false)
+      allow(Puppet::FileSystem).to receive(:lstat).and_return(double('stat', :directory? => false))
 
       @filesets = @paths.collect do |path|
-        Puppet::FileSystem.stubs(:lstat).with(path).returns stub('stat', :directory? => true)
+        allow(Puppet::FileSystem).to receive(:lstat).with(path).and_return(double('stat', :directory? => true))
         Puppet::FileServing::Fileset.new(path, :recurse => true)
       end
 
-      Dir.stubs(:entries).returns []
+      allow(Dir).to receive(:entries).and_return([])
     end
 
     it "returns a hash of all files in each fileset with the value being the base path" do
-      Dir.expects(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).returns(%w{one uno})
-      Dir.expects(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).returns(%w{two dos})
-      Dir.expects(:entries).with(make_absolute("/third/path"), encoding: Encoding::UTF_8).returns(%w{three tres})
+      expect(Dir).to receive(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).and_return(%w{one uno})
+      expect(Dir).to receive(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).and_return(%w{two dos})
+      expect(Dir).to receive(:entries).with(make_absolute("/third/path"), encoding: Encoding::UTF_8).and_return(%w{three tres})
 
       expect(Puppet::FileServing::Fileset.merge(*@filesets)).to eq({
         "." => make_absolute("/first/path"),
@@ -335,15 +340,15 @@ describe Puppet::FileServing::Fileset do
     end
 
     it "includes the base directory from the first fileset" do
-      Dir.expects(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).returns(%w{one})
-      Dir.expects(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).returns(%w{two})
+      expect(Dir).to receive(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).and_return(%w{one})
+      expect(Dir).to receive(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).and_return(%w{two})
 
       expect(Puppet::FileServing::Fileset.merge(*@filesets)["."]).to eq(make_absolute("/first/path"))
     end
 
     it "uses the base path of the first found file when relative file paths conflict" do
-      Dir.expects(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).returns(%w{one})
-      Dir.expects(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).returns(%w{one})
+      expect(Dir).to receive(:entries).with(make_absolute("/first/path"), encoding: Encoding::UTF_8).and_return(%w{one})
+      expect(Dir).to receive(:entries).with(make_absolute("/second/path"), encoding: Encoding::UTF_8).and_return(%w{one})
 
       expect(Puppet::FileServing::Fileset.merge(*@filesets)["one"]).to eq(make_absolute("/first/path"))
     end