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

kernel/v2: fix provisioner config with blocks 

Regression from 10d5416.
This commit is contained in:
Teemu Matilainen 2014-02-04 00:41:11 -03:00
parent e5f3f1ffe3
commit ca56c913aa
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kernel_v2/config/vm_provisioner.rb
View File

@ -62,7 +62,7 @@ module VagrantPlugins
current = @config_class.new
current.set_options(options) if options
current.call(@config) if block
block.call(current) if block
current = @config.merge(current) if @config
@config = current
end

8
test/unit/plugins/kernel_v2/config/vm_test.rb
View File

@ -8,22 +8,24 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
describe "#provision" do
it "stores the provisioners" do
subject.provision("shell", inline: "foo")
subject.provision("shell", inline: "bar")
subject.provision("shell", inline: "bar") { |s| s.path = "baz" }
subject.finalize!
r = subject.provisioners
expect(r.length).to eql(2)
expect(r[0].config.inline).to eql("foo")
expect(r[1].config.inline).to eql("bar")
expect(r[1].config.path).to eql("baz")
end
it "allows provisioner settings to be overriden" do
subject.provision("shell", path: "foo", inline: "foo", id: "s")
subject.provision("shell", inline: "bar", id: "s")
subject.provision("shell", path: "foo", id: "s") { |s| s.inline = "foo" }
subject.provision("shell", inline: "bar", id: "s") { |s| s.args = "bar" }
subject.finalize!
r = subject.provisioners
expect(r.length).to eql(1)
expect(r[0].config.args).to eql("bar")
expect(r[0].config.inline).to eql("bar")
expect(r[0].config.path).to eql("foo")
end