puppet 3.8.7 → 4.0.0.rc1

data/spec/unit/module_tool/applications/builder_spec.rb

@@ -394,23 +394,4 @@ symlinkfile
 
     it_behaves_like "a packagable module"
   end
-
-  context 'with Modulefile' do
-    before :each do
-      File.open(File.join(path, 'Modulefile'), 'w') do |f|
-        f.write <<-MODULEFILE
-name    '#{module_name}'
-version '#{version}'
-source 'http://github.com/testing/#{module_name}'
-author 'testing'
-license 'Apache License Version 2.0'
-summary 'Puppet testing module'
-description 'This module can be used for basic testing'
-project_page 'http://github.com/testing/#{module_name}'
-MODULEFILE
-      end
-    end
-
-    it_behaves_like "a packagable module"
-  end
 end

data/spec/unit/module_tool/applications/installer_spec.rb

@@ -55,7 +55,7 @@ describe Puppet::ModuleTool::Applications::Installer do
     subject { application.run }
 
     it 'installs the specified module' do
-      subject.should include :result => :success
+      expect(subject).to include :result => :success
       graph_should_include 'pmtacceptance-stdlib', nil => v('4.1.0')
     end
 
@@ -63,7 +63,7 @@ describe Puppet::ModuleTool::Applications::Installer do
       let(:module) { fixtures('stdlib.tgz') }
 
       it 'installs the specified tarball' do
-        subject.should include :result => :success
+        expect(subject).to include :result => :success
         graph_should_include 'puppetlabs-stdlib', nil => v('3.2.0')
       end
 
@@ -74,7 +74,7 @@ describe Puppet::ModuleTool::Applications::Installer do
 
         it 'installs the specified tarball' do
           remote_source.expects(:fetch).never
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
           graph_should_include 'puppetlabs-stdlib', nil => v('3.2.0')
         end
       end
@@ -83,7 +83,7 @@ describe Puppet::ModuleTool::Applications::Installer do
         let(:module) { fixtures('java.tgz') }
 
         it 'installs the specified tarball' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
           graph_should_include 'puppetlabs-java', nil => v('1.0.0')
           graph_should_include 'puppetlabs-stdlib', nil => v('4.1.0')
         end
@@ -95,7 +95,7 @@ describe Puppet::ModuleTool::Applications::Installer do
 
           it 'installs the specified tarball without dependencies' do
             remote_source.expects(:fetch).never
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'puppetlabs-java', nil => v('1.0.0')
             graph_should_include 'puppetlabs-stdlib', nil
           end
@@ -107,7 +107,7 @@ describe Puppet::ModuleTool::Applications::Installer do
       let(:module) { 'pmtacceptance-apache' }
 
       it 'installs the specified module and its dependencies' do
-        subject.should include :result => :success
+        expect(subject).to include :result => :success
         graph_should_include 'pmtacceptance-apache', nil => v('0.10.0')
         graph_should_include 'pmtacceptance-stdlib', nil => v('4.1.0')
       end
@@ -118,7 +118,7 @@ describe Puppet::ModuleTool::Applications::Installer do
         end
 
         it 'installs only the specified module' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
           graph_should_include 'pmtacceptance-apache', nil => v('0.10.0')
           graph_should_include 'pmtacceptance-stdlib', nil
         end
@@ -129,7 +129,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           before { preinstall('pmtacceptance-stdlib', '4.1.0') }
 
           it 'installs only the specified module' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', nil => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', :path => primary_dir
           end
@@ -138,7 +138,7 @@ describe Puppet::ModuleTool::Applications::Installer do
             before { preinstall('pmtacceptance-stdlib', '2.4.0') }
 
             it 'installs only the specified module' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-apache', nil => v('0.10.0')
               graph_should_include 'pmtacceptance-stdlib', v('2.4.0') => v('2.4.0'), :path => primary_dir
             end
@@ -148,7 +148,7 @@ describe Puppet::ModuleTool::Applications::Installer do
             before { preinstall('pmtacceptance-stdlib', '1.0.0') }
 
             it 'installs a version that is compatible with the installed dependencies' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-apache', nil => v('0.0.4')
               graph_should_include 'pmtacceptance-stdlib', nil
             end
@@ -165,7 +165,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           before { preinstall('pmtacceptance-mysql', '2.1.0') }
 
           it 'installs only the specified module' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-keystone', nil => v('2.0.0')
             graph_should_include 'pmtacceptance-mysql', v('2.1.0') => v('2.1.0')
             graph_should_include 'pmtacceptance-stdlib', nil
@@ -179,7 +179,7 @@ describe Puppet::ModuleTool::Applications::Installer do
 
         context 'without dependency updates' do
           it 'installs the module only' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', nil => v('0.0.4')
             graph_should_include 'pmtacceptance-stdlib', nil
           end
@@ -189,7 +189,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           before { preinstall('pmtacceptance-stdlib', '2.0.0', :into => secondary_dir) }
 
           it 'installs the module and upgrades dependencies in-place' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', nil => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', v('2.0.0') => v('2.6.0'), :path => secondary_dir
           end
@@ -205,7 +205,7 @@ describe Puppet::ModuleTool::Applications::Installer do
         end
 
         it 'installs the specified release (or a prerelease thereof)' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
           graph_should_include 'pmtacceptance-stdlib', nil => v('3.0.0')
         end
       end
@@ -216,7 +216,7 @@ describe Puppet::ModuleTool::Applications::Installer do
         end
 
         it 'installs the greatest available version matching that range' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
           graph_should_include 'pmtacceptance-stdlib', nil => v('3.2.0')
         end
       end
@@ -227,7 +227,7 @@ describe Puppet::ModuleTool::Applications::Installer do
       let(:module)  { 'pmtacceptance-mysql' }
 
       it 'installs the greatest available version meeting the dependency constraints' do
-        subject.should include :result => :success
+        expect(subject).to include :result => :success
         graph_should_include 'pmtacceptance-mysql', nil => v('0.9.0')
       end
 
@@ -237,7 +237,7 @@ describe Puppet::ModuleTool::Applications::Installer do
         end
 
         it 'installs the greatest available version satisfying both constraints' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
           graph_should_include 'pmtacceptance-mysql', nil => v('0.8.0')
         end
       end
@@ -248,7 +248,7 @@ describe Puppet::ModuleTool::Applications::Installer do
         end
 
         it 'fails to install, since there is no version that can satisfy both constraints' do
-          subject.should include :result => :failure
+          expect(subject).to include :result => :failure
         end
 
         context 'with --ignore-dependencies' do
@@ -257,7 +257,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           end
 
           it 'fails to install, since ignore_dependencies should still respect dependencies from installed modules' do
-            subject.should include :result => :failure
+            expect(subject).to include :result => :failure
           end
         end
 
@@ -267,7 +267,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           end
 
           it 'installs the greatest available version, ignoring dependencies' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-mysql', nil => v('2.1.0')
           end
         end
@@ -279,7 +279,7 @@ describe Puppet::ModuleTool::Applications::Installer do
 
       context 'but matching the requested version' do
         it 'does nothing, since the installed version satisfies' do
-          subject.should include :result => :noop
+          expect(subject).to include :result => :noop
         end
 
         context 'with --force' do
@@ -288,7 +288,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           end
 
           it 'does reinstall the module' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('4.1.0')
           end
         end
@@ -300,7 +300,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           end
 
           it 'does nothing, since local changes do not affect that' do
-            subject.should include :result => :noop
+            expect(subject).to include :result => :noop
           end
 
           context 'with --force' do
@@ -309,7 +309,7 @@ describe Puppet::ModuleTool::Applications::Installer do
             end
 
             it 'does reinstall the module, since --force ignores local changes' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('4.1.0')
             end
           end
@@ -322,8 +322,8 @@ describe Puppet::ModuleTool::Applications::Installer do
         end
 
         it 'fails to install the module, since it is already installed' do
-          subject.should include :result => :failure
-          subject[:error].should include :oneline => "'pmtacceptance-stdlib' (v2.x) requested; 'pmtacceptance-stdlib' (v1.0.0) already installed"
+          expect(subject).to include :result => :failure
+          expect(subject[:error]).to include :oneline => "'pmtacceptance-stdlib' (v2.x) requested; 'pmtacceptance-stdlib' (v1.0.0) already installed"
         end
 
         context 'with --force' do
@@ -332,7 +332,7 @@ describe Puppet::ModuleTool::Applications::Installer do
           end
 
           it 'installs the greatest version matching the new version range' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('2.6.0')
           end
         end
@@ -344,7 +344,7 @@ describe Puppet::ModuleTool::Applications::Installer do
       before { preinstall('puppetlabs-stdlib', '4.1.0') }
 
       it 'fails to install, since two modules with the same name cannot be installed simultaneously' do
-        subject.should include :result => :failure
+        expect(subject).to include :result => :failure
       end
 
       context 'using --force' do
@@ -353,7 +353,7 @@ describe Puppet::ModuleTool::Applications::Installer do
         end
 
         it 'overwrites the existing module with the greatest version of the requested module' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
           graph_should_include 'pmtacceptance-stdlib', nil => v('4.1.0')
         end
       end

data/spec/unit/module_tool/applications/searcher_spec.rb

@@ -16,23 +16,23 @@ describe Puppet::ModuleTool::Applications::Searcher do
       forge.expects(:search).with('search_term').returns(results)
 
       search_result = searcher.run
-      search_result.should == {
+      expect(search_result).to eq({
         :result => :success,
         :answers => results,
-      }
+      })
     end
 
     it "should return an error when the forge query throws an exception" do
       forge.expects(:search).with('search_term').raises Puppet::Forge::Errors::ForgeError.new("something went wrong")
 
       search_result = searcher.run
-      search_result.should == {
+      expect(search_result).to eq({
         :result => :failure,
         :error => {
           :oneline   => 'something went wrong',
           :multiline => 'something went wrong',
         },
-      }
+      })
     end
   end
 end

data/spec/unit/module_tool/applications/uninstaller_spec.rb

@@ -40,7 +40,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
 
   context "when the module is not installed" do
     it "should fail" do
-      subject.should include :result => :failure
+      expect(subject).to include :result => :failure
     end
   end
 
@@ -51,7 +51,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
     before { preinstall('pmtacceptance-apache', '0.0.4') }
 
     it "should uninstall the module" do
-      subject[:affected_modules].first.forge_name.should == "pmtacceptance/stdlib"
+      expect(subject[:affected_modules].first.forge_name).to eq("pmtacceptance/stdlib")
     end
 
     it "should only uninstall the requested module" do
@@ -62,7 +62,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
       before { preinstall('pmtacceptance-stdlib', '2.0.0', :into => secondary_dir) }
 
       it "should fail if a module exists twice in the modpath" do
-        subject.should include :result => :failure
+        expect(subject).to include :result => :failure
       end
     end
 
@@ -72,8 +72,8 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
       end
 
       it "should uninstall the module if the version matches" do
-        subject[:affected_modules].length.should == 1
-        subject[:affected_modules].first.version.should == "1.0.0"
+        expect(subject[:affected_modules].length).to eq(1)
+        expect(subject[:affected_modules].first.version).to eq("1.0.0")
       end
 
       context 'but not matched' do
@@ -82,7 +82,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
         end
 
         it "should not uninstall the module if the version does not match" do
-          subject.should include :result => :failure
+          expect(subject).to include :result => :failure
         end
       end
     end
@@ -91,7 +91,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
       before { File.unlink(File.join(primary_dir, 'stdlib', 'metadata.json')) }
 
       it "should not uninstall the module" do
-        application.run[:result].should == :failure
+        expect(application.run[:result]).to eq(:failure)
       end
     end
 
@@ -101,7 +101,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
       end
 
       it "should not uninstall the module" do
-        subject.should include :result => :failure
+        expect(subject).to include :result => :failure
       end
     end
 
@@ -109,7 +109,7 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
       before { preinstall('pmtacceptance-apache', '0.10.0') }
 
       it "should not uninstall the module" do
-        subject.should include :result => :failure
+        expect(subject).to include :result => :failure
       end
     end
 
@@ -124,13 +124,13 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
         end
 
         it 'overwrites the installed module with the greatest version matching that range' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
         end
       end
 
       context 'without local changes' do
         it 'overwrites the installed module with the greatest version matching that range' do
-          subject.should include :result => :success
+          expect(subject).to include :result => :success
         end
       end
     end
@@ -147,8 +147,8 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
         end
 
         it "should ignore local changes" do
-          subject[:affected_modules].length.should == 1
-          subject[:affected_modules].first.forge_name.should == "pmtacceptance/stdlib"
+          expect(subject[:affected_modules].length).to eq(1)
+          expect(subject[:affected_modules].first.forge_name).to eq("pmtacceptance/stdlib")
         end
       end
 
@@ -156,8 +156,8 @@ describe Puppet::ModuleTool::Applications::Uninstaller do
         before { preinstall('pmtacceptance-apache', '0.10.0') }
 
         it "should ignore broken dependencies" do
-          subject[:affected_modules].length.should == 1
-          subject[:affected_modules].first.forge_name.should == "pmtacceptance/stdlib"
+          expect(subject[:affected_modules].length).to eq(1)
+          expect(subject[:affected_modules].first.forge_name).to eq("pmtacceptance/stdlib")
         end
       end
     end

data/spec/unit/module_tool/applications/unpacker_spec.rb

@@ -30,7 +30,7 @@ describe Puppet::ModuleTool::Applications::Unpacker do
     Puppet::ModuleTool::Tar.expects(:instance).returns(untar)
 
     Puppet::ModuleTool::Applications::Unpacker.run(filename, :target_dir => target)
-    File.should be_directory(File.join(target, 'mytarball'))
+    expect(File).to be_directory(File.join(target, 'mytarball'))
   end
 
   it "should warn about symlinks", :if => Puppet.features.manages_symlinks? do
@@ -49,7 +49,7 @@ describe Puppet::ModuleTool::Applications::Unpacker do
     Puppet.expects(:warning).with(regexp_matches(/symlinks/i))
 
     Puppet::ModuleTool::Applications::Unpacker.run(filename, :target_dir => target)
-    File.should be_directory(File.join(target, 'mytarball'))
+    expect(File).to be_directory(File.join(target, 'mytarball'))
   end
 
   it "should warn about symlinks in subdirectories", :if => Puppet.features.manages_symlinks? do
@@ -69,6 +69,6 @@ describe Puppet::ModuleTool::Applications::Unpacker do
     Puppet.expects(:warning).with(regexp_matches(/symlinks/i))
 
     Puppet::ModuleTool::Applications::Unpacker.run(filename, :target_dir => target)
-    File.should be_directory(File.join(target, 'mytarball'))
+    expect(File).to be_directory(File.join(target, 'mytarball'))
   end
 end

data/spec/unit/module_tool/applications/upgrader_spec.rb

@@ -47,8 +47,8 @@ describe Puppet::ModuleTool::Applications::Upgrader do
     subject { application.run }
 
     it 'fails if the module is not already installed' do
-      subject.should include :result => :failure
-      subject[:error].should include :oneline => "Could not upgrade '#{self.module}'; module is not installed"
+      expect(subject).to include :result => :failure
+      expect(subject[:error]).to include :oneline => "Could not upgrade '#{self.module}'; module is not installed"
     end
 
     context 'for an installed module' do
@@ -57,8 +57,8 @@ describe Puppet::ModuleTool::Applications::Upgrader do
         let(:module) { 'puppetlabs-oneversion' }
 
         it 'declines to upgrade' do
-          subject.should include :result => :noop
-          subject[:error][:multiline].should =~ /already the latest version/
+          expect(subject).to include :result => :noop
+          expect(subject[:error][:multiline]).to match(/already the latest version/)
         end
       end
 
@@ -67,7 +67,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
 
         context 'without options' do
           it 'properly upgrades the module to the greatest version' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('4.1.0')
           end
         end
@@ -79,7 +79,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
 
           context 'not matching the installed version' do
             it 'properly upgrades the module to the greatest version within that range' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('3.2.0')
             end
           end
@@ -89,7 +89,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
               before { preinstall('pmtacceptance-stdlib', '3.0.0')}
 
               it 'properly upgrades the module to the greatest version within that range' do
-                subject.should include :result => :success
+                expect(subject).to include :result => :success
                 graph_should_include 'pmtacceptance-stdlib', v('3.0.0') => v('3.2.0')
               end
             end
@@ -99,8 +99,8 @@ describe Puppet::ModuleTool::Applications::Upgrader do
 
               context 'without options' do
                 it 'declines to upgrade' do
-                  subject.should include :result => :noop
-                  subject[:error][:multiline].should =~ /already the latest version/
+                  expect(subject).to include :result => :noop
+                  expect(subject[:error][:multiline]).to match(/already the latest version/)
                 end
               end
 
@@ -110,7 +110,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
                 end
 
                 it 'overwrites the installed module with the greatest version matching that range' do
-                  subject.should include :result => :success
+                  expect(subject).to include :result => :success
                   graph_should_include 'pmtacceptance-stdlib', v('3.2.0') => v('3.2.0')
                 end
               end
@@ -130,14 +130,14 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           before { preinstall('pmtacceptance-mysql', '0.8.0') }
 
           it 'properly upgrades to the greatest version matching the dependency' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-mysql', v('0.8.0') => v('0.9.0')
           end
         end
 
         context 'and up to date' do
           it 'declines to upgrade' do
-            subject.should include :result => :failure
+            expect(subject).to include :result => :failure
           end
         end
 
@@ -148,8 +148,8 @@ describe Puppet::ModuleTool::Applications::Upgrader do
 
           it 'fails to upgrade the module' do
             # TODO: More helpful error message?
-            subject.should include :result => :failure
-            subject[:error].should include :oneline => "Could not upgrade '#{self.module}' (v0.9.0 -> v2.1.0); no version satisfies all dependencies"
+            expect(subject).to include :result => :failure
+            expect(subject[:error]).to include :oneline => "Could not upgrade '#{self.module}' (v0.9.0 -> v2.1.0); no version satisfies all dependencies"
           end
 
           context 'using --force' do
@@ -158,7 +158,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
             end
 
             it 'overwrites the installed module with the specified version' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-mysql', v('0.9.0') => v('2.1.0')
             end
           end
@@ -173,8 +173,8 @@ describe Puppet::ModuleTool::Applications::Upgrader do
         end
 
         it 'fails to upgrade' do
-          subject.should include :result => :failure
-          subject[:error].should include :oneline => "Could not upgrade '#{self.module}'; module has had changes made locally"
+          expect(subject).to include :result => :failure
+          expect(subject[:error]).to include :oneline => "Could not upgrade '#{self.module}'; module has had changes made locally"
         end
 
         context 'with --ignore-changes' do
@@ -183,7 +183,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           end
 
           it 'overwrites the installed module with the greatest version matching that range' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-stdlib', v('1.0.0') => v('4.1.0')
           end
         end
@@ -199,7 +199,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module and installs the missing dependencies' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.1.1')
             graph_should_include 'pmtacceptance-stdlib', nil => v('4.1.0'), :action => :install
           end
@@ -213,7 +213,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           let(:module) { 'pmtacceptance-apache' }
 
           it 'refuses to upgrade the installed dependency to a new major version, but upgrades the module to the greatest compatible version' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.0.4')
           end
 
@@ -223,7 +223,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
             end
 
             it 'upgrades the module to the greatest available version' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             end
           end
@@ -235,7 +235,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module and its dependencies to their greatest compatible versions' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', v('2.0.0') => v('2.6.0')
           end
@@ -247,7 +247,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module to the greatest available version' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', nil
           end
@@ -259,7 +259,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           let(:module) { 'pmtacceptance-apache' }
 
           it 'upgrades the module to the greatest available version' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
             graph_should_include 'pmtacceptance-stdlib', nil
           end
@@ -279,7 +279,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
           let(:module) { 'pmtacceptance-bacula' }
 
           it 'upgrades the module to the greatest version compatible with all other installed modules' do
-            subject.should include :result => :success
+            expect(subject).to include :result => :success
             graph_should_include 'pmtacceptance-bacula', v('0.0.1') => v('0.0.2')
           end
 
@@ -289,7 +289,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
             end
 
             it 'upgrades the module to the greatest version available' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-bacula', v('0.0.1') => v('0.0.3')
             end
           end
@@ -302,7 +302,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
 
           context 'with older major versions' do
             it 'upgrades the module to the greatest version compatible with the installed modules' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.0.4')
               graph_should_include 'pmtacceptance-stdlib', nil
             end
@@ -312,7 +312,7 @@ describe Puppet::ModuleTool::Applications::Upgrader do
             before { preinstall('pmtacceptance-stdlib', '2.0.0', :into => secondary_dir) }
 
             it 'upgrades the module and its dependencies to their greatest compatible versions, in-place' do
-              subject.should include :result => :success
+              expect(subject).to include :result => :success
               graph_should_include 'pmtacceptance-apache', v('0.0.3') => v('0.10.0')
               graph_should_include 'pmtacceptance-stdlib', v('2.0.0') => v('2.6.0'), :path => secondary_dir
             end