haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use registry merging for provider configs

This commit is contained in:
Mitchell Hashimoto 2013-01-13 13:00:06 -08:00
parent 45879132a3
commit f3b340aae0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/plugin/v2/manager.rb
View File

@ -98,10 +98,10 @@ module Vagrant
# #
# @return [Hash] # @return [Hash]
def provider_configs def provider_configs
configs = {} configs = Registry.new
@registered.each do |plugin| @registered.each do |plugin|
configs.merge!(plugin.components.configs[:provider].to_hash) configs.merge!(plugin.components.configs[:provider])
end end
configs configs

2
test/unit/vagrant/plugin/v2/manager_test.rb
View File

@ -109,7 +109,7 @@ describe Vagrant::Plugin::V2::Manager do
instance.register(pA) instance.register(pA)
instance.register(pB) instance.register(pB)
instance.provider_configs.length.should == 2 instance.provider_configs.to_hash.length.should == 2
instance.provider_configs[:foo].should == "foo" instance.provider_configs[:foo].should == "foo"
instance.provider_configs[:bar].should == "bar" instance.provider_configs[:bar].should == "bar"
end end