diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/unit/provider/user/dscl_spec.rb | 23 | ||||
-rw-r--r-- | spec/unit/provider/user/solaris_spec.rb | 14 |
2 files changed, 20 insertions, 17 deletions
diff --git a/spec/unit/provider/user/dscl_spec.rb b/spec/unit/provider/user/dscl_spec.rb index 712fbfc76c..0396013a0e 100644 --- a/spec/unit/provider/user/dscl_spec.rb +++ b/spec/unit/provider/user/dscl_spec.rb @@ -16,8 +16,6 @@ # limitations under the License. # -ShellCmdResult = Struct.new(:stdout, :stderr, :exitstatus) - require "spec_helper" require "ostruct" require "mixlib/shellout" @@ -26,6 +24,9 @@ describe Chef::Provider::User::Dscl do before do allow(ChefConfig).to receive(:windows?) { false } end + let(:shellcmdresult) { + Struct.new(:stdout, :stderr, :exitstatus) + } let(:node) { node = Chef::Node.new allow(node).to receive(:[]).with(:platform_version).and_return(mac_version) @@ -114,31 +115,31 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30" describe "when shelling out to dscl" do it "should run dscl with the supplied cmd /Path args" do - shell_return = ShellCmdResult.new("stdout", "err", 0) + shell_return = shellcmdresult.new("stdout", "err", 0) expect(provider).to receive(:shell_out).with("dscl . -cmd /Path args").and_return(shell_return) expect(provider.run_dscl("cmd /Path args")).to eq("stdout") end it "returns an empty string from delete commands" do - shell_return = ShellCmdResult.new("out", "err", 23) + shell_return = shellcmdresult.new("out", "err", 23) expect(provider).to receive(:shell_out).with("dscl . -delete /Path args").and_return(shell_return) expect(provider.run_dscl("delete /Path args")).to eq("") end it "should raise an exception for any other command" do - shell_return = ShellCmdResult.new("out", "err", 23) + shell_return = shellcmdresult.new("out", "err", 23) expect(provider).to receive(:shell_out).with("dscl . -cmd /Path arguments").and_return(shell_return) expect { provider.run_dscl("cmd /Path arguments") }.to raise_error(Chef::Exceptions::DsclCommandFailed) end it "raises an exception when dscl reports 'no such key'" do - shell_return = ShellCmdResult.new("No such key: ", "err", 23) + shell_return = shellcmdresult.new("No such key: ", "err", 23) expect(provider).to receive(:shell_out).with("dscl . -cmd /Path args").and_return(shell_return) expect { provider.run_dscl("cmd /Path args") }.to raise_error(Chef::Exceptions::DsclCommandFailed) end it "raises an exception when dscl reports 'eDSRecordNotFound'" do - shell_return = ShellCmdResult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", "err", -14136) + shell_return = shellcmdresult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", "err", -14136) expect(provider).to receive(:shell_out).with("dscl . -cmd /Path args").and_return(shell_return) expect { provider.run_dscl("cmd /Path args") }.to raise_error(Chef::Exceptions::DsclCommandFailed) end @@ -381,9 +382,9 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30" expect(provider).to receive(:shell_out).with("dscacheutil '-flushcache'") expect(provider).to receive(:shell_out).with("plutil -convert xml1 -o - /var/db/dslocal/nodes/Default/users/toor.plist") do if user_plist_file.nil? - ShellCmdResult.new("Can not find the file", "Sorry!!", 1) + shellcmdresult.new("Can not find the file", "Sorry!!", 1) else - ShellCmdResult.new(File.read(File.join(CHEF_SPEC_DATA, "mac_users/#{user_plist_file}.plist.xml")), "", 0) + shellcmdresult.new(File.read(File.join(CHEF_SPEC_DATA, "mac_users/#{user_plist_file}.plist.xml")), "", 0) end end @@ -790,7 +791,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30") end it "should raise an exception when the group does not exist" do - shell_return = ShellCmdResult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", "err", -14136) + shell_return = shellcmdresult.new("<dscl_cmd> DS Error: -14136 (eDSRecordNotFound)", "err", -14136) expect(provider).to receive(:shell_out).with("dscl . -read /Groups/newgroup PrimaryGroupID").and_return(shell_return) expect { provider.dscl_set_gid }.to raise_error(Chef::Exceptions::GroupIDNotFound) end @@ -848,7 +849,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30") before do expect(provider).to receive(:shell_out).with("dscacheutil '-flushcache'") expect(provider).to receive(:shell_out).with("plutil -convert xml1 -o - /var/db/dslocal/nodes/Default/users/toor.plist") do - ShellCmdResult.new(File.read(File.join(CHEF_SPEC_DATA, "mac_users/10.9.plist.xml")), "", 0) + shellcmdresult.new(File.read(File.join(CHEF_SPEC_DATA, "mac_users/10.9.plist.xml")), "", 0) end provider.load_current_resource end diff --git a/spec/unit/provider/user/solaris_spec.rb b/spec/unit/provider/user/solaris_spec.rb index 984fab5e8b..07a39a1f0c 100644 --- a/spec/unit/provider/user/solaris_spec.rb +++ b/spec/unit/provider/user/solaris_spec.rb @@ -20,13 +20,15 @@ # limitations under the License. # -ShellCmdResult = Struct.new(:stdout, :stderr, :exitstatus) - require "mixlib/shellout" require "spec_helper" describe Chef::Provider::User::Solaris do + let(:shellcmdresult) { + Struct.new(:stdout, :stderr, :exitstatus) + } + subject(:provider) do p = described_class.new(@new_resource, @run_context) p.current_resource = @current_resource @@ -96,7 +98,7 @@ describe Chef::Provider::User::Solaris do "dave:*LK*L....:::::::", ].each do |shadow| it "should return true if user is locked with #{shadow}" do - shell_return = ShellCmdResult.new(shadow + "\n", "", 0) + shell_return = shellcmdresult.new(shadow + "\n", "", 0) expect(provider).to receive(:shell_out!).with("getent", "shadow", @new_resource.username).and_return(shell_return) expect(provider.check_lock).to eql(true) end @@ -111,7 +113,7 @@ describe Chef::Provider::User::Solaris do "dave:L...:::::::", ].each do |shadow| it "should return false if user is unlocked with #{shadow}" do - shell_return = ShellCmdResult.new(shadow + "\n", "", 0) + shell_return = shellcmdresult.new(shadow + "\n", "", 0) expect(provider).to receive(:shell_out!).with("getent", "shadow", @new_resource.username).and_return(shell_return) expect(provider.check_lock).to eql(false) end @@ -120,7 +122,7 @@ describe Chef::Provider::User::Solaris do describe "when locking the user" do it "should run passwd -l with the new resources username" do - shell_return = ShellCmdResult.new("", "", 0) + shell_return = shellcmdresult.new("", "", 0) expect(provider).to receive(:shell_out!).with("passwd", "-l", @new_resource.username).and_return(shell_return) provider.lock_user end @@ -128,7 +130,7 @@ describe Chef::Provider::User::Solaris do describe "when unlocking the user" do it "should run passwd -u with the new resources username" do - shell_return = ShellCmdResult.new("", "", 0) + shell_return = shellcmdresult.new("", "", 0) expect(provider).to receive(:shell_out!).with("passwd", "-u", @new_resource.username).and_return(shell_return) provider.unlock_user end |