1 files changed, 24 insertions, 20 deletions

diff --git a/spec/support/shared/unit/execute_resource.rb b/spec/support/shared/unit/execute_resource.rb
index 104aa7694e..e969a2ebd5 100644
--- a/spec/support/shared/unit/execute_resource.rb
+++ b/spec/support/shared/unit/execute_resource.rb
@@ -26,85 +26,89 @@ shared_examples_for "an execute resource" do
   end
 
   it "should create a new Chef::Resource::Execute" do
-    @resource.should be_a_kind_of(Chef::Resource)
-    @resource.should be_a_kind_of(Chef::Resource::Execute)
+    expect(@resource).to be_a_kind_of(Chef::Resource)
+    expect(@resource).to be_a_kind_of(Chef::Resource::Execute)
   end
 
   it "should set the command to the first argument to new" do
-    @resource.command.should eql(resource_instance_name)
+    expect(@resource.command).to eql(resource_instance_name)
   end
 
   it "should accept an array on instantiation, too" do
     resource = Chef::Resource::Execute.new(%w{something else})
-    resource.should be_a_kind_of(Chef::Resource)
-    resource.should be_a_kind_of(Chef::Resource::Execute)
-    resource.command.should eql(%w{something else})
+    expect(resource).to be_a_kind_of(Chef::Resource)
+    expect(resource).to be_a_kind_of(Chef::Resource::Execute)
+    expect(resource.command).to eql(%w{something else})
   end
 
   it "should accept a string for the command to run" do
     @resource.command "something"
-    @resource.command.should eql("something")
+    expect(@resource.command).to eql("something")
   end
 
   it "should accept an array for the command to run" do
     @resource.command %w{something else}
-    @resource.command.should eql(%w{something else})
+    expect(@resource.command).to eql(%w{something else})
   end
 
   it "should accept a string for the cwd" do
     @resource.cwd "something"
-    @resource.cwd.should eql("something")
+    expect(@resource.cwd).to eql("something")
   end
 
   it "should accept a hash for the environment" do
     test_hash = { :one => :two }
     @resource.environment(test_hash)
-    @resource.environment.should eql(test_hash)
+    expect(@resource.environment).to eql(test_hash)
   end
 
   it "allows the environment to be specified with #env" do
-    @resource.should respond_to(:env)
+    expect(@resource).to respond_to(:env)
   end
 
   it "should accept a string for the group" do
     @resource.group "something"
-    @resource.group.should eql("something")
+    expect(@resource.group).to eql("something")
   end
 
   it "should accept an integer for the group" do
     @resource.group 1
-    @resource.group.should eql(1)
+    expect(@resource.group).to eql(1)
   end
 
-  it "should accept an array for the execution path in Chef-12 and log deprecation message" do
+  it "should accept an array for the execution path in Chef-12 and log deprecation message", :chef_lt_13_only do
     expect(Chef::Log).to receive(:warn).at_least(:once)
     @resource.path ["woot"]
     expect(@resource.path).to eql(["woot"])
   end
 
+  it "should raise an exception in chef-13", :chef_gte_13_only do
+    expect(@resource.path [ "woot" ]).to raise_error
+  end
+
   it "should accept an integer for the return code" do
     @resource.returns 1
-    @resource.returns.should eql(1)
+    expect(@resource.returns).to eql(1)
   end
 
   it "should accept an integer for the timeout" do
     @resource.timeout 1
-    @resource.timeout.should eql(1)
+    expect(@resource.timeout).to eql(1)
   end
 
   it "should accept a string for the user" do
     @resource.user "something"
-    @resource.user.should eql("something")
+    expect(@resource.user).to eql("something")
   end
 
   it "should accept an integer for the user" do
     @resource.user 1
-    @resource.user.should eql(1)
+    expect(@resource.user).to eql(1)
   end
 
   it "should accept a string for creates" do
     @resource.creates "something"
-    @resource.creates.should eql("something")
+    expect(@resource.creates).to eql("something")
   end
 
   describe "when it has cwd, environment, group, path, return value, and a user" do
@@ -118,7 +122,7 @@ shared_examples_for "an execute resource" do
     end
 
     it "returns the command as its identity" do
-      @resource.identity.should == "grep"
+      expect(@resource.identity).to eq("grep")
     end
   end
 end