vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/test/unit/plugins/commands/box/command/update_test.rb

@@ -27,7 +27,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
   subject { described_class.new(argv, iso_env) }
 
   before do
-    iso_env.stub(action_runner: action_runner)
+    allow(iso_env).to receive(:action_runner).and_return(action_runner)
     machine.config.vm.box = "foo"
   end
 
@@ -64,7 +64,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
 
         subject.execute
 
-        expect(called).to be_false
+        expect(called).to be(false)
       end
 
       it "does update if there is an update" do
@@ -94,6 +94,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
         allow(action_runner).to receive(:run) do |action, opts|
           if opts[:box_provider]
             action_called = true
+            expect(opts[:box_force]).to eq(nil)
             expect(opts[:box_url]).to eq(metadata_url.to_s)
             expect(opts[:box_provider]).to eq("virtualbox")
             expect(opts[:box_version]).to eq("1.1")
@@ -108,7 +109,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
 
         subject.execute
 
-        expect(action_called).to be_true
+        expect(action_called).to be(true)
       end
 
       it "raises an error if there are multiple providers" do
@@ -162,7 +163,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
 
           subject.execute
 
-          expect(action_called).to be_true
+          expect(action_called).to be(true)
         end
 
         it "raises an error if that provider doesn't exist" do
@@ -206,14 +207,14 @@ describe VagrantPlugins::CommandBox::Command::Update do
               expect(opts[:box_download_ca_cert]).to eq("foo")
               expect(opts[:box_download_ca_path]).to eq("bar")
               expect(opts[:box_client_cert]).to eq("baz")
-              expect(opts[:box_download_insecure]).to be_true
+              expect(opts[:box_download_insecure]).to be(true)
             end
 
             opts
           end
 
           subject.execute
-          expect(action_called).to be_true
+          expect(action_called).to be(true)
         end
       end
 
@@ -238,7 +239,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
         box_dir = test_iso_env.box3("foo", "1.0", :virtualbox)
         box = Vagrant::Box.new(
           "foo", :virtualbox, "1.0", box_dir, metadata_url: "foo")
-        box.stub(has_update?: nil)
+        allow(box).to receive(:has_update?).and_return(nil)
         box
       end
 
@@ -249,7 +250,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
       end
 
       it "doesn't update boxes if they're up-to-date" do
-        machine.stub(box: box)
+        allow(machine).to receive(:box).and_return(box)
         expect(box).to receive(:has_update?).
           with(machine.config.vm.box_version,
                {download_options:
@@ -285,7 +286,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
           RAW
         }
 
-        before { machine.stub(box: box) }
+        before { allow(machine).to receive(:box).and_return(box) }
 
         it "updates boxes" do
           expect(box).to receive(:has_update?).
@@ -295,7 +296,7 @@ describe VagrantPlugins::CommandBox::Command::Update do
                     insecure: false}}).
             and_return([md, md.version("1.1"), md.version("1.1").provider("virtualbox")])
 
-          expect(action_runner).to receive(:run).with { |action, opts|
+          expect(action_runner).to receive(:run).with(any_args) { |action, opts|
             expect(opts[:box_url]).to eq(box.metadata_url)
             expect(opts[:box_provider]).to eq("virtualbox")
             expect(opts[:box_version]).to eq("1.1")
@@ -322,11 +323,11 @@ describe VagrantPlugins::CommandBox::Command::Update do
                       insecure: false}}).
               and_return([md, md.version("1.1"), md.version("1.1").provider("virtualbox")])
 
-            expect(action_runner).to receive(:run).with { |action, opts|
+            expect(action_runner).to receive(:run).with(any_args) { |action, opts|
               expect(opts[:box_download_ca_cert]).to eq("oof")
               expect(opts[:box_download_ca_path]).to eq("rab")
               expect(opts[:box_client_cert]).to eq("zab")
-              expect(opts[:box_download_insecure]).to be_false
+              expect(opts[:box_download_insecure]).to be(false)
               true
             }
 
@@ -345,11 +346,32 @@ describe VagrantPlugins::CommandBox::Command::Update do
                 and_return([md, md.version("1.1"),
                             md.version("1.1").provider("virtualbox")])
 
-              expect(action_runner).to receive(:run).with { |action, opts|
+              expect(action_runner).to receive(:run).with(any_args) { |action, opts|
                 expect(opts[:box_download_ca_cert]).to eq("foo")
                 expect(opts[:box_download_ca_path]).to eq("bar")
                 expect(opts[:box_client_cert]).to eq("baz")
-                expect(opts[:box_download_insecure]).to be_true
+                expect(opts[:box_download_insecure]).to be(true)
+                true
+              }
+
+              subject.execute
+            end
+          end
+
+          context "force flag is specified on the command line" do
+            let(:argv) { ["--force"].concat(download_options) }
+
+            it "passes force through to action_box_add as true" do
+              expect(box).to receive(:has_update?).
+                with(machine.config.vm.box_version,
+                     {download_options:
+                       {ca_cert: "foo", ca_path: "bar", client_cert: "baz",
+                        insecure: true}}).
+                and_return([md, md.version("1.1"),
+                            md.version("1.1").provider("virtualbox")])
+
+              expect(action_runner).to receive(:run).with(any_args) { |action, opts|
+                expect(opts[:box_force]).to be(true)
                 true
               }
 

data/test/unit/plugins/commands/init/command_test.rb

@@ -16,7 +16,7 @@ describe VagrantPlugins::CommandInit::Command do
   let(:vagrantfile_path) { File.join(env.cwd, "Vagrantfile") }
 
   before do
-    Vagrant.plugin("2").manager.stub(commands: {})
+    allow(Vagrant.plugin("2").manager).to receive(:commands).and_return({})
   end
 
   after do

data/test/unit/plugins/commands/list-commands/command_test.rb

@@ -19,7 +19,7 @@ describe VagrantPlugins::CommandListCommands::Command do
   subject { described_class.new(argv, iso_env) }
 
   before do
-    Vagrant.plugin("2").manager.stub(commands: commands)
+    allow(Vagrant.plugin("2").manager).to receive(:commands).and_return(commands)
   end
 
   describe "execute" do
@@ -28,7 +28,7 @@ describe VagrantPlugins::CommandListCommands::Command do
       commands[:bar] = [command_lambda("bar", 0), { primary: true }]
       commands[:baz] = [command_lambda("baz", 0), { primary: false }]
 
-      expect(iso_env.ui).to receive(:info).with { |message, opts|
+      expect(iso_env.ui).to receive(:info).with(any_args) { |message, opts|
         expect(message).to include("foo")
         expect(message).to include("bar")
         expect(message).to include("baz")

data/test/unit/plugins/commands/login/client_test.rb

@@ -61,6 +61,9 @@ describe VagrantPlugins::LoginCommand::Client do
           "login" => "foo",
           "password" => "bar",
         },
+        "token" => {
+          "description" => "Token description"
+        }
       }
 
       response = {
@@ -76,7 +79,8 @@ describe VagrantPlugins::LoginCommand::Client do
         with(body: JSON.dump(request), headers: headers).
         to_return(status: 200, body: JSON.dump(response))
 
-      expect(subject.login("foo", "bar")).to eq("baz")
+      expect(subject.login("foo", "bar", description: "Token description"))
+        .to eq("baz")
     end
 
     it "returns nil on bad login" do

data/test/unit/plugins/commands/package/command_test.rb

@@ -25,7 +25,7 @@ describe VagrantPlugins::CommandPackage::Command do
   let(:action_runner) { double("action_runner") }
 
   before do
-    iso_env.stub(action_runner: action_runner)
+    allow(iso_env).to receive(:action_runner).and_return(action_runner)
   end
 
   describe "#execute" do

data/test/unit/plugins/commands/plugin/action/expunge_plugins_test.rb

@@ -27,7 +27,7 @@ describe VagrantPlugins::CommandPlugin::Action::ExpungePlugins do
   subject { described_class.new(app, env) }
 
   before do
-    Vagrant::Plugin::Manager.stub(instance: manager)
+    allow(Vagrant::Plugin::Manager).to receive(:instance).and_return(manager)
   end
 
   describe "#call" do

data/test/unit/plugins/commands/plugin/action/install_gem_test.rb

@@ -11,7 +11,7 @@ describe VagrantPlugins::CommandPlugin::Action::InstallGem do
   subject { described_class.new(app, env) }
 
   before do
-    Vagrant::Plugin::Manager.stub(instance: manager)
+    allow(Vagrant::Plugin::Manager).to receive(:instance).and_return(manager)
   end
 
   describe "#call" do
@@ -75,7 +75,7 @@ describe VagrantPlugins::CommandPlugin::Action::InstallGem do
       before do
         spec = Gem::Specification.new
         spec.name = "foo"
-        manager.stub(install_plugin: spec)
+        allow(manager).to receive(:install_plugin).and_return(spec)
 
         env[:plugin_name] = "foo"
         subject.call(env)
@@ -84,7 +84,7 @@ describe VagrantPlugins::CommandPlugin::Action::InstallGem do
       end
 
       it "should uninstall the plugin" do
-        expect(action_runner).to receive(:run).with { |action, newenv|
+        expect(action_runner).to receive(:run).with(any_args) { |action, newenv|
           expect(newenv[:plugin_name]).to eql("foo")
         }
 

data/test/unit/plugins/commands/plugin/action/plugin_exists_check_test.rb

@@ -9,11 +9,11 @@ describe VagrantPlugins::CommandPlugin::Action::PluginExistsCheck do
   subject { described_class.new(app, env) }
 
   before do
-    Vagrant::Plugin::Manager.stub(instance: manager)
+    allow(Vagrant::Plugin::Manager).to receive(:instance).and_return(manager)
   end
 
   it "should raise an exception if the plugin doesn't exist" do
-    manager.stub(installed_plugins: { "foo" => {} })
+    allow(manager).to receive(:installed_plugins).and_return({ "foo" => {} })
     expect(app).not_to receive(:call)
 
     env[:plugin_name] = "bar"
@@ -22,7 +22,7 @@ describe VagrantPlugins::CommandPlugin::Action::PluginExistsCheck do
   end
 
   it "should call the app if the plugin is installed" do
-    manager.stub(installed_plugins: { "bar" => {} })
+    allow(manager).to receive(:installed_plugins).and_return({ "bar" => {} })
     expect(app).to receive(:call).once.with(env)
 
     env[:plugin_name] = "bar"

data/test/unit/plugins/commands/plugin/action/uninstall_plugin_test.rb

@@ -11,7 +11,7 @@ describe VagrantPlugins::CommandPlugin::Action::UninstallPlugin do
   subject { described_class.new(app, env) }
 
   before do
-    Vagrant::Plugin::Manager.stub(instance: manager)
+    allow(Vagrant::Plugin::Manager).to receive(:instance).and_return(manager)
   end
 
   it "uninstalls the specified plugin" do

data/test/unit/plugins/commands/plugin/action/update_gems_test.rb

@@ -11,8 +11,8 @@ describe VagrantPlugins::CommandPlugin::Action::UpdateGems do
   subject { described_class.new(app, env) }
 
   before do
-    Vagrant::Plugin::Manager.stub(instance: manager)
-    manager.stub(installed_specs: [])
+    allow(Vagrant::Plugin::Manager).to receive(:instance).and_return(manager)
+    allow(manager).to receive(:installed_specs).and_return([])
   end
 
   describe "#call" do

data/test/unit/plugins/commands/port/command_test.rb

@@ -53,7 +53,7 @@ describe VagrantPlugins::CommandPort::Command do
 
     it "ensures the vm is running" do
       allow(state).to receive(:id).and_return(:stopped)
-      expect(env.ui).to receive(:error).with { |message, _|
+      expect(env.ui).to receive(:error).with(any_args) { |message, _|
         expect(message).to include("does not support listing forwarded ports")
       }
 
@@ -62,7 +62,7 @@ describe VagrantPlugins::CommandPort::Command do
 
     it "shows a friendly error when the capability is not supported" do
       allow(machine.provider).to receive(:capability?).and_return(false)
-      expect(env.ui).to receive(:error).with { |message, _|
+      expect(env.ui).to receive(:error).with(any_args) { |message, _|
         expect(message).to include("does not support listing forwarded ports")
       }
 
@@ -74,7 +74,7 @@ describe VagrantPlugins::CommandPort::Command do
       allow(machine.provider).to receive(:capability).with(:forwarded_ports)
         .and_return([])
 
-      expect(env.ui).to receive(:info).with { |message, _|
+      expect(env.ui).to receive(:info).with(any_args) { |message, _|
         expect(message).to include("there are no forwarded ports")
       }
 

data/test/unit/plugins/commands/push/command_test.rb

@@ -22,7 +22,7 @@ describe VagrantPlugins::CommandPush::Command do
   subject { described_class.new(argv, env) }
 
   before do
-    Vagrant.plugin("2").manager.stub(pushes: pushes)
+    allow(Vagrant.plugin("2").manager).to receive(:pushes).and_return(pushes)
   end
 
   describe "#execute" do

data/test/unit/plugins/commands/snapshot/command/list_test.rb

@@ -52,9 +52,8 @@ describe VagrantPlugins::CommandSnapshot::Command::List do
       it "prints a message if the vm does not exist" do
         machine.id = nil
 
-        expect(iso_env.ui).to receive(:info).with { |message, _|
-          expect(message).to include("VM not created")
-        }
+        expect(iso_env.ui).to receive(:info).with("==> default: VM not created. Moving on...", anything)
+          .and_return({})
         expect(machine).to_not receive(:action)
         expect(subject.execute).to eq(0)
       end

data/test/unit/plugins/commands/ssh_config/command_test.rb

@@ -32,7 +32,7 @@ describe VagrantPlugins::CommandSSHConfig::Command do
   subject { described_class.new(argv, iso_env) }
 
   before do
-    machine.stub(ssh_info: ssh_info)
+    allow(machine).to receive(:ssh_info).and_return(ssh_info)
     allow(subject).to receive(:with_target_vms) { |&block| block.call machine }
   end
 

data/test/unit/plugins/commands/up/command_test.rb

@@ -5,6 +5,7 @@ require Vagrant.source_root.join("plugins/commands/up/command")
 describe VagrantPlugins::CommandUp::Command do
   include_context "unit"
 
+  let(:entry_klass) { Vagrant::MachineIndex::Entry }
   let(:argv)     { [] }
   let(:vagrantfile_content){ "" }
   let(:iso_env) do
@@ -17,8 +18,15 @@ describe VagrantPlugins::CommandUp::Command do
 
   let(:action_runner) { double("action_runner") }
 
+  def new_entry(name)
+    entry_klass.new.tap do |e|
+      e.name = name
+      e.vagrantfile_path = "/bar"
+    end
+  end
+
   before do
-    iso_env.stub(action_runner: action_runner)
+    allow(iso_env).to receive(:action_runner).and_return(action_runner)
   end
 
   context "with no argument" do
@@ -47,7 +55,7 @@ describe VagrantPlugins::CommandUp::Command do
       end
 
       it "should attempt to use dummy provider" do
-        expect{ subject.execute }.to raise_error
+        expect{ subject.execute }.to raise_error(Vagrant::Errors::ProviderNotFound)
       end
 
       context "with --provider set" do
@@ -62,4 +70,63 @@ describe VagrantPlugins::CommandUp::Command do
       end
     end
   end
+
+  context "with a global machine" do
+    let(:argv){ ["1234"] }
+
+    it "brings up a vm with an id" do
+
+      global_env = isolated_environment
+      global_env.vagrantfile("Vagrant.configure(2){|config| config.vm.box = 'dummy'}")
+      global_venv = global_env.create_vagrant_env
+      global_machine = global_venv.machine(global_venv.machine_names[0], :dummy)
+      global_machine.id = "1234"
+      global = new_entry(global_machine.name)
+      global.provider = "dummy"
+      global.vagrantfile_path = global_env.workdir
+      locked = iso_env.machine_index.set(global)
+      iso_env.machine_index.release(locked)
+
+      allow(subject).to receive(:with_target_vms) { |&block| block.call global_machine }
+
+
+      batch = double("environment_batch")
+      expect(iso_env).to receive(:batch).and_yield(batch)
+      expect(batch).to receive(:action).with(global_machine, :up, anything) do |machine,action,args|
+        expect(machine).to be_kind_of(Vagrant::Machine)
+        expect(action).to eq(:up)
+      end
+      subject.execute
+    end
+  end
+
+  context "with an argument" do
+    let(:vagrantfile_content) do
+        <<-VF
+        Vagrant.configure("2") do |config|
+          config.vm.define "app"
+          config.vm.define "db"
+        end
+        VF
+    end
+    let(:argv){ ["app"] }
+    let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
+
+    it "brings up a vm" do
+      batch = double("environment_batch")
+      expect(iso_env).to receive(:batch).and_yield(batch)
+      expect(batch).to receive(:action).with(machine, :up, anything) do |machine,action,args|
+        expect(machine).to be_kind_of(Vagrant::Machine)
+        expect(action).to eq(:up)
+      end
+      subject.execute
+    end
+
+    context "with an invalid argument" do
+      let(:argv){ ["notweb"] }
+      it "brings up a vm" do
+        expect { subject.execute }.to raise_error(Vagrant::Errors::MachineNotFound)
+      end
+    end
+  end
 end

data/test/unit/plugins/commands/validate/command_test.rb

@@ -30,7 +30,7 @@ describe VagrantPlugins::CommandValidate::Command do
         end
       EOH
 
-      expect(env.ui).to receive(:info).with { |message, _|
+      expect(env.ui).to receive(:info).with(any_args) { |message, _|
         expect(message).to include("Vagrantfile validated successfully.")
       }
 
@@ -48,5 +48,51 @@ describe VagrantPlugins::CommandValidate::Command do
         expect(err.message).to include("The following settings shouldn't exist: bix")
       }
     end
+
+    it "validates correct Vagrantfile of all vms" do
+      iso_env.vagrantfile <<-EOH
+        Vagrant.configure("2") do |config|
+          config.vm.box = "hashicorp/precise64"
+
+          config.vm.define "test" do |vm|
+            vm.vm.provider :virtualbox
+          end
+
+          config.vm.define "machine" do |vm|
+            vm.vm.provider :virtualbox
+          end
+        end
+      EOH
+
+      expect(env.ui).to receive(:info).with(any_args) { |message, _|
+        expect(message).to include("Vagrantfile validated successfully.")
+      }
+
+      expect(subject.execute).to eq(0)
+    end
+
+    it "validates the configuration of all vms" do
+      iso_env.vagrantfile <<-EOH
+        Vagrant.configure("2") do |config|
+          config.vm.box = "hashicorp/precise64"
+
+          config.vm.define "test" do |vm|
+            vm.vm.provider :virtualbox
+          end
+
+          config.vm.define "machine" do |vm|
+            vm.vm.not_provider :virtualbox
+          end
+        end
+      EOH
+
+      expect { subject.execute }.to raise_error(Vagrant::Errors::ConfigInvalid) { |err|
+        expect(err.message).to include("The following settings shouldn't exist: not_provider")
+      }
+    end
+
+    it "throws an exception if there's no Vagrantfile" do
+      expect { subject.execute }.to raise_error(Vagrant::Errors::NoEnvironmentError)
+    end
   end
 end