Skip to content

Commit fb524c0

Browse files
adamhjkadamhjk
committed
Merge branch 'CHEF-645' of git://github.com/danielsdeleo/chef
2 parents 71fbeed + 997b2db commit fb524c0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎features/support/env.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def cleanup
106106
end
107107

108108
Merb.start_environment(
109-
:merb_root => File.join(File.dirname(__FILE__), "..", "..", "chef-server"),
109+
:merb_root => File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "chef-server")),
110110
:testing => true,
111111
:adapter => 'runner',
112112
:environment => ENV['MERB_ENV'] || 'test',

0 commit comments

Comments
 (0)