Tests for multivagrantfile being found

lib/vagrant/environment.rb

@@ -495,7 +495,7 @@ module Vagrant
         if current_path.exist?
           # We also test if current_path == path because on case insensitive
           # file systems, it will look like multiple exist.
-          if path && current_path == path
+          if path && current_path != path
             raise Errors::MultiVagrantfileFound, :directory => search_path.to_s
           end
 

test/unit/support/isolated_environment.rb

@@ -7,8 +7,13 @@ require "support/isolated_environment"
 
 module Unit
   class IsolatedEnvironment < ::IsolatedEnvironment
-    def create_vagrant_env
+    def create_vagrant_env(options=nil)
-      Vagrant::Environment.new(:cwd => @workdir, :home_path => @homedir)
+      options = {
+        :cwd => @workdir,
+        :home_path => @homedir
+      }.merge(options || {})
+
+      Vagrant::Environment.new(options)
     end
 
     def vagrantfile(contents, root=nil)
@@ -22,6 +27,7 @@ module Unit
       box_dir = boxes_dir.join(name)
       box_dir.mkpath
       vagrantfile(vagrantfile_contents, box_dir)
+      box_dir
     end
 
     def boxes_dir

test/unit/vagrant/environment_test.rb

@@ -151,6 +151,26 @@ VF
       env = environment.create_vagrant_env
       env.config.for_vm(:default).ssh.port.should == 100
     end
+
+    it "should error if the box has an ambiguous Vagrantfile" do
+      environment = isolated_environment do |env|
+        env.vagrantfile(<<-VF)
+Vagrant::Config.run do |config|
+  config.vm.box = "base"
+end
+VF
+
+        # Create two Vagrantfiles. The normal one and a Vagrantfile2
+        box_dir = env.box("base", "")
+        box_dir.join("Vagrantfile2").open("w") do |f|
+          f.write("")
+        end
+      end
+
+      env = environment.create_vagrant_env(:vagrantfile_name => ["Vagrantfile", "Vagrantfile2"])
+      expect { env.config }.
+        to raise_error(Vagrant::Errors::MultiVagrantfileFound)
+    end
   end
 
   describe "ui" do