update zypper_package

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

2 files changed, 9 insertions, 25 deletions

diff --git a/spec/functional/resource/zypper_package_spec.rb b/spec/functional/resource/zypper_package_spec.rb
index e56684b6f8..e143f64a9f 100644
--- a/spec/functional/resource/zypper_package_spec.rb
+++ b/spec/functional/resource/zypper_package_spec.rb
@@ -96,6 +96,15 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
       expect(zypper_package.updated_by_last_action?).to be false
       expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
     end
+
+    it "multipackage" do
+      preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+      zypper_package.package_name(["chef_rpm", "chef_rpm"])
+      zypper_package.version(["1.2", "1.10"])
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+    end
   end
 
   context "with versions" do
diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb
index fe1cd25ee3..a1f6629f55 100644
--- a/spec/unit/provider/package/zypper_spec.rb
+++ b/spec/unit/provider/package/zypper_spec.rb
@@ -96,31 +96,6 @@ describe Chef::Provider::Package::Zypper do
       provider.load_current_resource
     end
 
-    it "should set the candidate version if zypper info has one (zypper version < 1.13.0)" do
-      status = double(stdout: "Version: 1.0\nInstalled: No\nStatus: out-of-date (version 0.9 installed)", exitstatus: 0)
-
-      allow(provider).to receive(:shell_out_compacted!).and_return(status)
-      provider.load_current_resource
-      expect(provider.candidate_version).to eql(["1.0"])
-    end
-
-    it "should set the candidate version if zypper info has one (zypper version >= 1.13.0)" do
-      status = double(stdout: "Version        : 1.0                             \nInstalled      : No                              \nStatus         : out-of-date (version 0.9 installed)", exitstatus: 0)
-
-      allow(provider).to receive(:shell_out_compacted!).and_return(status)
-      provider.load_current_resource
-      expect(provider.candidate_version).to eql(["1.0"])
-    end
-
-    it "should have differing current and candidate versions if zypper detects an upgrade" do
-      status = double(stdout: "Version        : 1.0                             \nInstalled      : Yes                              \nStatus         : out-of-date (version 0.9 installed)", exitstatus: 0)
-
-      allow(provider).to receive(:shell_out_compacted!).and_return(status)
-      provider.load_current_resource
-      expect(provider.get_current_versions).to eq(["0.9"])
-      expect(provider.get_candidate_versions).to eq(["1.0"])
-    end
-
     it "should return the current resouce" do
       expect(provider.load_current_resource).to eql(current_resource)
     end