From c09dcf3669e3139b518fb6d1c340e9828cabcee0 Mon Sep 17 00:00:00 2001 From: John Dewey Date: Tue, 20 Nov 2012 16:45:58 -0800 Subject: [PATCH] No longer stub out uri_from_hash Since we pull in the cookbooks with librarian, let chef act as it would. Plus `::Openstack::uri_from_hash` isn't a valid method call. --- libraries/default.rb | 2 +- spec/default_spec.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/default.rb b/libraries/default.rb index 6cec2dd9..397cc1c9 100644 --- a/libraries/default.rb +++ b/libraries/default.rb @@ -35,7 +35,7 @@ module Openstack if ep && ep.has_key?("uri") ep["uri"] elsif ep - ::Openstack::uri_from_hash(ep).to_s + uri_from_hash(ep).to_s end end diff --git a/spec/default_spec.rb b/spec/default_spec.rb index 3a5ac37d..b2419b37 100644 --- a/spec/default_spec.rb +++ b/spec/default_spec.rb @@ -73,7 +73,6 @@ describe ::Openstack do } } } - ::Openstack.stub(:uri_from_hash).and_return "http://localhost" @subject.instance_variable_set :@node, uri_hash @subject.endpoint_uri("compute-api").should eq "http://localhost" end