Share folders go into the modify pipeline

svenfuchs · Jul 8, 2011 · 0b02deb · 0b02deb
1 parent d797e48
commit 0b02deb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/vagrant/action/vm/share_folders.rb b/lib/vagrant/action/vm/share_folders.rb
@@ -33,7 +33,7 @@ def shared_folders
         end
 
         def create_metadata
-          @env["config"].vm.customize do |vm|
+          proc = lambda do |vm|
             @env.ui.info I18n.t("vagrant.actions.vm.share_folders.creating")
 
             shared_folders.each do |name, data|
@@ -43,6 +43,8 @@ def create_metadata
               vm.shared_folders << folder
             end
           end
+
+          @env["vm.modify"].call(proc)
         end
 
         def mount_shared_folders

diff --git a/test/vagrant/action/vm/share_folders_test.rb b/test/vagrant/action/vm/share_folders_test.rb
@@ -10,6 +10,7 @@ class ShareFoldersVMActionTest < Test::Unit::TestCase
     @vm.stubs(:ssh).returns(mock("ssh"))
     @vm.stubs(:system).returns(mock("system"))
     @env["vm"] = @vm
+    @env["vm.modify"] = mock("proc")
 
     @internal_vm = mock("internal")
     @vm.stubs(:vm).returns(@internal_vm)
@@ -106,7 +107,11 @@ def stub_shared_folders(contents)
 
       @internal_vm.stubs(:shared_folders).returns(shared_folders)
 
-      @env["config"].vm.expects(:customize).yields(@internal_vm)
+      @env["vm.modify"].expects(:call).with() do |proc|
+        proc.call(@internal_vm)
+        true
+      end
+
       @instance.create_metadata
     end
   end