puppet 3.8.7 → 4.0.0

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

@@ -4,6 +4,8 @@ require 'spec_helper'
 provider_class = Puppet::Type.type(:package).provider(:yum)
 
 describe provider_class do
+  include PuppetSpec::Fixtures
+
   let(:name) { 'mypackage' }
   let(:resource) do
     Puppet::Type.type(:package).new(
@@ -28,16 +30,150 @@ describe provider_class do
   end
 
   describe 'provider features' do
-    it { should be_versionable }
-    it { should be_install_options }
-    it { should be_virtual_packages }
+    it { is_expected.to be_versionable }
+    it { is_expected.to be_install_options }
+    it { is_expected.to be_virtual_packages }
   end
 
   # provider should repond to the following methods
    [:install, :latest, :update, :purge, :install_options].each do |method|
      it "should have a(n) #{method}" do
-       provider.should respond_to(method)
+       expect(provider).to respond_to(method)
+    end
+  end
+
+  describe 'package evr parsing' do
+
+    it 'should parse full simple evr' do
+      v = provider.yum_parse_evr('0:1.2.3-4.el5')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('1.2.3')
+      expect(v[:release]).to eq('4.el5')
+    end
+
+    it 'should parse version only' do
+      v = provider.yum_parse_evr('1.2.3')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('1.2.3')
+      expect(v[:release]).to eq(nil)
+    end
+
+    it 'should parse version-release' do
+      v = provider.yum_parse_evr('1.2.3-4.5.el6')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('1.2.3')
+      expect(v[:release]).to eq('4.5.el6')
+    end
+
+    it 'should parse release with git hash' do
+      v = provider.yum_parse_evr('1.2.3-4.1234aefd')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('1.2.3')
+      expect(v[:release]).to eq('4.1234aefd')
+    end
+
+    it 'should parse single integer versions' do
+      v = provider.yum_parse_evr('12345')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('12345')
+      expect(v[:release]).to eq(nil)
+    end
+
+    it 'should parse text in the epoch to 0' do
+      v = provider.yum_parse_evr('foo0:1.2.3-4')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('1.2.3')
+      expect(v[:release]).to eq('4')
+    end
+
+    it 'should parse revisions with text' do
+      v = provider.yum_parse_evr('1.2.3-SNAPSHOT20140107')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('1.2.3')
+      expect(v[:release]).to eq('SNAPSHOT20140107')
+    end
+
+    # test cases for PUP-682
+    it 'should parse revisions with text and numbers' do
+      v = provider.yum_parse_evr('2.2-SNAPSHOT20121119105647')
+      expect(v[:epoch]).to eq('0')
+      expect(v[:version]).to eq('2.2')
+      expect(v[:release]).to eq('SNAPSHOT20121119105647')
+    end
+
+  end
+
+  describe 'yum evr comparison' do
+
+    # currently passing tests
+    it 'should evaluate identical version-release as equal' do
+      v = provider.yum_compareEVR({:epoch => '0', :version => '1.2.3', :release => '1.el5'},
+                                  {:epoch => '0', :version => '1.2.3', :release => '1.el5'})
+      expect(v).to eq(0)
     end
+
+    it 'should evaluate identical version as equal' do
+      v = provider.yum_compareEVR({:epoch => '0', :version => '1.2.3', :release => nil},
+                                  {:epoch => '0', :version => '1.2.3', :release => nil})
+      expect(v).to eq(0)
+    end
+
+    it 'should evaluate identical version but older release as less' do
+      v = provider.yum_compareEVR({:epoch => '0', :version => '1.2.3', :release => '1.el5'},
+                                  {:epoch => '0', :version => '1.2.3', :release => '2.el5'})
+      expect(v).to eq(-1)
+    end
+
+    it 'should evaluate identical version but newer release as greater' do
+      v = provider.yum_compareEVR({:epoch => '0', :version => '1.2.3', :release => '3.el5'},
+                                  {:epoch => '0', :version => '1.2.3', :release => '2.el5'})
+      expect(v).to eq(1)
+    end
+
+    it 'should evaluate a newer epoch as greater' do
+      v = provider.yum_compareEVR({:epoch => '1', :version => '1.2.3', :release => '4.5'},
+                                  {:epoch => '0', :version => '1.2.3', :release => '4.5'})
+      expect(v).to eq(1)
+    end
+
+    # these tests describe PUP-1244 logic yet to be implemented
+    it 'should evaluate any version as equal to the same version followed by release' do
+      v = provider.yum_compareEVR({:epoch => '0', :version => '1.2.3', :release => nil},
+                                  {:epoch => '0', :version => '1.2.3', :release => '2.el5'})
+      expect(v).to eq(0)
+    end
+
+    # test cases for PUP-682
+    it 'should evaluate same-length numeric revisions numerically' do
+      expect(provider.yum_compareEVR({:epoch => '0', :version => '2.2', :release => '405'},
+                               {:epoch => '0', :version => '2.2', :release => '406'})).to eq(-1)
+    end
+
+  end
+
+  describe 'yum version segment comparison' do
+
+    it 'should treat two nil values as equal' do
+      v = provider.compare_values(nil, nil)
+      expect(v).to eq(0)
+    end
+
+    it 'should treat a nil value as less than a non-nil value' do
+      v = provider.compare_values(nil, '0')
+      expect(v).to eq(-1)
+    end
+
+    it 'should treat a non-nil value as greater than a nil value' do
+      v = provider.compare_values('0', nil)
+      expect(v).to eq(1)
+    end
+
+    it 'should pass two non-nil values on to rpmvercmp' do
+      provider.stubs(:rpmvercmp) { 0 }
+      provider.expects(:rpmvercmp).with('s1', 's2')
+      provider.compare_values('s1', 's2')
+    end
+
   end
 
   describe 'when installing' do
@@ -49,7 +185,6 @@ describe provider_class do
 
     it 'should call yum install for :installed' do
       resource.stubs(:should).with(:ensure).returns :installed
-      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :list, name)
       provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, name)
       provider.install
     end
@@ -62,12 +197,18 @@ describe provider_class do
     it 'should be able to set version' do
       version = '1.2'
       resource[:ensure] = version
-      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :list, name)
       provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, "#{name}-#{version}")
       provider.stubs(:query).returns :ensure => version
       provider.install
     end
 
+    it 'should handle partial versions specified' do
+      version = '1.3.4'
+      resource[:ensure] = version
+      provider.stubs(:query).returns :ensure => '1.3.4-1.el6'
+      provider.install
+    end
+
     it 'should be able to downgrade' do
       current_version = '1.2'
       version = '1.0'
@@ -81,7 +222,6 @@ describe provider_class do
       resource[:ensure] = :installed
       resource[:install_options] = ['-t', {'-x' => 'expackage'}]
 
-      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', ['-t', '-x=expackage'], :list, name)
       provider.expects(:yum).with('-d', '0', '-e', '0', '-y', ['-t', '-x=expackage'], :install, name)
       provider.install
     end
@@ -103,7 +243,7 @@ describe provider_class do
   end
 
   it 'should be versionable' do
-    provider.should be_versionable
+    expect(provider).to be_versionable
   end
 
   describe 'determining the latest version available for a package' do
@@ -115,7 +255,7 @@ describe provider_class do
       ]
       provider.stubs(:properties).returns({:ensure => '3.4.5'})
 
-      described_class.expects(:latest_package_version).with(name, ['contrib', 'centosplus'], [])
+      described_class.expects(:latest_package_version).with(name, ['contrib', 'centosplus'], [], [])
       provider.latest
     end
 
@@ -126,13 +266,24 @@ describe provider_class do
       ]
       provider.stubs(:properties).returns({:ensure => '3.4.5'})
 
-      described_class.expects(:latest_package_version).with(name, [], ['updates', 'centosplus'])
+      described_class.expects(:latest_package_version).with(name, [], ['updates', 'centosplus'], [])
+      provider.latest
+    end
+
+    it "passes the value of disableexcludes install_options when querying" do
+      resource[:install_options] = [
+        {'--disableexcludes' => 'main'},
+        {'--disableexcludes' => 'centosplus'},
+      ]
+      provider.stubs(:properties).returns({:ensure => '3.4.5'})
+
+      described_class.expects(:latest_package_version).with(name, [], [], ['main', 'centosplus'])
       provider.latest
     end
 
     describe 'and a newer version is not available' do
       before :each do
-        described_class.stubs(:latest_package_version).with(name, [], []).returns nil
+        described_class.stubs(:latest_package_version).with(name, [], [], []).returns nil
       end
 
       it 'raises an error the package is not installed' do
@@ -144,7 +295,7 @@ describe provider_class do
 
       it 'returns version of the currently installed package' do
         provider.stubs(:properties).returns({:ensure => '3.4.5'})
-        provider.latest.should == '3.4.5'
+        expect(provider.latest).to eq('3.4.5')
       end
     end
 
@@ -160,8 +311,8 @@ describe provider_class do
       end
 
       it 'includes the epoch in the version string' do
-        described_class.stubs(:latest_package_version).with(name, [], []).returns(latest_version)
-        provider.latest.should == '1:2.3.4-5'
+        described_class.stubs(:latest_package_version).with(name, [], [], []).returns(latest_version)
+        expect(provider.latest).to eq('1:2.3.4-5')
       end
     end
   end
@@ -194,115 +345,158 @@ describe provider_class do
     let(:enabled_versions) { {name => [mypackage_newerversion]} }
 
     it "returns the version hash if the package was found" do
-      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
-      version = described_class.latest_package_version(name, [], [])
+      described_class.expects(:check_updates).with([], [], []).once.returns(latest_versions)
+      version = described_class.latest_package_version(name, [], [], [])
       expect(version).to eq(mypackage_version)
     end
 
     it "is nil if the package was not found in the query" do
-      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
-      version = described_class.latest_package_version('nopackage', [], [])
+      described_class.expects(:check_updates).with([], [], []).once.returns(latest_versions)
+      version = described_class.latest_package_version('nopackage', [], [], [])
       expect(version).to be_nil
     end
 
     it "caches the package list and reuses that for subsequent queries" do
-      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
+      described_class.expects(:check_updates).with([], [], []).once.returns(latest_versions)
 
       2.times {
-        version = described_class.latest_package_version(name, [], [])
+        version = described_class.latest_package_version(name, [], [], [])
         expect(version).to eq mypackage_version
       }
     end
 
-    it "caches separate lists for each combination of 'enablerepo' and 'disablerepo'" do
-      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
-      described_class.expects(:fetch_latest_versions).with(['enabled'], ['disabled']).once.returns(enabled_versions)
+    it "caches separate lists for each combination of 'enablerepo' and 'disablerepo' and 'disableexcludes'" do
+      described_class.expects(:check_updates).with([], [], []).once.returns(latest_versions)
+      described_class.expects(:check_updates).with(['enabled'], ['disabled'], ['disableexcludes']).once.returns(enabled_versions)
 
       2.times {
-        version = described_class.latest_package_version(name, [], [])
+        version = described_class.latest_package_version(name, [], [], [])
         expect(version).to eq mypackage_version
       }
 
       2.times {
-        version = described_class.latest_package_version(name, ['enabled'], ['disabled'])
+        version = described_class.latest_package_version(name, ['enabled'], ['disabled'], ['disableexcludes'])
         expect(version).to eq(mypackage_newerversion)
       }
     end
   end
 
-  describe "querying for the latest version of all packages" do
-    let(:yumhelper_single_arch) do
-      <<-YUMHELPER_OUTPUT
- * base: centos.tcpdiag.net
- * extras: centos.mirrors.hoobly.com
- * updates: mirrors.arsc.edu
-_pkg nss-tools 0 3.14.3 4.el6_4 x86_64
-_pkg pixman 0 0.26.2 5.el6_4 x86_64
-_pkg myresource 0 1.2.3.4 5.el4 noarch
-_pkg mysummaryless 0 1.2.3.4 5.el4 noarch
-     YUMHELPER_OUTPUT
-    end
-
-    let(:yumhelper_multi_arch) do
-      yumhelper_single_arch + <<-YUMHELPER_OUTPUT
-_pkg nss-tools 0 3.14.3 4.el6_4 i386
-_pkg pixman 0 0.26.2 5.el6_4 i386
-      YUMHELPER_OUTPUT
-    end
-
-
-    it "creates an entry for each line that's prefixed with '_pkg'" do
-      described_class.expects(:python).with([described_class::YUMHELPER]).returns(yumhelper_single_arch)
-      entries = described_class.fetch_latest_versions([], [])
-      expect(entries.keys).to include 'nss-tools'
-      expect(entries.keys).to include 'pixman'
-      expect(entries.keys).to include 'myresource'
-      expect(entries.keys).to include 'mysummaryless'
-    end
-
-    it "creates an entry for each package name and architecture" do
-      described_class.expects(:python).with([described_class::YUMHELPER]).returns(yumhelper_single_arch)
-      entries = described_class.fetch_latest_versions([], [])
-      expect(entries.keys).to include 'nss-tools.x86_64'
-      expect(entries.keys).to include 'pixman.x86_64'
-      expect(entries.keys).to include 'myresource.noarch'
-      expect(entries.keys).to include 'mysummaryless.noarch'
-    end
-
-    it "stores multiple entries if a package is build for multiple architectures" do
-      described_class.expects(:python).with([described_class::YUMHELPER]).returns(yumhelper_multi_arch)
-      entries = described_class.fetch_latest_versions([], [])
-      expect(entries.keys).to include 'nss-tools.x86_64'
-      expect(entries.keys).to include 'pixman.x86_64'
-      expect(entries.keys).to include 'nss-tools.i386'
-      expect(entries.keys).to include 'pixman.i386'
-
-      expect(entries['nss-tools']).to have(2).items
-      expect(entries['pixman']).to have(2).items
-    end
-
-    it "passes the repos to enable to the helper" do
-      described_class.expects(:python).with do |script, *args|
-        expect(script).to eq described_class::YUMHELPER
-        expect(args).to eq %w[-e updates -e centosplus]
-      end.returns('')
-      described_class.fetch_latest_versions(['updates', 'centosplus'], [])
-    end
-
-    it "passes the repos to disable to the helper" do
-      described_class.expects(:python).with do |script, *args|
-        expect(script).to eq described_class::YUMHELPER
-        expect(args).to eq %w[-d updates -d centosplus]
-      end.returns('')
-      described_class.fetch_latest_versions([], ['updates', 'centosplus'])
-    end
-
-    it 'passes a combination of repos to the helper' do
-      described_class.expects(:python).with do |script, *args|
-        expect(script).to eq described_class::YUMHELPER
-        expect(args).to eq %w[-e os -e contrib -d updates -d centosplus]
-      end.returns('')
-      described_class.fetch_latest_versions(['os', 'contrib'], ['updates', 'centosplus'])
+  describe "executing yum check-update" do
+    before do
+      described_class.stubs(:command).with(:yum).returns '/usr/bin/yum'
+    end
+
+    it "passes repos to enable to 'yum check-update'" do
+      Puppet::Util::Execution.expects(:execute).with do |args, *rest|
+        expect(args).to eq %w[/usr/bin/yum check-update --enablerepo=updates --enablerepo=centosplus]
+      end.returns(stub(:exitstatus => 0))
+      described_class.check_updates(%w[updates centosplus], [], [])
+    end
+
+    it "passes repos to disable to 'yum check-update'" do
+      Puppet::Util::Execution.expects(:execute).with do |args, *rest|
+        expect(args).to eq %w[/usr/bin/yum check-update --disablerepo=updates --disablerepo=centosplus]
+      end.returns(stub(:exitstatus => 0))
+      described_class.check_updates([],%w[updates centosplus], [])
+    end
+
+    it "passes a combination of repos to enable and disable to 'yum check-update'" do
+      Puppet::Util::Execution.expects(:execute).with do |args, *rest|
+        expect(args).to eq %w[/usr/bin/yum check-update --enablerepo=os --enablerepo=contrib --disablerepo=updates --disablerepo=centosplus]
+      end.returns(stub(:exitstatus => 0))
+      described_class.check_updates(%w[os contrib], %w[updates centosplus], [])
+    end
+
+    it "passes disableexcludes to 'yum check-update'" do
+      Puppet::Util::Execution.expects(:execute).with do |args, *rest|
+        expect(args).to eq %w[/usr/bin/yum check-update --disableexcludes=main --disableexcludes=centosplus]
+      end.returns(stub(:exitstatus => 0))
+      described_class.check_updates([], [], %w[main centosplus])
+    end
+
+    it "passes all options to 'yum check-update'" do
+      Puppet::Util::Execution.expects(:execute).with do |args, *rest|
+        expect(args).to eq %w[/usr/bin/yum check-update --enablerepo=a --enablerepo=b --disablerepo=c
+                              --disablerepo=d --disableexcludes=e --disableexcludes=f]
+      end.returns(stub(:exitstatus => 0))
+      described_class.check_updates(%w[a b], %w[c d], %w[e f])
+    end
+
+    it "returns an empty hash if 'yum check-update' returned 0" do
+      Puppet::Util::Execution.expects(:execute).returns(stub :exitstatus => 0)
+      expect(described_class.check_updates([], [], [])).to be_empty
+    end
+
+    it "returns a populated hash if 'yum check-update returned 100'" do
+      output = stub(:exitstatus => 100)
+      Puppet::Util::Execution.expects(:execute).returns(output)
+      described_class.expects(:parse_updates).with(output).returns({:has => :updates})
+      expect(described_class.check_updates([], [], [])).to eq({:has => :updates})
+    end
+
+    it "returns an empty hash if 'yum check-update' returned an exit code that was not 0 or 100" do
+      Puppet::Util::Execution.expects(:execute).returns(stub(:exitstatus => 1))
+      described_class.expects(:warn)
+      expect(described_class.check_updates([], [], [])).to eq({})
+    end
+  end
+
+  describe "parsing the output of check-update" do
+
+    describe "with no multiline entries" do
+      let(:check_update) { File.read(my_fixture('yum-check-update-simple.txt')) }
+      let(:output) { described_class.parse_updates(check_update) }
+
+      it 'creates an entry for each package keyed on the package name' do
+        expect(output['curl']).to eq([{:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'i686'}, {:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'x86_64'}])
+        expect(output['gawk']).to eq([{:name => 'gawk', :epoch => '0', :version => '4.1.0', :release => '3.fc20', :arch => 'i686'}])
+        expect(output['dhclient']).to eq([{:name => 'dhclient', :epoch => '12', :version => '4.1.1', :release => '38.P1.fc20', :arch => 'i686'}])
+        expect(output['selinux-policy']).to eq([{:name => 'selinux-policy', :epoch => '0', :version => '3.12.1', :release => '163.fc20', :arch => 'noarch'}])
+      end
+
+      it 'creates an entry for each package keyed on the package name and package architecture' do
+        expect(output['curl.i686']).to eq([{:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'i686'}])
+        expect(output['curl.x86_64']).to eq([{:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'x86_64'}])
+        expect(output['gawk.i686']).to eq([{:name => 'gawk', :epoch => '0', :version => '4.1.0', :release => '3.fc20', :arch => 'i686'}])
+        expect(output['dhclient.i686']).to eq([{:name => 'dhclient', :epoch => '12', :version => '4.1.1', :release => '38.P1.fc20', :arch => 'i686'}])
+        expect(output['selinux-policy.noarch']).to eq([{:name => 'selinux-policy', :epoch => '0', :version => '3.12.1', :release => '163.fc20', :arch => 'noarch'}])
+      end
+    end
+
+    describe "with multiline entries" do
+      let(:check_update) { File.read(my_fixture('yum-check-update-multiline.txt')) }
+      let(:output) { described_class.parse_updates(check_update) }
+
+      it "parses multi-line values as a single package tuple" do
+        expect(output['libpcap']).to eq([{:name => 'libpcap', :epoch => '14', :version => '1.4.0', :release => '1.20130826git2dbcaa1.el6', :arch => 'x86_64'}])
+      end
+    end
+  end
+
+  describe "parsing a line from yum check-update" do
+    it "splits up the package name and architecture fields" do
+      checkupdate = %w[curl.i686 7.32.0-10.fc20]
+
+      parsed = described_class.update_to_hash(*checkupdate)
+      expect(parsed[:name]).to eq 'curl'
+      expect(parsed[:arch]).to eq 'i686'
+    end
+
+    it "splits up the epoch, version, and release fields" do
+      checkupdate = %w[dhclient.i686 12:4.1.1-38.P1.el6.centos]
+      parsed = described_class.update_to_hash(*checkupdate)
+      expect(parsed[:epoch]).to eq '12'
+      expect(parsed[:version]).to eq '4.1.1'
+      expect(parsed[:release]).to eq '38.P1.el6.centos'
+    end
+
+    it "sets the epoch to 0 when an epoch is not specified" do
+      checkupdate = %w[curl.i686 7.32.0-10.fc20]
+
+      parsed = described_class.update_to_hash(*checkupdate)
+      expect(parsed[:epoch]).to eq '0'
+      expect(parsed[:version]).to eq '7.32.0'
+      expect(parsed[:release]).to eq '10.fc20'
     end
   end
 end

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

@@ -21,27 +21,27 @@ describe provider_class do
 
   it "should have an install method" do
     @provider = provider_class.new
-    @provider.should respond_to(:install)
+    expect(@provider).to respond_to(:install)
   end
 
   it "should have an uninstall method" do
     @provider = provider_class.new
-    @provider.should respond_to(:uninstall)
+    expect(@provider).to respond_to(:uninstall)
   end
 
   it "should have an update method" do
     @provider = provider_class.new
-    @provider.should respond_to(:update)
+    expect(@provider).to respond_to(:update)
   end
 
   it "should have a latest method" do
     @provider = provider_class.new
-    @provider.should respond_to(:latest)
+    expect(@provider).to respond_to(:latest)
   end
 
   it "should have a install_options method" do
     @provider = provider_class.new
-    @provider.should respond_to(:install_options)
+    expect(@provider).to respond_to(:install_options)
   end
 
   describe "when installing with zypper version >= 1.0" do
@@ -80,7 +80,7 @@ describe provider_class do
       @resource.stubs(:should).with(:ensure).returns :latest
       @resource.stubs(:allow_virtual?).returns false
       @provider.stubs(:zypper_version).returns "0.6.104"
-      @provider.expects(:zypper).with('--terse', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage')
+      @provider.expects(:zypper).with('--terse', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', 'mypackage')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -101,7 +101,7 @@ describe provider_class do
       @resource.stubs(:should).with(:ensure).returns :latest
       @resource.stubs(:allow_virtual?).returns false
       @provider.stubs(:zypper_version).returns "0.6.13"
-      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage')
+      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', '--name', 'mypackage')
       @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
       @provider.install
     end
@@ -120,28 +120,17 @@ describe provider_class do
 
       @resource.stubs(:[]).with(:name).returns "at"
       @provider.expects(:zypper).with("list-updates").returns fake_data
-      @provider.latest.should == "3.1.8-1069.18.2"
+      expect(@provider.latest).to eq("3.1.8-1069.18.2")
     end
   end
 
-  describe "should install a virtual package" do
-    it "when zypper version = 0.6.13" do
-      @resource.stubs(:should).with(:ensure).returns :installed
-      @resource.stubs(:allow_virtual?).returns true
-      @provider.stubs(:zypper_version).returns "0.6.13"
-      @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage')
-      @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
-      @provider.install
-    end
-
-    it "when zypper version >= 1.0.0" do
-      @resource.stubs(:should).with(:ensure).returns :installed
-      @resource.stubs(:allow_virtual?).returns true
-      @provider.stubs(:zypper_version).returns "1.2.8"
-      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', 'mypackage')
-      @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
-      @provider.install
-    end
+  it "should install a virtual package" do
+    @resource.stubs(:should).with(:ensure).returns :installed
+    @resource.stubs(:allow_virtual?).returns true
+    @provider.stubs(:zypper_version).returns "0.6.13"
+    @provider.expects(:zypper).with('--terse', :install, '--no-confirm', 'mypackage')
+    @provider.expects(:query).returns "mypackage 0 1.2.3 4.5.6 x86_64"
+    @provider.install
   end
 
   describe "when installing with zypper install options" do
@@ -152,8 +141,8 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
       @provider.stubs(:zypper_version).returns "1.2.8"
 
-      @provider.expects(:zypper).with('--quiet', '--no-gpg-check', :install,
-        '--auto-agree-with-licenses', '--no-confirm', '-p=/vagrant/files/localrepo/', 'php5-5.4.10-4.5.6')
+      @provider.expects(:zypper).with('--quiet', :install,
+        '--auto-agree-with-licenses', '--no-confirm', '--no-gpg-check', '-p=/vagrant/files/localrepo/', 'php5-5.4.10-4.5.6')
       @provider.expects(:query).returns "php5 0 5.4.10 4.5.6 x86_64"
       @provider.install
     end
@@ -165,7 +154,7 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
 
       @provider.stubs(:zypper_version).returns '1.2.8'
-      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a=foo', '--b="quoted bar"', '--name', 'vim')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', '--a=foo', '--b="quoted bar"', 'vim')
       @provider.expects(:query).returns 'package vim is not installed'
       @provider.install
     end
@@ -177,7 +166,7 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
 
       @provider.stubs(:zypper_version).returns '1.2.8'
-      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a', '--b', '--c', '--name', 'vim')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', '--a', '--b', '--c', 'vim')
       @provider.expects(:query).returns 'package vim is not installed'
       @provider.install
     end
@@ -189,7 +178,7 @@ describe provider_class do
       @resource.stubs(:allow_virtual?).returns false
 
       @provider.stubs(:zypper_version).returns '1.2.8'
-      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--a --b --c', '--name', 'vim')
+      @provider.expects(:zypper).with('--quiet', :install, '--auto-agree-with-licenses', '--no-confirm', '--name', '--a --b --c', 'vim')
       @provider.expects(:query).returns 'package vim is not installed'
       @provider.install
     end