1 files changed, 84 insertions, 98 deletions
diff --git a/spec/unit/resource/registry_key_spec.rb b/spec/unit/resource/registry_key_spec.rb
index 067f2da36a..3fe991aef2 100644
--- a/spec/unit/resource/registry_key_spec.rb
+++ b/spec/unit/resource/registry_key_spec.rb
@@ -19,197 +19,183 @@
 require "spec_helper"
 
 describe Chef::Resource::RegistryKey, "initialize" do
-  before(:each) do
-    @resource = Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius')
-  end
+  let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
-  it "should create a new Chef::Resource::RegistryKey" do
-    expect(@resource).to be_a_kind_of(Chef::Resource)
-    expect(@resource).to be_a_kind_of(Chef::Resource::RegistryKey)
+  it "creates a new Chef::Resource::RegistryKey" do
+    expect(resource).to be_a_kind_of(Chef::Resource)
+    expect(resource).to be_a_kind_of(Chef::Resource::RegistryKey)
   end
 
-  it "should set the resource_name to :registry_key" do
-    expect(@resource.resource_name).to eql(:registry_key)
+  it "sets the resource_name to :registry_key" do
+    expect(resource.resource_name).to eql(:registry_key)
   end
 
-  it "should set the key equal to the argument to initialize" do
-    expect(@resource.key).to eql('HKCU\Software\Raxicoricofallapatorius')
+  it "sets the key equal to the argument to initialize" do
+    expect(resource.key).to eql('HKCU\Software\Raxicoricofallapatorius')
   end
 
-  it "should default recursive to false" do
-    expect(@resource.recursive).to eql(false)
+  it "defaults recursive to false" do
+    expect(resource.recursive).to eql(false)
   end
 
-  it "should default architecture to :machine" do
-    expect(@resource.architecture).to eql(:machine)
+  it "defaults architecture to :machine" do
+    expect(resource.architecture).to eql(:machine)
   end
 
-  it "should set action to :create" do
-    expect(@resource.action).to eql([:create])
+  it "sets action to :create" do
+    expect(resource.action).to eql([:create])
   end
 
   %w{create create_if_missing delete delete_key}.each do |action|
-    it "should allow action #{action}" do
-      expect(@resource.allowed_actions.detect { |a| a == action.to_sym }).to eql(action.to_sym)
+    it "allows action #{action}" do
+      expect(resource.allowed_actions.detect { |a| a == action.to_sym }).to eql(action.to_sym)
     end
   end
 end
 
 describe Chef::Resource::RegistryKey, "key" do
-  before(:each) do
-    @resource = Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius')
-  end
+  let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
-  it "should allow a string" do
-    @resource.key 'HKCU\Software\Poosh'
-    expect(@resource.key).to eql('HKCU\Software\Poosh')
+  it "allows a string" do
+    resource.key 'HKCU\Software\Poosh'
+    expect(resource.key).to eql('HKCU\Software\Poosh')
   end
 
-  it "should not allow an integer" do
-    expect { @resource.send(:key, 100) }.to raise_error(ArgumentError)
+  it "does not allow an integer" do
+    expect { resource.send(:key, 100) }.to raise_error(ArgumentError)
   end
 
-  it "should not allow a hash" do
-    expect { @resource.send(:key, { :sonic => "screwdriver" }) }.to raise_error(ArgumentError)
+  it "does not allow a hash" do
+    expect { resource.send(:key, { :sonic => "screwdriver" }) }.to raise_error(ArgumentError)
   end
 end
 
 describe Chef::Resource::RegistryKey, "values" do
-  before(:each) do
-    @resource = Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius')
-  end
+  let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
-  it "should allow a single proper hash of registry values" do
-    @resource.values( { :name => "poosh", :type => :string, :data => "carmen" } )
-    expect(@resource.values).to eql([ { :name => "poosh", :type => :string, :data => "carmen" } ])
+  it "allows a single proper hash of registry values" do
+    resource.values( { :name => "poosh", :type => :string, :data => "carmen" } )
+    expect(resource.values).to eql([ { :name => "poosh", :type => :string, :data => "carmen" } ])
   end
 
-  it "should allow an array of proper hashes of registry values" do
-    @resource.values [ { :name => "poosh", :type => :string, :data => "carmen" } ]
-    expect(@resource.values).to eql([ { :name => "poosh", :type => :string, :data => "carmen" } ])
+  it "allows an array of proper hashes of registry values" do
+    resource.values [ { :name => "poosh", :type => :string, :data => "carmen" } ]
+    expect(resource.values).to eql([ { :name => "poosh", :type => :string, :data => "carmen" } ])
   end
 
-  it "should return checksummed data if the type is unsafe" do
-    @resource.values( { :name => "poosh", :type => :binary, :data => 255.chr * 1 })
-    expect(@resource.values).to eql([ { :name => "poosh", :type => :binary, :data => "a8100ae6aa1940d0b663bb31cd466142ebbdbd5187131b92d93818987832eb89" } ])
+  it "returns checksummed data if the type is unsafe" do
+    resource.values( { :name => "poosh", :type => :binary, :data => 255.chr * 1 })
+    expect(resource.values).to eql([ { :name => "poosh", :type => :binary, :data => "a8100ae6aa1940d0b663bb31cd466142ebbdbd5187131b92d93818987832eb89" } ])
   end
 
-  it "should raise an exception if the name field is missing" do
-    expect { @resource.values [ { :type => :string, :data => "carmen" } ] }.to raise_error(ArgumentError)
+  it "raises an exception if the name field is missing" do
+    expect { resource.values [ { :type => :string, :data => "carmen" } ] }.to raise_error(ArgumentError)
   end
 
-  it "should raise an exception if extra fields are present" do
-    expect { @resource.values [ { :name => "poosh", :type => :string, :data => "carmen", :screwdriver => "sonic" } ] }.to raise_error(ArgumentError)
+  it "raises an exception if extra fields are present" do
+    expect { resource.values [ { :name => "poosh", :type => :string, :data => "carmen", :screwdriver => "sonic" } ] }.to raise_error(ArgumentError)
   end
 
-  it "should not allow a string" do
-    expect { @resource.send(:values, "souffle") }.to raise_error(ArgumentError)
+  it "does not allow a string" do
+    expect { resource.send(:values, "souffle") }.to raise_error(ArgumentError)
   end
 
-  it "should not allow an integer" do
-    expect { @resource.send(:values, 100) }.to raise_error(ArgumentError)
+  it "does not allow an integer" do
+    expect { resource.send(:values, 100) }.to raise_error(ArgumentError)
   end
 
-  it "should raise an exception if type of name is not string" do
-    expect { @resource.values([ { :name => 123, :type => :string, :data => "carmen" } ]) }.to raise_error(ArgumentError)
+  it "raises an exception if type of name is not string" do
+    expect { resource.values([ { :name => 123, :type => :string, :data => "carmen" } ]) }.to raise_error(ArgumentError)
   end
 
-  it "should not raise an exception if type of name is string" do
-    expect { @resource.values([ { :name => "123", :type => :string, :data => "carmen" } ]) }.to_not raise_error
+  it "does not raise an exception if type of name is string" do
+    expect { resource.values([ { :name => "123", :type => :string, :data => "carmen" } ]) }.to_not raise_error
   end
 
   context "type key not given" do
-    it "should not raise an exception" do
-      expect { @resource.values([ { :name => "123", :data => "carmen" } ]) }.to_not raise_error
+    it "does not raise an exception" do
+      expect { resource.values([ { :name => "123", :data => "carmen" } ]) }.to_not raise_error
     end
   end
 
   context "type key given" do
-    it "should raise an exception if type of type is not symbol" do
-      expect { @resource.values([ { :name => "123", :type => "string", :data => "carmen" } ]) }.to raise_error(ArgumentError)
+    it "raises an exception if type of type is not symbol" do
+      expect { resource.values([ { :name => "123", :type => "string", :data => "carmen" } ]) }.to raise_error(ArgumentError)
     end
 
-    it "should not raise an exception if type of type is symbol" do
-      expect { @resource.values([ { :name => "123", :type => :string, :data => "carmen" } ]) }.to_not raise_error
+    it "does not raise an exception if type of type is symbol" do
+      expect { resource.values([ { :name => "123", :type => :string, :data => "carmen" } ]) }.to_not raise_error
     end
   end
 end
 
 describe Chef::Resource::RegistryKey, "recursive" do
-  before(:each) do
-    @resource = Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius')
-  end
+  let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
-  it "should allow a boolean" do
-    @resource.recursive(true)
-    expect(@resource.recursive).to eql(true)
+  it "allows a boolean" do
+    resource.recursive(true)
+    expect(resource.recursive).to eql(true)
   end
 
-  it "should not allow a hash" do
-    expect { @resource.recursive({ :sonic => :screwdriver }) }.to raise_error(ArgumentError)
+  it "does not allow a hash" do
+    expect { resource.recursive({ :sonic => :screwdriver }) }.to raise_error(ArgumentError)
   end
 
-  it "should not allow an array" do
-    expect { @resource.recursive([:nose, :chin]) }.to raise_error(ArgumentError)
+  it "does not allow an array" do
+    expect { resource.recursive([:nose, :chin]) }.to raise_error(ArgumentError)
   end
 
-  it "should not allow a string" do
-    expect { @resource.recursive("souffle") }.to raise_error(ArgumentError)
+  it "does not allow a string" do
+    expect { resource.recursive("souffle") }.to raise_error(ArgumentError)
   end
 
-  it "should not allow an integer" do
-    expect { @resource.recursive(100) }.to raise_error(ArgumentError)
+  it "does not allow an integer" do
+    expect { resource.recursive(100) }.to raise_error(ArgumentError)
   end
 end
 
 describe Chef::Resource::RegistryKey, "architecture" do
-  before(:each) do
-    @resource = Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius')
-  end
+  let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
   [ :i386, :x86_64, :machine ].each do |arch|
-    it "should allow #{arch} as a symbol" do
-      @resource.architecture(arch)
-      expect(@resource.architecture).to eql(arch)
+    it "allows #{arch} as a symbol" do
+      resource.architecture(arch)
+      expect(resource.architecture).to eql(arch)
     end
   end
 
-  it "should not allow a hash" do
-    expect { @resource.architecture({ :sonic => :screwdriver }) }.to raise_error(ArgumentError)
+  it "does not allow a hash" do
+    expect { resource.architecture({ :sonic => :screwdriver }) }.to raise_error(ArgumentError)
   end
 
-  it "should not allow an array" do
-    expect { @resource.architecture([:nose, :chin]) }.to raise_error(ArgumentError)
+  it "does not allow an array" do
+    expect { resource.architecture([:nose, :chin]) }.to raise_error(ArgumentError)
   end
 
-  it "should not allow a string" do
-    expect { @resource.architecture("souffle") }.to raise_error(ArgumentError)
+  it "does not allow a string" do
+    expect { resource.architecture("souffle") }.to raise_error(ArgumentError)
   end
 
-  it "should not allow an integer" do
-    expect { @resource.architecture(100) }.to raise_error(ArgumentError)
+  it "does not allow an integer" do
+    expect { resource.architecture(100) }.to raise_error(ArgumentError)
   end
 end
 
 describe Chef::Resource::RegistryKey, ":unscrubbed_values" do
-  before(:each) do
-    @resource = Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius')
-  end
+  let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
-  it "should return unsafe data as-is" do
+  it "returns unsafe data as-is" do
     key_values = [ { :name => "poosh", :type => :binary, :data => 255.chr * 1 } ]
-    @resource.values(key_values)
-    expect(@resource.unscrubbed_values).to eql(key_values)
+    resource.values(key_values)
+    expect(resource.unscrubbed_values).to eql(key_values)
   end
 end
 
 describe Chef::Resource::RegistryKey, "state" do
-  before(:each) do
-    @resource = Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius')
-  end
+  let(:resource) { Chef::Resource::RegistryKey.new('HKCU\Software\Raxicoricofallapatorius') }
 
-  it "should return scrubbed values" do
-    @resource.values([ { :name => "poosh", :type => :binary, :data => 255.chr * 1 } ])
-    expect(@resource.state_for_resource_reporter).to eql( { :values => [{ :name => "poosh", :type => :binary, :data => "a8100ae6aa1940d0b663bb31cd466142ebbdbd5187131b92d93818987832eb89" }] } )
+  it "returns scrubbed values" do
+    resource.values([ { :name => "poosh", :type => :binary, :data => 255.chr * 1 } ])
+    expect(resource.state_for_resource_reporter).to eql( { :values => [{ :name => "poosh", :type => :binary, :data => "a8100ae6aa1940d0b663bb31cd466142ebbdbd5187131b92d93818987832eb89" }] } )
   end
 end