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

Pass environment to box.find

This commit is contained in:
Mitchell Hashimoto 2010-03-20 00:50:59 -07:00
parent e8e2c136d3
commit ea25f49c63
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/environment.rb
View File

@ -166,7 +166,7 @@ module Vagrant
def load_box! def load_box!
return unless root_path return unless root_path
@box = Box.find(config.vm.box) if config.vm.box @box = Box.find(self, config.vm.box) if config.vm.box
@box.env = self if @box @box.env = self if @box
end end

4
test/vagrant/environment_test.rb
View File

@ -341,14 +341,14 @@ class EnvironmentTest < Test::Unit::TestCase
end end
should "set the box to what is found by the Box class" do should "set the box to what is found by the Box class" do
Vagrant::Box.expects(:find).with(@env.config.vm.box).once.returns(@box) Vagrant::Box.expects(:find).with(@env, @env.config.vm.box).once.returns(@box)
@env.load_box! @env.load_box!
assert @box.equal?(@env.box) assert @box.equal?(@env.box)
end end
should "set the environment of the box" do should "set the environment of the box" do
@box.expects(:env=).with(@env).once @box.expects(:env=).with(@env).once
Vagrant::Box.expects(:find).with(@env.config.vm.box).once.returns(@box) Vagrant::Box.expects(:find).with(@env, @env.config.vm.box).once.returns(@box)
@env.load_box! @env.load_box!
end end
end end