From f52f8ecc97b4341a7879c9c4bc768c56b1da09f5 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 7 Nov 2012 20:06:55 -0800
Subject: [PATCH] Get tests passing again, use V2 config in tests.

---
 config/default.rb                     |  2 +-
 test/unit/vagrant/environment_test.rb | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/default.rb b/config/default.rb
index 8a50b7e7b..db39c9d0e 100644
--- a/config/default.rb
+++ b/config/default.rb
@@ -1,4 +1,4 @@
-Vagrant.configure("1") do |config|
+Vagrant.configure("2") do |config|
   # default config goes here
   config.vagrant.dotfile_name = ".vagrant"
   config.vagrant.host = :detect
diff --git a/test/unit/vagrant/environment_test.rb b/test/unit/vagrant/environment_test.rb
index 9a7c227af..844f12928 100644
--- a/test/unit/vagrant/environment_test.rb
+++ b/test/unit/vagrant/environment_test.rb
@@ -12,7 +12,7 @@ describe Vagrant::Environment do
     isolated_environment.tap do |e|
       e.box2("base", :virtualbox)
       e.vagrantfile <<-VF
-      Vagrant.configure("1") do |config|
+      Vagrant.configure("2") do |config|
         config.vm.box = "base"
       end
       VF
@@ -111,7 +111,7 @@ describe Vagrant::Environment do
     it "should be the VM marked as the primary" do
       environment = isolated_environment do |env|
         env.vagrantfile(<<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vm.box = "base"
   config.vm.define :foo
   config.vm.define :bar, :primary => true
@@ -128,7 +128,7 @@ VF
     it "should load global configuration" do
       environment = isolated_environment do |env|
         env.vagrantfile(<<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vagrant.dotfile_name = "foo"
 end
 VF
@@ -141,7 +141,7 @@ VF
     it "should load from a custom Vagrantfile" do
       environment = isolated_environment do |env|
         env.file("non_standard_name", <<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vagrant.dotfile_name = "custom"
 end
 VF
@@ -154,7 +154,7 @@ VF
     it "should load VM configuration" do
       environment = isolated_environment do |env|
         env.vagrantfile(<<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vagrant.dotfile_name = "foo"
 end
 VF
@@ -167,7 +167,7 @@ VF
     it "should load VM configuration with multiple VMs" do
       environment = isolated_environment do |env|
         env.vagrantfile(<<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vm.define :foo do |vm|
     vm.ssh.port = 100
   end
@@ -187,13 +187,13 @@ VF
     it "should load a V1 vagrant box" do
       environment = isolated_environment do |env|
         env.vagrantfile(<<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vm.box = "base"
 end
 VF
 
         env.box("base", <<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.ssh.port = 100
 end
 VF
@@ -206,13 +206,13 @@ VF
     it "should load box configuration" do
       environment = isolated_environment do |env|
         env.vagrantfile(<<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vm.box = "base"
 end
 VF
 
         env.box2("base", :virtualbox, :vagrantfile => <<-VF)
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.ssh.port = 100
 end
 VF