diff options
Diffstat (limited to 'spec/functional/resource/group_spec.rb')
-rw-r--r-- | spec/functional/resource/group_spec.rb | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 9c14232071..01e79f96bf 100644 --- a/spec/functional/resource/group_spec.rb +++ b/spec/functional/resource/group_spec.rb @@ -108,7 +108,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte temp_resource.append(true) temp_resource.run_action(:modify) members.each do |member| - user_exist_in_group?(member).should == true + expect(user_exist_in_group?(member)).to eq(true) end end @@ -119,7 +119,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte temp_resource.run_action(:create) group_should_exist(group_name) included_members.each do |member| - user_exist_in_group?(member).should == false + expect(user_exist_in_group?(member)).to eq(false) end end @@ -149,8 +149,8 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte it "should remove the existing users and add the new users to the group" do group_resource.run_action(tested_action) - user_exist_in_group?(spec_members[1]).should == true - user_exist_in_group?(spec_members[0]).should == false + expect(user_exist_in_group?(spec_members[1])).to eq(true) + expect(user_exist_in_group?(spec_members[0])).to eq(false) end end @@ -176,10 +176,10 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte group_resource.run_action(tested_action) included_members.each do |member| - user_exist_in_group?(member).should == true + expect(user_exist_in_group?(member)).to eq(true) end excluded_members.each do |member| - user_exist_in_group?(member).should == false + expect(user_exist_in_group?(member)).to eq(false) end end @@ -192,10 +192,10 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte group_resource.run_action(tested_action) included_members.each do |member| - user_exist_in_group?(member).should == true + expect(user_exist_in_group?(member)).to eq(true) end excluded_members.each do |member| - user_exist_in_group?(member).should == false + expect(user_exist_in_group?(member)).to eq(false) end end end @@ -204,13 +204,13 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte describe "when the users doesn't exist" do describe "when append is not set" do it "should raise an error" do - lambda { @grp_resource.run_action(tested_action) }.should raise_error + expect { @grp_resource.run_action(tested_action) }.to raise_error end end describe "when append is set" do it "should raise an error" do - lambda { @grp_resource.run_action(tested_action) }.should raise_error + expect { @grp_resource.run_action(tested_action) }.to raise_error end end end @@ -231,24 +231,24 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte describe "when updating membership" do it "raises an error for a non well-formed domain name" do group_resource.members [invalid_domain_user_name] - lambda { group_resource.run_action(tested_action) }.should raise_error Chef::Exceptions::Win32APIError + expect { group_resource.run_action(tested_action) }.to raise_error Chef::Exceptions::Win32APIError end it "raises an error for a nonexistent domain" do group_resource.members [nonexistent_domain_user_name] - lambda { group_resource.run_action(tested_action) }.should raise_error Chef::Exceptions::Win32APIError + expect { group_resource.run_action(tested_action) }.to raise_error Chef::Exceptions::Win32APIError end end describe "when removing members" do it "raises an error for a non well-formed domain name" do group_resource.excluded_members [invalid_domain_user_name] - lambda { group_resource.run_action(tested_action) }.should raise_error Chef::Exceptions::Win32APIError + expect { group_resource.run_action(tested_action) }.to raise_error Chef::Exceptions::Win32APIError end it "raises an error for a nonexistent domain" do group_resource.excluded_members [nonexistent_domain_user_name] - lambda { group_resource.run_action(tested_action) }.should raise_error Chef::Exceptions::Win32APIError + expect { group_resource.run_action(tested_action) }.to raise_error Chef::Exceptions::Win32APIError end end end @@ -264,7 +264,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte } it "append should be false by default" do - group_resource.append.should == false + expect(group_resource.append).to eq(false) end describe "group create action" do @@ -297,7 +297,7 @@ theoldmanwalkingdownthestreetalwayshadagoodsmileonhisfacetheoldmanwalking\ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" } it "should not create a group" do - lambda { group_resource.run_action(:create) }.should raise_error + expect { group_resource.run_action(:create) }.to raise_error group_should_not_exist(group_name) end end @@ -308,7 +308,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" } invalid_resource = group_resource.dup invalid_resource.members(["Jack"]) invalid_resource.excluded_members(["Jack"]) - lambda { invalid_resource.run_action(:create)}.should raise_error(Chef::Exceptions::ConflictingMembersInGroup) + expect { invalid_resource.run_action(:create)}.to raise_error(Chef::Exceptions::ConflictingMembersInGroup) end end end @@ -342,7 +342,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" } describe "when there is no group" do it "should raise an error" do - lambda { group_resource.run_action(:modify) }.should raise_error + expect { group_resource.run_action(:modify) }.to raise_error end end @@ -370,11 +370,11 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" } describe "when there is no group" do it "raises an error on modify" do - lambda { group_resource.run_action(:modify) }.should raise_error + expect { group_resource.run_action(:modify) }.to raise_error end it "does not raise an error on manage" do - lambda { group_resource.run_action(:manage) }.should_not raise_error + expect { group_resource.run_action(:manage) }.not_to raise_error end end @@ -399,15 +399,15 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" } let(:excluded_members) { ["Anthony"] } it ":manage should raise an error" do - lambda {group_resource.run_action(:manage) }.should raise_error + expect {group_resource.run_action(:manage) }.to raise_error end it ":modify should raise an error" do - lambda {group_resource.run_action(:modify) }.should raise_error + expect {group_resource.run_action(:modify) }.to raise_error end it ":create should raise an error" do - lambda {group_resource.run_action(:create) }.should raise_error + expect {group_resource.run_action(:create) }.to raise_error end end @@ -419,11 +419,11 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" } end it ":manage should raise an error" do - lambda {group_resource.run_action(:manage) }.should raise_error + expect {group_resource.run_action(:manage) }.to raise_error end it ":modify should raise an error" do - lambda {group_resource.run_action(:modify) }.should raise_error + expect {group_resource.run_action(:modify) }.to raise_error end end end |