From 2c14642035e2f6db0d6ade0d356e045b246c0f08 Mon Sep 17 00:00:00 2001 From: Tim Lawrence Date: Tue, 15 Mar 2016 15:46:00 +0000 Subject: [PATCH] add spec helper with creds --- .../compute/instantiate_vapp_template_params_spec.rb | 5 ++--- .../compute/instantiate_vapp_template_spec.rb | 9 ++++++++- spec/vcloud_director/spec_helper.rb | 11 +++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 spec/vcloud_director/spec_helper.rb diff --git a/spec/vcloud_director/generators/compute/instantiate_vapp_template_params_spec.rb b/spec/vcloud_director/generators/compute/instantiate_vapp_template_params_spec.rb index 4df4199b9..fd761bfc8 100644 --- a/spec/vcloud_director/generators/compute/instantiate_vapp_template_params_spec.rb +++ b/spec/vcloud_director/generators/compute/instantiate_vapp_template_params_spec.rb @@ -1,3 +1,4 @@ +require './spec/vcloud_director/spec_helper.rb' require 'minitest/autorun' require 'nokogiri' require './lib/fog/vcloud_director/generators/compute/instantiate_vapp_template_params.rb' @@ -61,9 +62,7 @@ describe Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams it "Allows New VM Parameters" do nodes = xml.xpath('//xmlns:VmGeneralParams') - nodes.length.must_equal 2 - puts nodes - + nodes.length.must_equal 2 end end \ No newline at end of file diff --git a/spec/vcloud_director/requests/compute/instantiate_vapp_template_spec.rb b/spec/vcloud_director/requests/compute/instantiate_vapp_template_spec.rb index 363ec9a8f..4926efd74 100644 --- a/spec/vcloud_director/requests/compute/instantiate_vapp_template_spec.rb +++ b/spec/vcloud_director/requests/compute/instantiate_vapp_template_spec.rb @@ -1,8 +1,13 @@ +require './spec/vcloud_director/spec_helper.rb' require 'minitest/autorun' require './lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb' describe Fog::Compute::VcloudDirector::Real do + before do + Fog.unmock! + end + let(:xml) do service = Fog::Compute::VcloudDirector.new() @@ -57,7 +62,9 @@ describe Fog::Compute::VcloudDirector::Real do end - + after do + Fog.mock! + end end \ No newline at end of file diff --git a/spec/vcloud_director/spec_helper.rb b/spec/vcloud_director/spec_helper.rb new file mode 100644 index 000000000..783ce405d --- /dev/null +++ b/spec/vcloud_director/spec_helper.rb @@ -0,0 +1,11 @@ +if ENV["FOG_MOCK"] == "true" + Fog.mock! +end + +if Fog.mock? + Fog.credentials = { + :vcloud_director_host => 'vcloud-director-host', + :vcloud_director_password => 'vcloud_director_password', + :vcloud_director_username => 'vcd_user@vcd_org_name', + }.merge(Fog.credentials) +end \ No newline at end of file