Permalink
Browse files

Merge branch 'CHEF-1191'

  • Loading branch information...
2 parents 13c2cea + 119e0b3 commit 66c337a6250a1c9dd73f965c88aab43c0c7ab732 @danielsdeleo danielsdeleo committed May 7, 2010
Showing with 7 additions and 6 deletions.
  1. +0 −5 chef/spec/unit/application_spec.rb
  2. +7 −1 chef/spec/unit/daemon_spec.rb
@@ -26,11 +26,6 @@
it "should create an instance of Chef::Application" do
@app.should be_kind_of(Chef::Application)
end
-
- it "should chdir to root" do
- Dir.should_receive(:chdir).with("/").and_return(0)
- Chef::Application.new
- end
end
@@ -155,8 +155,14 @@
before do
Chef::Application.stub!(:fatal!).and_return(true)
Chef::Config.stub!(:[]).with(:user).and_return("aj")
+ Dir.stub!(:chdir)
end
-
+
+ it "should chdir to root" do
+ Dir.should_receive(:chdir).with("/").and_return(0)
+ Chef::Daemon.change_privilege
+ end
+
describe "when the user and group options are supplied" do
before do

0 comments on commit 66c337a

Please sign in to comment.