switch to the let syntax for the rpm spec tests instead of a before block with instance variables

1 files changed, 82 insertions, 74 deletions

diff --git a/spec/unit/provider/package/rpm_spec.rb b/spec/unit/provider/package/rpm_spec.rb
index 84ba19fc6e..3f529ac99b 100644
--- a/spec/unit/provider/package/rpm_spec.rb
+++ b/spec/unit/provider/package/rpm_spec.rb
@@ -19,141 +19,149 @@
 require 'spec_helper'
 
 describe Chef::Provider::Package::Rpm do
-  before(:each) do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
 
-    @new_resource = Chef::Resource::Package.new("ImageMagick-c++")
-    @new_resource.source "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm"
+  subject(:provider) { Chef::Provider::Package::Rpm.new(new_resource, run_context) }
 
-    @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:new_resource) do
+    Chef::Resource::Package.new("ImageMagick-c++").tap do |resource|
+      resource.source "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm"
+    end
+  end
+  let(:exitstatus) { 0 }
+  let(:stdout) { String.new('') }
+  let(:status) { double('Process::Status', exitstatus: exitstatus, stdout: stdout) }
+  let(:exitstatus) { 0 }
 
-    @stdout = ''
-    @status = double("Status", :exitstatus => 0, :stdout => @stdout)
+  before(:each) do
     allow(::File).to receive(:exists?).and_return(true)
   end
 
   describe "when determining the current state of the package" do
 
     it "should create a current resource with the name of new_resource" do
-      allow(@provider).to receive(:shell_out!).and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.name).to eq("ImageMagick-c++")
+      allow(provider).to receive(:shell_out!).and_return(status)
+      provider.load_current_resource
+      expect(provider.current_resource.name).to eq("ImageMagick-c++")
     end
 
     it "should set the current reource package name to the new resource package name" do
-      allow(@provider).to receive(:shell_out!).and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.package_name).to eq('ImageMagick-c++')
+      allow(provider).to receive(:shell_out!).and_return(status)
+      provider.load_current_resource
+      expect(provider.current_resource.package_name).to eq('ImageMagick-c++')
     end
 
     it "should raise an exception if a source is supplied but not found" do
       allow(::File).to receive(:exists?).and_return(false)
-      expect { @provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+      expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should get the source package version from rpm if provided" do
-      @stdout = "ImageMagick-c++ 6.5.4.7-7.el6_5"
-      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
-      expect(@provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(@status)
-      expect(@provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.package_name).to eq("ImageMagick-c++")
-      expect(@provider.new_resource.version).to eq("6.5.4.7-7.el6_5")
+      stdout = "ImageMagick-c++ 6.5.4.7-7.el6_5"
+      status = double("Status", :exitstatus => 0, :stdout => stdout)
+      expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(status)
+      expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status)
+      provider.load_current_resource
+      expect(provider.current_resource.package_name).to eq("ImageMagick-c++")
+      expect(provider.new_resource.version).to eq("6.5.4.7-7.el6_5")
     end
 
     it "should return the current version installed if found by rpm" do
-      @stdout = "ImageMagick-c++ 6.5.4.7-7.el6_5"
-      @status = double("Status", :exitstatus => 0, :stdout => @stdout)
-      expect(@provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(@status)
-      expect(@provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.version).to eq("6.5.4.7-7.el6_5")
+      stdout = "ImageMagick-c++ 6.5.4.7-7.el6_5"
+      status = double("Status", :exitstatus => 0, :stdout => stdout)
+      expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(status)
+      expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status)
+      provider.load_current_resource
+      expect(provider.current_resource.version).to eq("6.5.4.7-7.el6_5")
     end
 
     it "should raise an exception if the source is not set but we are installing" do
       new_resource = Chef::Resource::Package.new("ImageMagick-c++")
-      provider = Chef::Provider::Package::Rpm.new(new_resource, @run_context)
+      provider = Chef::Provider::Package::Rpm.new(new_resource, run_context)
       expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should raise an exception if rpm fails to run" do
-      status = double("Status", :exitstatus => -1, :stdout => @stdout)
-      allow(@provider).to receive(:shell_out!).and_return(status)
-      expect { @provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
+      status = double("Status", :exitstatus => -1, :stdout => stdout)
+      allow(provider).to receive(:shell_out!).and_return(status)
+      expect { provider.run_action(:any) }.to raise_error(Chef::Exceptions::Package)
     end
 
     it "should not detect the package name as version when not installed" do
-      @stdout = "package openssh-askpass is not installed"
-      @status = double("Status", :exitstatus => -1, :stdout => @stdout)
-      @new_resource = Chef::Resource::Package.new("openssh-askpass")
-      @new_resource.source 'openssh-askpass'
-      @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-      expect(@provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(@status)
-      expect(@provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(@status)
-      @provider.load_current_resource
-      expect(@provider.current_resource.version).to be_nil
+      stdout = "package openssh-askpass is not installed"
+      status = double("Status", :exitstatus => -1, :stdout => stdout)
+      new_resource = Chef::Resource::Package.new("openssh-askpass")
+      new_resource.source 'openssh-askpass'
+      provider = Chef::Provider::Package::Rpm.new(new_resource, run_context)
+      expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(status)
+      expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(status)
+      provider.load_current_resource
+      expect(provider.current_resource.version).to be_nil
     end
   end
 
   describe "after the current resource is loaded" do
-    before do
-      @current_resource = Chef::Resource::Package.new("ImageMagick-c++")
-      @provider.current_resource = @current_resource
+
+    let(:current_resource) { Chef::Resource::Package.new("ImageMagick-c++") }
+    let(:provider) do
+      Chef::Provider::Package::Rpm.new(new_resource, run_context).tap do |provider|
+        provider.current_resource = current_resource
+      end
     end
 
     describe "when installing or upgrading" do
       it "should run rpm -i with the package source to install" do
-        expect(@provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.install_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        expect(provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.install_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
 
       it "should run rpm -U with the package source to upgrade" do
-        @current_resource.version("21.4-19.el5")
-        expect(@provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        current_resource.version("21.4-19.el5")
+        expect(provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
 
       it "should install package if missing and set to upgrade" do
-        @current_resource.version("ImageMagick-c++")
-        expect(@provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        current_resource.version("ImageMagick-c++")
+        expect(provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.upgrade_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
 
       it "should install from a path when the package is a path and the source is nil" do
-        @new_resource = Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-        expect(@new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @current_resource = Chef::Resource::Package.new("ImageMagick-c++")
-        @provider.current_resource = @current_resource
-        expect(@provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.install_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
+        new_resource = Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider = Chef::Provider::Package::Rpm.new(new_resource, run_context)
+        expect(new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        current_resource = Chef::Resource::Package.new("ImageMagick-c++")
+        provider.current_resource = current_resource
+        expect(provider).to receive(:shell_out!).with("rpm  -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.install_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
       end
 
       it "should uprgrade from a path when the package is a path and the source is nil" do
-        @new_resource = Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
-        expect(@new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @current_resource = Chef::Resource::Package.new("ImageMagick-c++")
-        @current_resource.version("21.4-19.el5")
-        @provider.current_resource = @current_resource
-        expect(@provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.upgrade_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
+        new_resource = Chef::Resource::Package.new("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider = Chef::Provider::Package::Rpm.new(new_resource, run_context)
+        expect(new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        current_resource = Chef::Resource::Package.new("ImageMagick-c++")
+        current_resource.version("21.4-19.el5")
+        provider.current_resource = current_resource
+        expect(provider).to receive(:shell_out!).with("rpm  -U /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.upgrade_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
       end
 
       it "installs with custom options specified in the resource" do
-        @provider.candidate_version = '11'
-        @new_resource.options("--dbpath /var/lib/rpm")
-        expect(@provider).to receive(:shell_out!).with("rpm --dbpath /var/lib/rpm -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
-        @provider.install_package(@new_resource.name, @provider.candidate_version)
+        provider.candidate_version = '11'
+        new_resource.options("--dbpath /var/lib/rpm")
+        expect(provider).to receive(:shell_out!).with("rpm --dbpath /var/lib/rpm -i /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
+        provider.install_package(new_resource.name, provider.candidate_version)
       end
     end
 
     describe "when removing the package" do
       it "should run rpm -e to remove the package" do
-        expect(@provider).to receive(:shell_out!).with("rpm  -e ImageMagick-c++-6.5.4.7-7.el6_5")
-        @provider.remove_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
+        expect(provider).to receive(:shell_out!).with("rpm  -e ImageMagick-c++-6.5.4.7-7.el6_5")
+        provider.remove_package("ImageMagick-c++", "6.5.4.7-7.el6_5")
       end
     end
   end