more passing tests on Windows
This commit is contained in:
parent
684410836c
commit
e1f8b0d9c0
|
@ -205,7 +205,10 @@ describe VagrantPlugins::Chef::Config::BaseRunner do
|
|||
|
||||
describe "#validate_base" do
|
||||
context "when #custom_config_path does not exist" do
|
||||
let(:path) { "/path/to/file" }
|
||||
let(:path) do
|
||||
next "/path/to/file" if !Vagrant::Util::Platform.windows?
|
||||
"C:/path/to/file"
|
||||
end
|
||||
|
||||
before do
|
||||
allow(File).to receive(:file?)
|
||||
|
|
|
@ -41,8 +41,7 @@ describe VagrantPlugins::FTPPush::Push do
|
|||
end
|
||||
@server.start
|
||||
|
||||
@dir = Dir.mktmpdir
|
||||
|
||||
@dir = temporary_dir
|
||||
FileUtils.touch("#{@dir}/.hidden.rb")
|
||||
FileUtils.touch("#{@dir}/application.rb")
|
||||
FileUtils.touch("#{@dir}/config.rb")
|
||||
|
@ -52,7 +51,6 @@ describe VagrantPlugins::FTPPush::Push do
|
|||
end
|
||||
|
||||
after(:all) do
|
||||
FileUtils.rm_rf(@dir)
|
||||
@server.stop
|
||||
end
|
||||
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
require_relative "../../../base"
|
||||
|
||||
require "vagrant/util/platform"
|
||||
|
||||
require Vagrant.source_root.join("plugins/pushes/heroku/push")
|
||||
|
||||
describe VagrantPlugins::HerokuPush::Push do
|
||||
|
@ -24,10 +26,13 @@ describe VagrantPlugins::HerokuPush::Push do
|
|||
|
||||
describe "#push" do
|
||||
let(:branch) { "master" }
|
||||
|
||||
let(:root_path) { "/handy/dandy" }
|
||||
let(:dir) { "#{root_path}/#{config.dir}" }
|
||||
|
||||
let(:root_path) do
|
||||
next "/handy/dandy" if !Vagrant::Util::Platform.windows?
|
||||
"C:/handy/dandy"
|
||||
end
|
||||
|
||||
before do
|
||||
allow(subject).to receive(:git_branch)
|
||||
.and_return(branch)
|
||||
|
|
|
@ -3,7 +3,7 @@ require File.expand_path("../../base", __FILE__)
|
|||
require "pathname"
|
||||
require 'tempfile'
|
||||
|
||||
describe Vagrant::BoxCollection do
|
||||
describe Vagrant::BoxCollection, :skip_windows do
|
||||
include_context "unit"
|
||||
|
||||
let(:box_class) { Vagrant::Box }
|
||||
|
|
|
@ -6,7 +6,7 @@ require "tempfile"
|
|||
|
||||
require "vagrant/box_metadata"
|
||||
|
||||
describe Vagrant::Box do
|
||||
describe Vagrant::Box, :skip_windows do
|
||||
include_context "unit"
|
||||
|
||||
let(:environment) { isolated_environment }
|
||||
|
|
Loading…
Reference in New Issue