vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/test/unit/vagrant/batch_action_test.rb

@@ -11,8 +11,8 @@ describe Vagrant::BatchAction do
 
   def new_machine(options)
     double("machine").tap do |m|
-      m.stub(provider_name: provider_name)
-      m.stub(provider_options: options)
+      allow(m).to receive(:provider_name).and_return(provider_name)
+      allow(m).to receive(:provider_options).and_return(options)
       allow(m).to receive(:action) do |action, opts|
         lock.synchronize do
           called_actions << [m, action, opts]

data/test/unit/vagrant/box_collection_test.rb

@@ -223,7 +223,7 @@ describe Vagrant::BoxCollection, :skip_windows do
       environment.box3("foo", "0", :virtualbox,
         metadata_url: "foourl")
 
-      expect(hook).to receive(:call).with { |name, env|
+      expect(hook).to receive(:call).with(any_args) { |name, env|
         expect(name).to eq(:authenticate_box_url)
         expect(env[:box_urls]).to eq(["foourl"])
         true

data/test/unit/vagrant/box_test.rb

@@ -110,7 +110,7 @@ describe Vagrant::Box, :skip_windows do
       }
       RAW
 
-      subject.stub(load_metadata: metadata)
+      allow(subject).to receive(:load_metadata).and_return(metadata)
 
       expect(subject.has_update?).to be_nil
     end
@@ -136,7 +136,7 @@ describe Vagrant::Box, :skip_windows do
       }
       RAW
 
-      subject.stub(load_metadata: metadata)
+      allow(subject).to receive(:load_metadata).and_return(metadata)
 
       result = subject.has_update?
       expect(result).to_not be_nil
@@ -180,7 +180,7 @@ describe Vagrant::Box, :skip_windows do
       }
       RAW
 
-      subject.stub(load_metadata: metadata)
+      allow(subject).to receive(:load_metadata).and_return(metadata)
 
       result = subject.has_update?(">= 1.1, < 1.4")
       expect(result).to_not be_nil
@@ -256,8 +256,8 @@ describe Vagrant::Box, :skip_windows do
 
     it "raises an error if the download failed" do
       dl = double("downloader")
-      Vagrant::Util::Downloader.stub(new: dl)
-      dl.should_receive(:download!).and_raise(
+      allow(Vagrant::Util::Downloader).to receive(:new).and_return(dl)
+      expect(dl).to receive(:download!).and_raise(
         Vagrant::Errors::DownloaderError.new(message: "foo"))
 
       expect { subject.load_metadata }.
@@ -308,7 +308,7 @@ describe Vagrant::Box, :skip_windows do
       end
 
       # Repackage our box to some temporary directory
-      expect(subject.repackage(box_output_path)).to be_true
+      expect(subject.repackage(box_output_path)).to be(true)
 
       # Let's now add this box again under a different name, and then
       # verify that we get the proper result back.

data/test/unit/vagrant/capability_host_test.rb

@@ -104,15 +104,15 @@ describe Vagrant::CapabilityHost do
     end
 
     it "does not have a non-existent capability" do
-      expect(subject.capability?(:foo)).to be_false
+      expect(subject.capability?(:foo)).to be(false)
     end
 
     it "has capabilities of itself" do
-      expect(subject.capability?(:self)).to be_true
+      expect(subject.capability?(:self)).to be(true)
     end
 
     it "has capabilities of parent" do
-      expect(subject.capability?(:parent)).to be_true
+      expect(subject.capability?(:parent)).to be(true)
     end
   end
 

data/test/unit/vagrant/cli_test.rb

@@ -11,7 +11,7 @@ describe Vagrant::CLI do
   let(:env)     { iso_env.create_vagrant_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
@@ -45,10 +45,10 @@ describe Vagrant::CLI do
       commands[:bar] = [command_lambda("bar", 0), { primary: true }]
       commands[:baz] = [command_lambda("baz", 0), { primary: false }]
 
-      expect(env.ui).to receive(:info).with { |message, opts|
+      expect(env.ui).to receive(:info).with(any_args) { |message, opts|
         expect(message).to include("foo")
         expect(message).to include("bar")
-        expect(message.include?("baz")).to be_false
+        expect(message.include?("baz")).to be(false)
       }
 
       subject.help

data/test/unit/vagrant/environment_test.rb

@@ -31,8 +31,8 @@ describe Vagrant::Environment do
 
     before do
       m = Vagrant.plugin("2").manager
-      m.stub(hosts: plugin_hosts)
-      m.stub(host_capabilities: plugin_host_caps)
+      allow(m).to receive(:hosts).and_return(plugin_hosts)
+      allow(m).to receive(:host_capabilities).and_return(plugin_host_caps)
 
       # Detect the host
       env.vagrantfile <<-VF
@@ -48,8 +48,8 @@ describe Vagrant::Environment do
     it "should return whether it can install or not" do
       plugin_host_caps[:foo] = { provider_install_foo: Class }
 
-      expect(subject.can_install_provider?(:foo)).to be_true
-      expect(subject.can_install_provider?(:bar)).to be_false
+      expect(subject.can_install_provider?(:foo)).to be(true)
+      expect(subject.can_install_provider?(:bar)).to be(false)
     end
   end
 
@@ -160,7 +160,8 @@ describe Vagrant::Environment do
 
       it "moves the boxes into the new directory structure" do
         # Kind of hacky but avoids two instantiations of BoxCollection
-        Vagrant::Environment.any_instance.stub(boxes: double("boxes"))
+        allow(Vagrant::Environment).to receive(:boxes)
+          .and_return(double("boxes"))
 
         collection = double("collection")
         expect(Vagrant::BoxCollection).to receive(:new).with(
@@ -177,8 +178,8 @@ describe Vagrant::Environment do
 
     before do
       m = Vagrant.plugin("2").manager
-      m.stub(hosts: plugin_hosts)
-      m.stub(host_capabilities: plugin_host_caps)
+      allow(m).to receive(:hosts).and_return(plugin_hosts)
+      allow(m).to receive(:host_capabilities).and_return(plugin_host_caps)
     end
 
     it "should default to some host even if there are none" do
@@ -202,7 +203,7 @@ describe Vagrant::Environment do
       plugin_host_caps[:foo] = { bar: Class }
 
       result = subject.host
-      expect(result.capability?(:bar)).to be_true
+      expect(result.capability?(:bar)).to be(true)
     end
 
     it "should attempt to detect a host if host is :detect" do
@@ -216,7 +217,7 @@ describe Vagrant::Environment do
       plugin_host_caps[:foo] = { bar: Class }
 
       result = subject.host
-      expect(result.capability?(:bar)).to be_true
+      expect(result.capability?(:bar)).to be(true)
     end
 
     it "should use an exact host if specified" do
@@ -231,7 +232,7 @@ describe Vagrant::Environment do
       plugin_host_caps[:foo] = { bar: Class }
 
       result = subject.host
-      expect(result.capability?(:bar)).to be_true
+      expect(result.capability?(:bar)).to be(true)
     end
 
     it "should raise an error if an exact match was specified but not found" do
@@ -270,7 +271,7 @@ describe Vagrant::Environment do
         end
       end
 
-      expect(raised).to be_true
+      expect(raised).to be(true)
     end
 
     it "allows nested locks on the same environment" do
@@ -282,7 +283,7 @@ describe Vagrant::Environment do
         end
       end
 
-      expect(success).to be_true
+      expect(success).to be(true)
     end
 
     it "cleans up all lock files" do
@@ -641,8 +642,8 @@ VF
       klass = double("machine_index")
       stub_const("Vagrant::MachineIndex", klass)
 
-      klass.should_receive(:new).with do |path|
-        expect(path.to_s.start_with?(subject.home_path.to_s)).to be_true
+      expect(klass).to receive(:new).with(any_args) do |path|
+        expect(path.to_s.start_with?(subject.home_path.to_s)).to be(true)
         true
       end
 
@@ -759,7 +760,7 @@ VF
 
     before do
       m = Vagrant.plugin("2").manager
-      m.stub(providers: plugin_providers)
+      allow(m).to receive(:providers).and_return(plugin_providers)
     end
 
     it "is the highest matching usable provider" do
@@ -985,7 +986,7 @@ VF
         Dir.chdir(temp_dir) do
           instance = described_class.new(local_data_path: "foo")
           expect(instance.local_data_path).to eq(instance.cwd.join("foo"))
-          expect(File.exist?(instance.local_data_path)).to be_false
+          expect(File.exist?(instance.local_data_path)).to be(false)
         end
       end
     end
@@ -1249,7 +1250,7 @@ VF
 
       env = environment.create_vagrant_env
       env.push("foo")
-      expect(push_class.pushed?).to be_true
+      expect(push_class.pushed?).to be(true)
     end
   end
 
@@ -1257,7 +1258,7 @@ VF
     it "should call the action runner with the proper hook" do
       hook_name = :foo
 
-      expect(instance.action_runner).to receive(:run).with { |callable, env|
+      expect(instance.action_runner).to receive(:run).with(any_args) { |callable, env|
         expect(env[:action_name]).to eq(hook_name)
       }
 
@@ -1279,7 +1280,7 @@ VF
     end
 
     it "should allow passing in custom data" do
-      expect(instance.action_runner).to receive(:run).with { |callable, env|
+      expect(instance.action_runner).to receive(:run).with(any_args) { |callable, env|
         expect(env[:foo]).to eq(:bar)
       }
 
@@ -1287,7 +1288,7 @@ VF
     end
 
     it "should allow passing a custom callable" do
-      expect(instance.action_runner).to receive(:run).with { |callable, env|
+      expect(instance.action_runner).to receive(:run).with(any_args) { |callable, env|
         expect(callable).to eq(:what)
       }
 

data/test/unit/vagrant/guest_test.rb

@@ -9,10 +9,10 @@ describe Vagrant::Guest do
   let(:guests)  { {} }
   let(:machine) do
     double("machine").tap do |m|
-      m.stub(inspect: "machine")
-      m.stub(config: double("config"))
-      m.config.stub(vm: double("vm_config"))
-      m.config.vm.stub(guest: nil)
+      allow(m).to receive(:inspect).and_return("machine")
+      allow(m).to receive(:config).and_return(double("config"))
+      allow(m.config).to receive(:vm).and_return(double("vm_config"))
+      allow(m.config.vm).to receive(:guest).and_return(nil)
     end
   end
 
@@ -47,7 +47,7 @@ describe Vagrant::Guest do
 
   describe "#detect!" do
     it "auto-detects if no explicit guest name given" do
-      machine.config.vm.stub(guest: nil)
+      allow(machine.config.vm).to receive(:guest).and_return(nil)
       expect(subject).to receive(:initialize_capabilities!).
         with(nil, guests, capabilities, machine)
 
@@ -55,7 +55,7 @@ describe Vagrant::Guest do
     end
 
     it "uses the explicit guest name if specified" do
-      machine.config.vm.stub(guest: :foo)
+      allow(machine.config.vm).to receive(:guest).and_return(:foo)
       expect(subject).to receive(:initialize_capabilities!).
         with(:foo, guests, capabilities, machine)
 
@@ -63,7 +63,7 @@ describe Vagrant::Guest do
     end
 
     it "raises a user-friendly error if specified guest doesn't exist" do
-      machine.config.vm.stub(guest: :foo)
+      allow(machine.config.vm).to receive(:guest).and_return(:foo)
 
       expect { subject.detect! }.
         to raise_error(Vagrant::Errors::GuestExplicitNotDetected)

data/test/unit/vagrant/machine_index_test.rb

@@ -136,7 +136,7 @@ describe Vagrant::MachineIndex do
     end
 
     it "should include? by prefix" do
-      expect(subject.include?("b")).to be_true
+      expect(subject.include?("b")).to be(true)
     end
 
     it "locks the entry so subsequent gets fail" do
@@ -159,7 +159,7 @@ describe Vagrant::MachineIndex do
 
   describe "#include" do
     it "should not include non-existent things" do
-      expect(subject.include?("foo")).to be_false
+      expect(subject.include?("foo")).to be(false)
     end
 
     it "should include created entries" do
@@ -168,7 +168,7 @@ describe Vagrant::MachineIndex do
       subject.release(result)
 
       subject = described_class.new(data_dir)
-      expect(subject.include?(result.id)).to be_true
+      expect(subject.include?(result.id)).to be(true)
     end
   end
 
@@ -204,7 +204,7 @@ describe Vagrant::MachineIndex do
 
     it "can delete an entry that doesn't exist" do
       e = entry_klass.new
-      expect(subject.delete(e)).to be_true
+      expect(subject.delete(e)).to be(true)
     end
 
     it "updates an existing entry" do

data/test/unit/vagrant/machine_test.rb

@@ -12,7 +12,7 @@ describe Vagrant::Machine do
   let(:provider) { new_provider_mock }
   let(:provider_cls) do
     obj = double("provider_cls")
-    obj.stub(new: provider)
+    allow(obj).to receive(:new).and_return(provider)
     obj
   end
   let(:provider_config) { Object.new }
@@ -21,9 +21,9 @@ describe Vagrant::Machine do
   let(:base)     { false }
   let(:box) do
     double("box").tap do |b|
-      b.stub(name: "foo")
-      b.stub(provider: :dummy)
-      b.stub(version: "1.0")
+      allow(b).to receive(:name).and_return("foo")
+      allow(b).to receive(:provider).and_return(:dummy)
+      allow(b).to receive(:version).and_return("1.0")
     end
   end
 
@@ -50,8 +50,8 @@ describe Vagrant::Machine do
 
   def new_provider_mock
     double("provider").tap do |obj|
-      obj.stub(_initialize: nil)
-      obj.stub(machine_id_changed: nil)
+      allow(obj).to receive(:_initialize).and_return(nil)
+      allow(obj).to receive(:machine_id_changed).and_return(nil)
       allow(obj).to receive(:state).and_return(Vagrant::MachineState.new(
         :created, "", ""))
     end
@@ -81,7 +81,7 @@ describe Vagrant::Machine do
 
       it "should not insert key" do
         subject = new_instance
-        expect(subject.config.ssh.insert_key).to be_false
+        expect(subject.config.ssh.insert_key).to be(false)
       end
     end
 
@@ -197,7 +197,7 @@ describe Vagrant::Machine do
 
       it "should initialize the capabilities" do
         instance = new_provider_mock
-        expect(instance).to receive(:_initialize).with { |p, m|
+        expect(instance).to receive(:_initialize).with(any_args) { |p, m|
           expect(p).to eq(provider_name)
           expect(m.name).to eq(name)
           true
@@ -383,7 +383,7 @@ describe Vagrant::Machine do
     it "should run the callable with the proper env" do
       subject.action_raw(:foo, callable)
 
-      expect(@env[:called]).to be_true
+      expect(@env[:called]).to be(true)
       expect(@env[:action_name]).to eq(:machine_action_foo)
       expect(@env[:machine]).to equal(subject)
       expect(@env[:machine_action]).to eq(:foo)
@@ -398,7 +398,7 @@ describe Vagrant::Machine do
     it "should merge in any extra env" do
       subject.action_raw(:bar, callable, foo: :bar)
 
-      expect(@env[:called]).to be_true
+      expect(@env[:called]).to be(true)
       expect(@env[:foo]).to eq(:bar)
     end
   end
@@ -533,9 +533,9 @@ describe Vagrant::Machine do
 
       # Setup the box information
       box = double("box")
-      box.stub(name: "foo")
-      box.stub(provider: :bar)
-      box.stub(version: "1.2.3")
+      allow(box).to receive(:name).and_return("foo")
+      allow(box).to receive(:provider).and_return(:bar)
+      allow(box).to receive(:version).and_return("1.2.3")
       subject.box = box
 
       subject.id = "foo"
@@ -788,18 +788,29 @@ describe Vagrant::Machine do
 
       context "with custom ssh_info" do
         it "keys_only should be default" do
-          expect(instance.ssh_info[:keys_only]).to be_true
+          expect(instance.ssh_info[:keys_only]).to be(true)
         end
         it "paranoid should be default" do
-          expect(instance.ssh_info[:paranoid]).to be_false
+          expect(instance.ssh_info[:paranoid]).to be(false)
+        end
+        it "extra_args should be nil" do
+          expect(instance.ssh_info[:extra_args]).to be(nil)
+        end
+        it "extra_args should be set" do
+          instance.config.ssh.extra_args = ["-L", "127.1.2.7:8008:127.1.2.7:8008"]
+          expect(instance.ssh_info[:extra_args]).to eq(["-L", "127.1.2.7:8008:127.1.2.7:8008"])
+        end
+        it "extra_args should be set as an array" do
+          instance.config.ssh.extra_args = "-6"
+          expect(instance.ssh_info[:extra_args]).to eq("-6")
         end
         it "keys_only should be overridden" do
           instance.config.ssh.keys_only = false
-          expect(instance.ssh_info[:keys_only]).to be_false
+          expect(instance.ssh_info[:keys_only]).to be(false)
         end
         it "paranoid should be overridden" do
           instance.config.ssh.paranoid = true
-          expect(instance.ssh_info[:paranoid]).to be_true
+          expect(instance.ssh_info[:paranoid]).to be(true)
         end
       end
     end

data/test/unit/vagrant/plugin/manager_test.rb

@@ -21,7 +21,7 @@ describe Vagrant::Plugin::Manager do
   end
 
   before do
-    Vagrant::Bundler.stub(instance: bundler)
+    allow(Vagrant::Bundler).to receive(:instance).and_return(bundler)
   end
 
   subject { described_class.new(path) }
@@ -30,9 +30,9 @@ describe Vagrant::Plugin::Manager do
     it "installs the plugin and adds it to the state file" do
       specs = Array.new(5) { Gem::Specification.new }
       specs[3].name = "foo"
-      expect(bundler).to receive(:install).once.with { |plugins, local|
+      expect(bundler).to receive(:install).once.with(any_args) { |plugins, local|
         expect(plugins).to have_key("foo")
-        expect(local).to be_false
+        expect(local).to be(false)
       }.and_return(specs)
       expect(bundler).to receive(:clean)
 
@@ -92,10 +92,10 @@ describe Vagrant::Plugin::Manager do
       end
 
       it "installs a version with constraints" do
-        expect(bundler).to receive(:install).once.with { |plugins, local|
+        expect(bundler).to receive(:install).once.with(any_args) { |plugins, local|
           expect(plugins).to have_key("foo")
           expect(plugins["foo"]["gem_version"]).to eql(">= 0.1.0")
-          expect(local).to be_false
+          expect(local).to be(false)
         }.and_return(specs)
         expect(bundler).to receive(:clean)
 
@@ -107,10 +107,10 @@ describe Vagrant::Plugin::Manager do
       end
 
       it "installs with an exact version but doesn't constrain" do
-        expect(bundler).to receive(:install).once.with { |plugins, local|
+        expect(bundler).to receive(:install).once.with(any_args) { |plugins, local|
           expect(plugins).to have_key("foo")
           expect(plugins["foo"]["gem_version"]).to eql("0.1.0")
-          expect(local).to be_false
+          expect(local).to be(false)
         }.and_return(specs)
         expect(bundler).to receive(:clean)
 
@@ -152,7 +152,7 @@ describe Vagrant::Plugin::Manager do
       before do
         systems_path.unlink
 
-        described_class.stub(system_plugins_file: systems_path)
+        allow(described_class).to receive(:system_plugins_file).and_return(systems_path)
 
         sf = Vagrant::Plugin::StateFile.new(systems_path)
         sf.add_plugin("foo", version: "0.2.0")
@@ -170,7 +170,7 @@ describe Vagrant::Plugin::Manager do
         subject.uninstall_plugin("bar")
 
         plugins = subject.installed_plugins
-        expect(plugins["foo"]["system"]).to be_true
+        expect(plugins["foo"]["system"]).to be(true)
       end
 
       it "raises an error if uninstalling a system gem" do
@@ -230,7 +230,7 @@ describe Vagrant::Plugin::Manager do
       before do
         systems_path.unlink
 
-        described_class.stub(system_plugins_file: systems_path)
+        allow(described_class).to receive(:system_plugins_file).and_return(systems_path)
 
         sf = Vagrant::Plugin::StateFile.new(systems_path)
         sf.add_plugin("foo", version: "0.2.0")
@@ -243,9 +243,9 @@ describe Vagrant::Plugin::Manager do
           expect(plugins.length).to eql(2)
           expect(plugins).to have_key("foo")
           expect(plugins["foo"]["gem_version"]).to eq("0.1.0")
-          expect(plugins["foo"]["system"]).to be_true
+          expect(plugins["foo"]["system"]).to be_truthy
           expect(plugins).to have_key("bar")
-          expect(plugins["bar"]["system"]).to be_true
+          expect(plugins["bar"]["system"]).to be(true)
         end
       end
     end