puppet 6.0.10 → 6.1.0

data/spec/unit/provider/package/opkg_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package).provider(:opkg) do
@@ -9,23 +10,24 @@ describe Puppet::Type.type(:package).provider(:opkg) do
   let(:provider) { described_class.new(resource) }
 
   before do
-    allow(Puppet::Util).to receive(:which).with("opkg").and_return("/bin/opkg")
-    allow(provider).to receive(:package_lists).and_return(['.', '..', 'packages'])
+    Puppet::Util::Execution.stubs(:execute).never
+    Puppet::Util.stubs(:which).with("opkg").returns("/bin/opkg")
+    provider.stubs(:package_lists).returns ['.', '..', 'packages']
   end
 
   describe "when installing" do
     before do
-      allow(provider).to receive(:query).and_return({ :ensure => '1.0' })
+      provider.stubs(:query).returns({ :ensure => '1.0' })
     end
 
     context "when the package list is absent" do
       before do
-        allow(provider).to receive(:package_lists).and_return(['.', '..'])  #empty, no package list
+        provider.stubs(:package_lists).returns ['.', '..']  #empty, no package list
       end
 
       it "fetches the package list when installing" do
-        expect(provider).to receive(:opkg).with('update')
-        expect(provider).to receive(:opkg).with("--force-overwrite", "install", resource[:name])
+        provider.expects(:opkg).with('update')
+        provider.expects(:opkg).with("--force-overwrite", "install", resource[:name])
 
         provider.install
       end
@@ -33,19 +35,19 @@ describe Puppet::Type.type(:package).provider(:opkg) do
 
     context "when the package list is present" do
       before do
-        allow(provider).to receive(:package_lists).and_return(['.', '..', 'lists'])  # With a pre-downloaded package list
+        provider.stubs(:package_lists).returns ['.', '..', 'lists']  # With a pre-downloaded package list
       end
 
       it "fetches the package list when installing" do
-        expect(provider).not_to receive(:opkg).with('update')
-        expect(provider).to receive(:opkg).with("--force-overwrite", "install", resource[:name])
+        provider.expects(:opkg).with('update').never
+        provider.expects(:opkg).with("--force-overwrite", "install", resource[:name])
 
         provider.install
       end
     end
 
     it "should call opkg install" do
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/bin/opkg", "--force-overwrite", "install", resource[:name]], {:failonfail => true, :combine => true, :custom_environment => {}})
+      Puppet::Util::Execution.expects(:execute).with(["/bin/opkg", "--force-overwrite", "install", resource[:name]], {:failonfail => true, :combine => true, :custom_environment => {}})
       provider.install
     end
 
@@ -58,7 +60,7 @@ describe Puppet::Type.type(:package).provider(:opkg) do
         }.each do |source|
           it "should install #{source} directly" do
             resource[:source] = source
-            expect(Puppet::Util::Execution).to receive(:execute).with(["/bin/opkg", "--force-overwrite", "install", resource[:source]], {:failonfail => true, :combine => true, :custom_environment => {}})
+            Puppet::Util::Execution.expects(:execute).with(["/bin/opkg", "--force-overwrite", "install", resource[:source]], {:failonfail => true, :combine => true, :custom_environment => {}})
             provider.install
           end
         end
@@ -72,7 +74,7 @@ describe Puppet::Type.type(:package).provider(:opkg) do
         end
 
         it "should install from the path segment of the URL" do
-          expect(Puppet::Util::Execution).to receive(:execute).and_return(Puppet::Util::Execution::ProcessOutput.new("", 0))
+          Puppet::Util::Execution.expects(:execute).returns(Puppet::Util::Execution::ProcessOutput.new("", 0))
           provider.install
         end
       end
@@ -80,7 +82,7 @@ describe Puppet::Type.type(:package).provider(:opkg) do
       context "with invalid URL for opkg" do
         before do
           # Emulate the `opkg` command returning a non-zero exit value
-          allow(Puppet::Util::Execution).to receive(:execute).and_raise(Puppet::ExecutionFailure, 'oops')
+          Puppet::Util::Execution.stubs(:execute).raises Puppet::ExecutionFailure, 'oops'
         end
 
         context "puppet://server/whatever" do
@@ -108,19 +110,20 @@ describe Puppet::Type.type(:package).provider(:opkg) do
 
   describe "when updating" do
     it "should call install" do
-      expect(provider).to receive(:install).and_return("install return value")
+      provider.expects(:install).returns("install return value")
       expect(provider.update).to eq("install return value")
     end
   end
 
   describe "when uninstalling" do
     it "should run opkg remove bla" do
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/bin/opkg", "remove", resource[:name]], {:failonfail => true, :combine => true, :custom_environment => {}})
+      Puppet::Util::Execution.expects(:execute).with(["/bin/opkg", "remove", resource[:name]], {:failonfail => true, :combine => true, :custom_environment => {}})
       provider.uninstall
     end
   end
 
   describe "when querying" do
+
     describe "self.instances" do
       let (:packages) do
         <<-OPKG_OUTPUT
@@ -129,11 +132,10 @@ kernel - 3.3.8-1-ba5cdb2523b4fc7722698b4a7ece6702
 uhttpd - 2012-10-30-e57bf6d8bfa465a50eea2c30269acdfe751a46fd
 OPKG_OUTPUT
       end
-
       it "returns an array of packages" do
-        allow(Puppet::Util).to receive(:which).with("opkg").and_return("/bin/opkg")
-        allow(described_class).to receive(:which).with("opkg").and_return("/bin/opkg")
-        expect(described_class).to receive(:execpipe).with("/bin/opkg list-installed").and_yield(packages)
+        Puppet::Util.stubs(:which).with("opkg").returns("/bin/opkg")
+        described_class.stubs(:which).with("opkg").returns("/bin/opkg")
+        described_class.expects(:execpipe).with("/bin/opkg list-installed").yields(packages)
 
         installed_packages = described_class.instances
         expect(installed_packages.length).to eq(3)
@@ -163,12 +165,12 @@ OPKG_OUTPUT
     end
 
     it "should return a nil if the package isn't found" do
-      expect(Puppet::Util::Execution).to receive(:execute).and_return(Puppet::Util::Execution::ProcessOutput.new("", 0))
+      Puppet::Util::Execution.expects(:execute).returns(Puppet::Util::Execution::ProcessOutput.new("", 0))
       expect(provider.query).to be_nil
     end
 
     it "should return a hash indicating that the package is missing on error" do
-      expect(Puppet::Util::Execution).to receive(:execute).and_raise(Puppet::ExecutionFailure.new("ERROR!"))
+      Puppet::Util::Execution.expects(:execute).raises(Puppet::ExecutionFailure.new("ERROR!"))
       expect(provider.query).to eq({
         :ensure => :purged,
         :status => 'missing',
@@ -176,5 +178,6 @@ OPKG_OUTPUT
         :error => 'ok',
       })
     end
-  end
-end
+  end #end when querying
+
+end # end describe provider

data/spec/unit/provider/package/pacman_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'stringio'
 
@@ -10,37 +11,37 @@ describe Puppet::Type.type(:package).provider(:pacman) do
   let(:provider) { described_class.new(resource) }
 
   before do
-    allow(resolver).to receive(:which).with('/usr/bin/pacman').and_return('/usr/bin/pacman')
-    allow(described_class).to receive(:which).with('/usr/bin/pacman').and_return('/usr/bin/pacman')
-    allow(resolver).to receive(:which).with('/usr/bin/yaourt').and_return('/usr/bin/yaourt')
-    allow(described_class).to receive(:which).with('/usr/bin/yaourt').and_return('/usr/bin/yaourt')
-    allow(described_class).to receive(:group?).and_return(false)
-    allow(described_class).to receive(:yaourt?).and_return(false)
+    resolver.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
+    described_class.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
+    resolver.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
+    described_class.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
+    described_class.stubs(:group?).returns(false)
+    described_class.stubs(:yaourt?).returns(false)
   end
 
   describe "when installing" do
     before do
-      allow(provider).to receive(:query).and_return({
+      provider.stubs(:query).returns({
         :ensure => '1.0'
       })
     end
 
     it "should call pacman to install the right package quietly when yaourt is not installed" do
       args = ['--noconfirm', '--needed', '--noprogressbar', '-Sy', resource[:name]]
-      expect(provider).to receive(:pacman).at_least(:once).with(*args).and_return('')
+      provider.expects(:pacman).at_least_once.with(*args).returns ''
       provider.install
     end
 
     it "should call yaourt to install the right package quietly when yaourt is installed" do
-      allow(described_class).to receive(:yaourt?).and_return(true)
+      described_class.stubs(:yaourt?).returns(true)
       args = ['--noconfirm', '--needed', '--noprogressbar', '-Sy', resource[:name]]
-      expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
+      provider.expects(:yaourt).at_least_once.with(*args).returns ''
       provider.install
     end
 
     it "should raise an Puppet::Error if the installation failed" do
-      allow(executor).to receive(:execute).and_return("")
-      expect(provider).to receive(:query).and_return(nil)
+      executor.stubs(:execute).returns("")
+      provider.expects(:query).returns(nil)
 
       expect {
         provider.install
@@ -48,7 +49,7 @@ describe Puppet::Type.type(:package).provider(:pacman) do
     end
 
     it "should raise an Puppet::Error when trying to install a group and allow_virtual is false" do
-      allow(described_class).to receive(:group?).and_return(true)
+      described_class.stubs(:group?).returns(true)
       resource[:allow_virtual] = false
       expect {
         provider.install
@@ -56,9 +57,9 @@ describe Puppet::Type.type(:package).provider(:pacman) do
     end
 
     it "should not raise an Puppet::Error when trying to install a group and allow_virtual is true" do
-      allow(described_class).to receive(:group?).and_return(true)
+      described_class.stubs(:group?).returns(true)
       resource[:allow_virtual] = true
-      allow(executor).to receive(:execute).and_return("")
+      executor.stubs(:execute).returns("")
       provider.install
     end
 
@@ -69,14 +70,14 @@ describe Puppet::Type.type(:package).provider(:pacman) do
 
       it "should call pacman to install the right package quietly when yaourt is not installed" do
         args = ['--noconfirm', '--needed', '--noprogressbar', '-x', '--arg=value', '-Sy', resource[:name]]
-        expect(provider).to receive(:pacman).at_least(:once).with(*args).and_return('')
+        provider.expects(:pacman).at_least_once.with(*args).returns ''
         provider.install
       end
 
       it "should call yaourt to install the right package quietly when yaourt is installed" do
-        expect(described_class).to receive(:yaourt?).and_return(true)
+        described_class.stubs(:yaourt?).returns(true)
         args = ['--noconfirm', '--needed', '--noprogressbar', '-x', '--arg=value', '-Sy', resource[:name]]
-        expect(provider).to receive(:yaourt).at_least(:once).with(*args).and_return('')
+        provider.expects(:yaourt).at_least_once.with(*args).returns ''
         provider.install
       end
     end
@@ -93,15 +94,15 @@ describe Puppet::Type.type(:package).provider(:pacman) do
           it "should install #{source} directly" do
             resource[:source] = source
 
-            expect(executor).to receive(:execute).
-              with(include("-Sy") & include("--noprogressbar"), no_extra_options).
-              ordered.
-              and_return("")
+            executor.expects(:execute).
+              with(all_of(includes("-Sy"), includes("--noprogressbar")), no_extra_options).
+              in_sequence(install_seq).
+              returns("")
 
-            expect(executor).to receive(:execute).
-              with(include("-U") & include(source), no_extra_options).
-              ordered.
-              and_return("")
+            executor.expects(:execute).
+              with(all_of(includes("-U"), includes(source)), no_extra_options).
+              in_sequence(install_seq).
+              returns("")
 
             provider.install
           end
@@ -116,16 +117,18 @@ describe Puppet::Type.type(:package).provider(:pacman) do
         end
 
         it "should install from the path segment of the URL" do
-          expect(executor).to receive(:execute).
-            with(include("-Sy") & include("--noprogressbar") & include("--noconfirm"),
+          executor.expects(:execute).
+            with(all_of(includes("-Sy"),
+                        includes("--noprogressbar"),
+                        includes("--noconfirm")),
                  no_extra_options).
-            ordered.
-            and_return("")
+            in_sequence(install_seq).
+            returns("")
 
-          expect(executor).to receive(:execute).
-            with(include("-U") & include(actual_file_path), no_extra_options).
-            ordered.
-            and_return("")
+          executor.expects(:execute).
+            with(all_of(includes("-U"), includes(actual_file_path)), no_extra_options).
+            in_sequence(install_seq).
+            returns("")
 
           provider.install
         end
@@ -159,7 +162,7 @@ describe Puppet::Type.type(:package).provider(:pacman) do
 
   describe "when updating" do
     it "should call install" do
-      expect(provider).to receive(:install).and_return("install return value")
+      provider.expects(:install).returns("install return value")
       expect(provider.update).to eq("install return value")
     end
   end
@@ -167,77 +170,78 @@ describe Puppet::Type.type(:package).provider(:pacman) do
   describe "when uninstalling" do
     it "should call pacman to remove the right package quietly" do
       args = ["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", resource[:name]]
-      expect(executor).to receive(:execute).with(args, no_extra_options).and_return("")
+      executor.expects(:execute).with(args, no_extra_options).returns ""
       provider.uninstall
     end
 
     it "should call yaourt to remove the right package quietly" do
-      allow(described_class).to receive(:yaourt?).and_return(true)
+      described_class.stubs(:yaourt?).returns(true)
       args = ["--noconfirm", "--noprogressbar", "-R", resource[:name]]
-      expect(provider).to receive(:yaourt).with(*args)
+      provider.expects(:yaourt).with(*args)
       provider.uninstall
     end
 
     it "adds any uninstall_options" do
       resource[:uninstall_options] = ['-x', {'--arg' => 'value'}]
       args = ["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-x", "--arg=value", "-R", resource[:name]]
-      expect(executor).to receive(:execute).with(args, no_extra_options).and_return("")
+      executor.expects(:execute).with(args, no_extra_options).returns ""
       provider.uninstall
     end
 
     it "should recursively remove packages when given a package group" do
-      allow(described_class).to receive(:group?).and_return(true)
+      described_class.stubs(:group?).returns(true)
       args = ["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", "-s", resource[:name]]
-      expect(executor).to receive(:execute).with(args, no_extra_options).and_return("")
+      executor.expects(:execute).with(args, no_extra_options).returns ""
       provider.uninstall
     end
   end
 
   describe "when querying" do
     it "should query pacman" do
-      expect(executor).to receive(:execpipe).with(["/usr/bin/pacman", '-Q'])
-      expect(executor).to receive(:execpipe).with(["/usr/bin/pacman", '-Sgg', 'package'])
+      executor.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
+      executor.expects(:execpipe).with(["/usr/bin/pacman", '-Sgg', 'package'])
       provider.query
     end
 
     it "should return the version" do
-      expect(executor).to receive(:execpipe).
-          with(["/usr/bin/pacman", "-Q"]).and_yield(<<EOF)
+      executor.
+          expects(:execpipe).
+          with(["/usr/bin/pacman", "-Q"]).yields(<<EOF)
 otherpackage 1.2.3.4
 package 1.01.3-2
 yetanotherpackage 1.2.3.4
 EOF
-      expect(executor).to receive(:execpipe).with(['/usr/bin/pacman', '-Sgg', 'package']).and_yield('')
+      executor.expects(:execpipe).with(['/usr/bin/pacman', '-Sgg', 'package']).yields('')
 
       expect(provider.query).to eq({ :name => 'package', :ensure => '1.01.3-2', :provider => :pacman,  })
     end
 
     it "should return a hash indicating that the package is missing" do
-      expect(executor).to receive(:execpipe).twice.and_yield("")
+      executor.expects(:execpipe).twice.yields("")
       expect(provider.query).to be_nil
     end
 
     it "should raise an error if execpipe fails" do
-      expect(executor).to receive(:execpipe).and_raise(Puppet::ExecutionFailure.new("ERROR!"))
+      executor.expects(:execpipe).raises(Puppet::ExecutionFailure.new("ERROR!"))
 
       expect { provider.query }.to raise_error(RuntimeError)
     end
 
     describe 'when querying a group' do
       before :each do
-        expect(executor).to receive(:execpipe).with(['/usr/bin/pacman', '-Q']).and_yield('foo 1.2.3')
-        expect(executor).to receive(:execpipe).with(['/usr/bin/pacman', '-Sgg', 'package']).and_yield('package foo')
+        executor.expects(:execpipe).with(['/usr/bin/pacman', '-Q']).yields('foo 1.2.3')
+        executor.expects(:execpipe).with(['/usr/bin/pacman', '-Sgg', 'package']).yields('package foo')
       end
 
       it 'should warn when allow_virtual is false' do
         resource[:allow_virtual] = false
-        expect(provider).to receive(:warning)
+        provider.expects(:warning)
         provider.query
       end
 
       it 'should not warn allow_virtual is true' do
         resource[:allow_virtual] = true
-        expect(described_class).not_to receive(:warning)
+        described_class.expects(:warning).never
         provider.query
       end
     end
@@ -245,14 +249,14 @@ EOF
 
   describe "when determining instances" do
     it "should retrieve installed packages and groups" do
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Q'])
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Sgg'])
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Sgg'])
       described_class.instances
     end
 
     it "should return installed packages" do
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Q']).and_yield(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Sgg']).and_yield("")
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Q']).yields(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Sgg']).yields("")
       instances = described_class.instances
 
       expect(instances.length).to eq(2)
@@ -271,11 +275,11 @@ EOF
     end
 
     it "should return completely installed groups with a virtual version together with packages" do
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Q']).and_yield(<<EOF)
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Q']).yields(<<EOF)
 package1 1.00
 package2 1.00
 EOF
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Sgg']).and_yield(<<EOF)
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Sgg']).yields(<<EOF)
 group1 package1
 group1 package2
 EOF
@@ -301,10 +305,10 @@ EOF
     end
 
     it "should not return partially installed packages" do
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Q']).and_yield(<<EOF)
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Q']).yields(<<EOF)
 package1 1.00
 EOF
-      expect(described_class).to receive(:execpipe).with(["/usr/bin/pacman", '-Sgg']).and_yield(<<EOF)
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Sgg']).yields(<<EOF)
 group1 package1
 group1 package2
 EOF
@@ -320,7 +324,7 @@ EOF
     end
 
     it 'should sort package names for installed groups' do
-      expect(described_class).to receive(:execpipe).with(['/usr/bin/pacman', '-Sgg', 'group1']).and_yield(<<EOF)
+      described_class.expects(:execpipe).with(['/usr/bin/pacman', '-Sgg', 'group1']).yields(<<EOF)
 group1 aa
 group1 b
 group1 a
@@ -336,52 +340,70 @@ EOF
     end
 
     it "should return nil on error" do
-      expect(described_class).to receive(:execpipe).and_raise(Puppet::ExecutionFailure.new("ERROR!"))
+      described_class.expects(:execpipe).raises(Puppet::ExecutionFailure.new("ERROR!"))
       expect { described_class.instances }.to raise_error(RuntimeError)
     end
 
     it "should warn on invalid input" do
-      expect(described_class).to receive(:execpipe).twice.and_yield(StringIO.new("blah"))
-      expect(described_class).to receive(:warning).with("Failed to match line 'blah'")
+      described_class.expects(:execpipe).twice.yields(StringIO.new("blah"))
+      described_class.expects(:warning).with("Failed to match line 'blah'")
       expect(described_class.instances).to eq([])
     end
   end
 
   describe "when determining the latest version" do
     it "should refresh package list" do
-      expect(executor).to receive(:execute).
-        ordered.
+      get_latest_version = sequence("get_latest_version")
+      executor.
+        expects(:execute).
+        in_sequence(get_latest_version).
         with(['/usr/bin/pacman', '-Sy'], no_extra_options)
 
-      expect(executor).to receive(:execute).
-        ordered.
-        and_return("")
+      executor.
+        stubs(:execute).
+        in_sequence(get_latest_version).
+        returns("")
 
       provider.latest
     end
 
     it "should get query pacman for the latest version" do
-      expect(executor).to receive(:execute).ordered
-
-      expect(executor).to receive(:execute).
-        ordered.
+      get_latest_version = sequence("get_latest_version")
+      executor.
+        stubs(:execute).
+        in_sequence(get_latest_version)
+
+      executor.
+        expects(:execute).
+        in_sequence(get_latest_version).
         with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', resource[:name]], no_extra_options).
-        and_return("")
+        returns("")
 
       provider.latest
     end
 
     it "should return the version number from pacman" do
-      expect(executor).to receive(:execute).at_least(:once).and_return("1.00.2-3\n")
+      executor.
+        expects(:execute).
+        at_least_once().
+        returns("1.00.2-3\n")
 
       expect(provider.latest).to eq("1.00.2-3")
     end
 
     it "should return a virtual group version when resource is a package group" do
-      allow(described_class).to receive(:group?).and_return(true)
-      expect(executor).to receive(:execute).with(['/usr/bin/pacman', '-Sy'], no_extra_options).ordered
-      expect(executor).to receive(:execute).with(['/usr/bin/pacman', '-Sp', '--print-format', '%n %v', resource[:name]], no_extra_options).ordered.
-        and_return(<<EOF)
+      described_class.stubs(:group?).returns(true)
+      get_latest_version = sequence("get_latest_version")
+      executor.
+        stubs(:execute).
+        with(['/usr/bin/pacman', '-Sy'], no_extra_options).
+        in_sequence(get_latest_version)
+
+      executor.
+        expects(:execute).
+        in_sequence(get_latest_version).
+        with(['/usr/bin/pacman', '-Sp', '--print-format', '%n %v', resource[:name]], no_extra_options).
+        returns(<<EOF)
 package2 1.0.1
 package1 1.0.0
 EOF
@@ -391,21 +413,21 @@ EOF
 
   describe 'when determining if a resource is a group' do
     before do
-      allow(described_class).to receive(:group?).and_call_original
+      described_class.unstub(:group?)
     end
 
     it 'should return false on non-zero pacman exit' do
-      allow(executor).to receive(:execute).with(['/usr/bin/pacman', '-Sg', 'git'], {:failonfail => true, :combine => true, :custom_environment => {}}).and_raise(Puppet::ExecutionFailure, 'error')
+      executor.stubs(:execute).with(['/usr/bin/pacman', '-Sg', 'git'], {:failonfail => true, :combine => true, :custom_environment => {}}).raises(Puppet::ExecutionFailure, 'error')
       expect(described_class.group?('git')).to eq(false)
     end
 
     it 'should return false on empty pacman output' do
-      allow(executor).to receive(:execute).with(['/usr/bin/pacman', '-Sg', 'git'], {:failonfail => true, :combine => true, :custom_environment => {}}).and_return('')
+      executor.stubs(:execute).with(['/usr/bin/pacman', '-Sg', 'git'], {:failonfail => true, :combine => true, :custom_environment => {}}).returns ''
       expect(described_class.group?('git')).to eq(false)
     end
 
     it 'should return true on non-empty pacman output' do
-      allow(executor).to receive(:execute).with(['/usr/bin/pacman', '-Sg', 'vim-plugins'], {:failonfail => true, :combine => true, :custom_environment => {}}).and_return('vim-plugins vim-a')
+      executor.stubs(:execute).with(['/usr/bin/pacman', '-Sg', 'vim-plugins'], {:failonfail => true, :combine => true, :custom_environment => {}}).returns 'vim-plugins vim-a'
       expect(described_class.group?('vim-plugins')).to eq(true)
     end
   end
@@ -415,33 +437,32 @@ EOF
     let(:groups) { [['foo package1'], ['foo package2'], ['bar package3'], ['bar package4'], ['baz package5']] }
 
     it 'should raise an error on non-zero pacman exit without a filter' do
-      expect(executor).to receive(:open).with('| /usr/bin/pacman -Sgg 2>&1').and_return('error!')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(1)
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').returns 'error!'
+      Puppet::Util::Execution.expects(:exitstatus).returns 1
       expect { described_class.get_installed_groups(installed_packages) }.to raise_error(Puppet::ExecutionFailure, 'error!')
     end
 
     it 'should return empty groups on non-zero pacman exit with a filter' do
-      expect(executor).to receive(:open).with('| /usr/bin/pacman -Sgg git 2>&1').and_return('')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(1)
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg git 2>&1').returns ''
+      Puppet::Util::Execution.expects(:exitstatus).returns 1
       expect(described_class.get_installed_groups(installed_packages, 'git')).to eq({})
     end
 
     it 'should return empty groups on empty pacman output' do
-      pipe = double()
-      expect(pipe).to receive(:each_line)
-      expect(executor).to receive(:open).with('| /usr/bin/pacman -Sgg 2>&1').and_yield(pipe).and_return('')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(0)
+      pipe = stub()
+      pipe.expects(:each_line)
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').yields(pipe).returns ''
+      Puppet::Util::Execution.expects(:exitstatus).returns 0
       expect(described_class.get_installed_groups(installed_packages)).to eq({})
     end
 
     it 'should return groups on non-empty pacman output' do
-      pipe = double()
-      pipe_expectation = receive(:each_line)
-      groups.each { |group| pipe_expectation = pipe_expectation.and_yield(*group) }
-      expect(pipe).to pipe_expectation
-      expect(executor).to receive(:open).with('| /usr/bin/pacman -Sgg 2>&1').and_yield(pipe).and_return('')
-      expect(Puppet::Util::Execution).to receive(:exitstatus).and_return(0)
+      pipe = stub()
+      pipe.expects(:each_line).multiple_yields(*groups)
+      executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').yields(pipe).returns ''
+      Puppet::Util::Execution.expects(:exitstatus).returns 0
       expect(described_class.get_installed_groups(installed_packages)).to eq({'foo' => 'package1 1.0, package2 2.0'})
     end
   end
+
 end