From beef8992ba2be6a50327247a8e2d100728931cf1 Mon Sep 17 00:00:00 2001 From: Jay Mundrawala Date: Mon, 29 Sep 2014 19:54:32 -0700 Subject: Make knife bootstrap unit test pass on windows --- spec/unit/knife/bootstrap_spec.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb index d5c668753e..70cdd20f35 100644 --- a/spec/unit/knife/bootstrap_spec.rb +++ b/spec/unit/knife/bootstrap_spec.rb @@ -22,6 +22,9 @@ Chef::Knife::Bootstrap.load_deps require 'net/ssh' describe Chef::Knife::Bootstrap do + before do + Chef::Platform.stub(:windows?) { false } + end let(:knife) do Chef::Log.logger = Logger.new(StringIO.new) Chef::Config[:knife][:bootstrap_template] = bootstrap_template unless bootstrap_template.nil? @@ -310,7 +313,7 @@ describe Chef::Knife::Bootstrap do end describe "when transferring trusted certificates" do - let(:trusted_certs_dir) { File.join(CHEF_SPEC_DATA, 'trusted_certs') } + let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(File.dirname(__FILE__), '../../data/trusted_certs')) } let(:rendered_template) do knife.merge_configs -- cgit v1.2.1