vagrant-unbundled 1.9.7.1 → 1.9.8.1

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

@@ -36,9 +36,9 @@ describe Vagrant::Plugin::StateFile do
     end
 
     it "should check for plugins" do
-      expect(subject.has_plugin?("foo")).to be_false
+      expect(subject.has_plugin?("foo")).to be(false)
       subject.add_plugin("foo")
-      expect(subject.has_plugin?("foo")).to be_true
+      expect(subject.has_plugin?("foo")).to be(true)
     end
 
     it "should remove plugins" do

data/test/unit/vagrant/plugin/v1/command_test.rb

@@ -55,14 +55,14 @@ describe Vagrant::Plugin::V1::Command do
 
     let(:environment) do
       env = double("environment")
-      env.stub(root_path: "foo")
+      allow(env).to receive(:root_path).and_return("foo")
       env
     end
 
     let(:instance)    { klass.new([], environment) }
 
     it "should raise an exception if a root_path is not available" do
-      environment.stub(root_path: nil)
+      allow(environment).to receive(:root_path).and_return(nil)
 
       expect { instance.with_target_vms }.
         to raise_error(Vagrant::Errors::NoEnvironmentError)
@@ -75,9 +75,9 @@ describe Vagrant::Plugin::V1::Command do
       bar_vm = double("bar")
       allow(bar_vm).to receive(:name).and_return("bar")
 
-      environment.stub(multivm?: true,
-                       vms: { "foo" => foo_vm, "bar" => bar_vm },
-                       vms_ordered: [foo_vm, bar_vm])
+      allow(environment).to receive(:multivm?).and_return(true)
+      allow(environment).to receive(:vms).and_return({ "foo" => foo_vm, "bar" => bar_vm })
+      allow(environment).to receive(:vms_ordered).and_return([foo_vm, bar_vm])
 
       vms = []
       instance.with_target_vms do |vm|
@@ -88,7 +88,8 @@ describe Vagrant::Plugin::V1::Command do
     end
 
     it "raises an exception if the named VM doesn't exist" do
-      environment.stub(multivm?: true, vms: {})
+      allow(environment).to receive(:multivm?).and_return(true)
+      allow(environment).to receive(:vms).and_return({})
 
       expect { instance.with_target_vms("foo") }.
         to raise_error(Vagrant::Errors::VMNotFoundError)
@@ -98,8 +99,8 @@ describe Vagrant::Plugin::V1::Command do
       foo_vm = double("foo")
       allow(foo_vm).to receive(:name).and_return(:foo)
 
-      environment.stub(multivm?: true,
-                       vms: { foo: foo_vm, bar: nil })
+      allow(environment).to receive(:multivm?).and_return(true)
+      allow(environment).to receive(:vms).and_return({ foo: foo_vm, bar: nil })
 
       vms = []
       instance.with_target_vms("foo") { |vm| vms << vm }

data/test/unit/vagrant/plugin/v2/command_test.rb

@@ -78,7 +78,7 @@ describe Vagrant::Plugin::V2::Command do
     subject { instance }
 
     it "should raise an exception if a root_path is not available" do
-      environment.stub(root_path: nil)
+      allow(environment).to receive(:root_path).and_return(nil)
 
       expect { instance.with_target_vms }.
         to raise_error(Vagrant::Errors::NoEnvironmentError)
@@ -86,16 +86,18 @@ describe Vagrant::Plugin::V2::Command do
 
     it "should yield every VM in order if no name is given" do
       foo_vm = double("foo")
-      foo_vm.stub(name: "foo", provider: :foobarbaz)
-      foo_vm.stub(ui: Vagrant::UI::Silent.new)
-      foo_vm.stub(state: nil)
+      allow(foo_vm).to receive(:name).and_return("foo")
+      allow(foo_vm).to receive(:provider).and_return(:foobarbaz)
+      allow(foo_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(foo_vm).to receive(:state).and_return(nil)
 
       bar_vm = double("bar")
-      bar_vm.stub(name: "bar", provider: :foobarbaz)
-      bar_vm.stub(ui: Vagrant::UI::Silent.new)
-      bar_vm.stub(state: nil)
+      allow(bar_vm).to receive(:name).and_return("bar")
+      allow(bar_vm).to receive(:provider).and_return(:foobarbaz)
+      allow(bar_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(bar_vm).to receive(:state).and_return(nil)
 
-      environment.stub(machine_names: [:foo, :bar])
+      allow(environment).to receive(:machine_names).and_return([:foo, :bar])
       allow(environment).to receive(:machine).with(:foo, environment.default_provider).and_return(foo_vm)
       allow(environment).to receive(:machine).with(:bar, environment.default_provider).and_return(bar_vm)
 
@@ -108,7 +110,7 @@ describe Vagrant::Plugin::V2::Command do
     end
 
     it "raises an exception if the named VM doesn't exist" do
-      environment.stub(machine_names: [:default])
+      allow(environment).to receive(:machine_names).and_return([:default])
       allow(environment).to receive(:machine).with(:foo, anything).and_return(nil)
 
       expect { instance.with_target_vms("foo") }.
@@ -117,9 +119,10 @@ describe Vagrant::Plugin::V2::Command do
 
     it "yields the given VM if a name is given" do
       foo_vm = double("foo")
-      foo_vm.stub(name: "foo", provider: :foobarbaz)
-      foo_vm.stub(ui: Vagrant::UI::Silent.new)
-      foo_vm.stub(state: nil)
+      allow(foo_vm).to receive(:name).and_return("foo")
+      allow(foo_vm).to receive(:provider).and_return(:foobarbaz)
+      allow(foo_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(foo_vm).to receive(:state).and_return(nil)
 
       allow(environment).to receive(:machine).with(:foo, environment.default_provider).and_return(foo_vm)
 
@@ -130,9 +133,10 @@ describe Vagrant::Plugin::V2::Command do
 
     it "calls state after yielding the vm to update the machine index" do
       foo_vm = double("foo")
-      foo_vm.stub(name: "foo", provider: :foobarbaz)
-      foo_vm.stub(ui: Vagrant::UI::Silent.new)
-      foo_vm.stub(state: nil)
+      allow(foo_vm).to receive(:name).and_return("foo")
+      allow(foo_vm).to receive(:provider).and_return(:foobarbaz)
+      allow(foo_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(foo_vm).to receive(:state).and_return(nil)
 
       allow(environment).to receive(:machine).with(:foo, environment.default_provider).and_return(foo_vm)
 
@@ -145,9 +149,10 @@ describe Vagrant::Plugin::V2::Command do
       foo_vm = double("foo")
       provider = :foobarbaz
 
-      foo_vm.stub(name: "foo", provider: provider)
-      foo_vm.stub(ui: Vagrant::UI::Silent.new)
-      foo_vm.stub(state: nil)
+      allow(foo_vm).to receive(:name).and_return("foo")
+      allow(foo_vm).to receive(:provider).and_return(provider)
+      allow(foo_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(foo_vm).to receive(:state).and_return(nil)
       allow(environment).to receive(:machine).with(:foo, provider).and_return(foo_vm)
 
       vms = []
@@ -158,7 +163,7 @@ describe Vagrant::Plugin::V2::Command do
     it "should raise an exception if an active machine exists with a different provider" do
       name = :foo
 
-      environment.stub(active_machines: [[name, :vmware]])
+      allow(environment).to receive(:active_machines).and_return([[name, :vmware]])
       expect { instance.with_target_vms(name.to_s, provider: :foo) }.
         to raise_error Vagrant::Errors::ActiveMachineWithDifferentProvider
     end
@@ -168,11 +173,12 @@ describe Vagrant::Plugin::V2::Command do
       provider = :vmware
       vmware_vm = double("vmware_vm")
 
-      environment.stub(active_machines: [[name, provider]])
+      allow(environment).to receive(:active_machines).and_return([[name, provider]])
       allow(environment).to receive(:machine).with(name, provider).and_return(vmware_vm)
-      vmware_vm.stub(name: name, provider: provider)
-      vmware_vm.stub(ui: Vagrant::UI::Silent.new)
-      vmware_vm.stub(state: nil)
+      allow(vmware_vm).to receive(:name).and_return(name)
+      allow(vmware_vm).to receive(:provider).and_return(provider)
+      allow(vmware_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(vmware_vm).to receive(:state).and_return(nil)
 
       vms = []
       instance.with_target_vms(name.to_s) { |vm| vms << vm }
@@ -184,10 +190,12 @@ describe Vagrant::Plugin::V2::Command do
       provider = :vmware
       vmware_vm = double("vmware_vm")
 
-      environment.stub(active_machines: [[name, provider]])
+      allow(environment).to receive(:active_machines).and_return([[name, provider]])
       allow(environment).to receive(:machine).with(name, provider).and_return(vmware_vm)
-      vmware_vm.stub(name: name, provider: provider, ui: Vagrant::UI::Silent.new)
-      vmware_vm.stub(state: nil)
+      allow(vmware_vm).to receive(:name).and_return(name)
+      allow(vmware_vm).to receive(:provider).and_return(provider)
+      allow(vmware_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(vmware_vm).to receive(:state).and_return(nil)
 
       vms = []
       instance.with_target_vms(name.to_s, provider: provider) { |vm| vms << vm }
@@ -199,9 +207,10 @@ describe Vagrant::Plugin::V2::Command do
       machine = double("machine")
 
       allow(environment).to receive(:machine).with(name, environment.default_provider).and_return(machine)
-      machine.stub(name: name, provider: environment.default_provider)
-      machine.stub(ui: Vagrant::UI::Silent.new)
-      machine.stub(state: nil)
+      allow(machine).to receive(:name).and_return(name)
+      allow(machine).to receive(:provider).and_return(environment.default_provider)
+      allow(machine).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(machine).to receive(:state).and_return(nil)
 
       results = []
       instance.with_target_vms(name.to_s) { |m| results << m }
@@ -213,13 +222,14 @@ describe Vagrant::Plugin::V2::Command do
       provider = :vmware
       vmware_vm = double("vmware_vm")
 
-      environment.stub(active_machines: [[name, provider]])
+      allow(environment).to receive(:active_machines).and_return([[name, provider]])
       allow(environment).to receive(:machine).with(name, provider).and_return(vmware_vm)
-      environment.stub(machine_names: [])
-      environment.stub(primary_machine_name: name)
-      vmware_vm.stub(name: name, provider: provider)
-      vmware_vm.stub(ui: Vagrant::UI::Silent.new)
-      vmware_vm.stub(state: nil)
+      allow(environment).to receive(:machine_names).and_return([])
+      allow(environment).to receive(:primary_machine_name).and_return(name)
+      allow(vmware_vm).to receive(:name).and_return(name)
+      allow(vmware_vm).to receive(:provider).and_return(provider)
+      allow(vmware_vm).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(vmware_vm).to receive(:state).and_return(nil)
 
       vms = []
       instance.with_target_vms(nil, single_target: true) { |vm| vms << vm }
@@ -230,13 +240,14 @@ describe Vagrant::Plugin::V2::Command do
       name = :foo
       machine = double("machine")
 
-      environment.stub(active_machines: [])
+      allow(environment).to receive(:active_machines).and_return([])
       allow(environment).to receive(:machine).with(name, environment.default_provider).and_return(machine)
-      environment.stub(machine_names: [])
-      environment.stub(primary_machine_name: name)
-      machine.stub(name: name, provider: environment.default_provider)
-      machine.stub(ui: Vagrant::UI::Silent.new)
-      machine.stub(state: nil)
+      allow(environment).to receive(:machine_names).and_return([])
+      allow(environment).to receive(:primary_machine_name).and_return(name)
+      allow(machine).to receive(:name).and_return(name)
+      allow(machine).to receive(:provider).and_return(environment.default_provider)
+      allow(machine).to receive(:ui).and_return(Vagrant::UI::Silent.new)
+      allow(machine).to receive(:state).and_return(nil)
 
       vms = []
       instance.with_target_vms(nil, single_target: true) { |vm| vms << machine }
@@ -255,7 +266,7 @@ describe Vagrant::Plugin::V2::Command do
       other_machine.id = "foo"
 
       # Make sure we don't have a root path, to test
-      environment.stub(root_path: nil)
+      allow(environment).to receive(:root_path).and_return(nil)
 
       results = []
       subject.with_target_vms(other_machine.index_uuid) { |m| results << m }
@@ -282,7 +293,7 @@ describe Vagrant::Plugin::V2::Command do
       FileUtils.rm_rf(iso_env.workdir)
 
       # Make sure we don't have a root path, to test
-      environment.stub(root_path: nil)
+      allow(environment).to receive(:root_path).and_return(nil)
 
       # Run the command
       expect {

data/test/unit/vagrant/plugin/v2/plugin_test.rb

@@ -2,7 +2,8 @@ require File.expand_path("../../../../base", __FILE__)
 
 describe Vagrant::Plugin::V2::Plugin do
   before do
-    described_class.stub(manager: Vagrant::Plugin::V2::Manager.new)
+    allow(described_class).to receive(:manager)
+      .and_return(Vagrant::Plugin::V2::Manager.new)
   end
 
   it "should be able to set and get the name" do
@@ -71,8 +72,8 @@ describe Vagrant::Plugin::V2::Plugin do
         command("bar", primary: false) { "bar" }
       end
 
-      expect(plugin.components.commands[:foo][1][:primary]).to be_true
-      expect(plugin.components.commands[:bar][1][:primary]).to be_false
+      expect(plugin.components.commands[:foo][1][:primary]).to be(true)
+      expect(plugin.components.commands[:bar][1][:primary]).to be(false)
     end
 
     ["spaces bad", "sym^bols"].each do |bad|

data/test/unit/vagrant/plugin/v2/provider_test.rb

@@ -42,14 +42,14 @@ describe Vagrant::Plugin::V2::Provider do
         end
       end
 
-      machine.stub(id: "YEAH")
+      allow(machine).to receive(:id).and_return("YEAH")
 
       instance._initialize("foo", machine)
     end
 
     it "can execute capabilities" do
-      expect(subject.capability?(:foo)).to be_false
-      expect(subject.capability?(:bar)).to be_true
+      expect(subject.capability?(:foo)).to be(false)
+      expect(subject.capability?(:bar)).to be(true)
 
       expect { subject.capability(:bar) }.
         to raise_error("bar YEAH")

data/test/unit/vagrant/shared_helpers_test.rb

@@ -18,25 +18,25 @@ describe Vagrant do
   describe "#in_installer?" do
     it "is not if env is not set" do
       with_temp_env("VAGRANT_INSTALLER_ENV" => nil) do
-        expect(subject.in_installer?).to be_false
+        expect(subject.in_installer?).to be(false)
       end
     end
 
     it "is if env is set" do
       with_temp_env("VAGRANT_INSTALLER_ENV" => "/foo") do
-        expect(subject.in_installer?).to be_true
+        expect(subject.in_installer?).to be(true)
       end
     end
   end
 
   describe "#installer_embedded_dir" do
     it "returns nil if not in an installer" do
-      Vagrant.stub(in_installer?: false)
+      allow(Vagrant).to receive(:in_installer?).and_return(false)
       expect(subject.installer_embedded_dir).to be_nil
     end
 
     it "returns the set directory" do
-      Vagrant.stub(in_installer?: true)
+      allow(Vagrant).to receive(:in_installer?).and_return(true)
 
       with_temp_env("VAGRANT_INSTALLER_EMBEDDED_DIR" => "/foo") do
         expect(subject.installer_embedded_dir).to eq("/foo")
@@ -47,13 +47,13 @@ describe Vagrant do
   describe "#plugins_enabled?" do
     it "returns true if the env is not set" do
       with_temp_env("VAGRANT_NO_PLUGINS" => nil) do
-        expect(subject.plugins_enabled?).to be_true
+        expect(subject.plugins_enabled?).to be(true)
       end
     end
 
     it "returns false if the env is set" do
       with_temp_env("VAGRANT_NO_PLUGINS" => "1") do
-        expect(subject.plugins_enabled?).to be_false
+        expect(subject.plugins_enabled?).to be(false)
       end
     end
   end

data/test/unit/vagrant/ui_test.rb

@@ -5,7 +5,7 @@ describe Vagrant::UI::Basic do
     it "outputs within the a new thread" do
       current = Thread.current.object_id
 
-      expect(subject).to receive(:safe_puts).with { |*args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |*args|
         expect(Thread.current.object_id).to_not eq(current)
         true
       }
@@ -14,7 +14,7 @@ describe Vagrant::UI::Basic do
     end
 
     it "outputs using `puts` by default" do
-      expect(subject).to receive(:safe_puts).with { |message, **opts|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, **opts|
         expect(opts[:printer]).to eq(:puts)
         true
       }
@@ -23,7 +23,7 @@ describe Vagrant::UI::Basic do
     end
 
     it "outputs using `print` if new_line is false" do
-      expect(subject).to receive(:safe_puts).with { |message, **opts|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, **opts|
         expect(opts[:printer]).to eq(:print)
         true
       }
@@ -32,7 +32,7 @@ describe Vagrant::UI::Basic do
     end
 
     it "outputs using `print` if new_line is false" do
-      expect(subject).to receive(:safe_puts).with { |message, **opts|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, **opts|
         expect(opts[:printer]).to eq(:print)
         true
       }
@@ -44,7 +44,7 @@ describe Vagrant::UI::Basic do
       stdout = StringIO.new
       subject.stdout = stdout
 
-      expect(subject).to receive(:safe_puts).with { |message, **opts|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, **opts|
         expect(opts[:io]).to be(stdout)
         true
       }
@@ -60,7 +60,7 @@ describe Vagrant::UI::Basic do
       stderr = StringIO.new
       subject.stderr = stderr
 
-      expect(subject).to receive(:safe_puts).with { |message, **opts|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, **opts|
         expect(opts[:io]).to be(stderr)
         true
       }
@@ -81,7 +81,7 @@ describe Vagrant::UI::Basic do
 
   context "#detail" do
     it "outputs details" do
-      expect(subject).to receive(:safe_puts).with { |message, **opts|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, **opts|
         expect(message).to eq("foo")
         true
       }
@@ -114,7 +114,7 @@ describe Vagrant::UI::Colored do
     end
 
     it "does not bold by default with a color" do
-      expect(subject).to receive(:safe_puts).with { |message, *args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, *args|
         expect(message).to start_with("\033[0;31m")
         expect(message).to end_with("\033[0m")
       }
@@ -125,7 +125,7 @@ describe Vagrant::UI::Colored do
 
   describe "#error" do
     it "colors red" do
-      expect(subject).to receive(:safe_puts).with { |message, *args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, *args|
         expect(message).to start_with("\033[0;31m")
         expect(message).to end_with("\033[0m")
       }
@@ -153,7 +153,7 @@ describe Vagrant::UI::Colored do
     it "colors output to color specified in global opts" do
       subject.opts[:color] = :red
 
-      expect(subject).to receive(:safe_puts).with { |message, *args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, *args|
         expect(message).to start_with("\033[0;31m")
         expect(message).to end_with("\033[0m")
       }
@@ -164,7 +164,7 @@ describe Vagrant::UI::Colored do
     it "colors output to specified color over global opts" do
       subject.opts[:color] = :red
 
-      expect(subject).to receive(:safe_puts).with { |message, *args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, *args|
         expect(message).to start_with("\033[0;32m")
         expect(message).to end_with("\033[0m")
       }
@@ -175,7 +175,7 @@ describe Vagrant::UI::Colored do
     it "bolds the output if specified" do
       subject.opts[:color] = :red
 
-      expect(subject).to receive(:safe_puts).with { |message, *args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, *args|
         expect(message).to start_with("\033[1;31m")
         expect(message).to end_with("\033[0m")
       }
@@ -186,7 +186,7 @@ describe Vagrant::UI::Colored do
 
   describe "#success" do
     it "colors green" do
-      expect(subject).to receive(:safe_puts).with { |message, *args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, *args|
         expect(message).to start_with("\033[0;32m")
         expect(message).to end_with("\033[0m")
       }
@@ -197,7 +197,7 @@ describe Vagrant::UI::Colored do
 
   describe "#warn" do
     it "colors yellow" do
-      expect(subject).to receive(:safe_puts).with { |message, *args|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message, *args|
         expect(message).to start_with("\033[0;33m")
         expect(message).to end_with("\033[0m")
       }
@@ -218,7 +218,7 @@ describe Vagrant::UI::MachineReadable do
   [:detail, :warn, :error, :info, :output, :success].each do |method|
     describe "##{method}" do
       it "outputs UI type to the machine-readable output" do
-        expect(subject).to receive(:safe_puts).with { |message|
+        expect(subject).to receive(:safe_puts).with(any_args) { |message|
           parts = message.split(",")
           expect(parts.length).to eq(5)
           expect(parts[1]).to eq("")
@@ -235,7 +235,7 @@ describe Vagrant::UI::MachineReadable do
 
   describe "#machine" do
     it "is formatted properly" do
-      expect(subject).to receive(:safe_puts).with { |message|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message|
         parts = message.split(",")
         expect(parts.length).to eq(5)
         expect(parts[1]).to eq("")
@@ -249,7 +249,7 @@ describe Vagrant::UI::MachineReadable do
     end
 
     it "includes a target if given" do
-      expect(subject).to receive(:safe_puts).with { |message|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message|
         parts = message.split(",")
         expect(parts.length).to eq(4)
         expect(parts[1]).to eq("boom")
@@ -262,7 +262,7 @@ describe Vagrant::UI::MachineReadable do
     end
 
     it "replaces commas" do
-      expect(subject).to receive(:safe_puts).with { |message|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message|
         parts = message.split(",")
         expect(parts.length).to eq(4)
         expect(parts[3]).to eq("foo%!(VAGRANT_COMMA)bar")
@@ -273,7 +273,7 @@ describe Vagrant::UI::MachineReadable do
     end
 
     it "replaces newlines" do
-      expect(subject).to receive(:safe_puts).with { |message|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message|
         parts = message.split(",")
         expect(parts.length).to eq(4)
         expect(parts[3]).to eq("foo\\nbar\\r")
@@ -286,7 +286,7 @@ describe Vagrant::UI::MachineReadable do
     # This is for a bug where JSON parses are frozen and an
     # exception was being raised.
     it "works properly with frozen string arguments" do
-      expect(subject).to receive(:safe_puts).with { |message|
+      expect(subject).to receive(:safe_puts).with(any_args) { |message|
         parts = message.split(",")
         expect(parts.length).to eq(4)
         expect(parts[3]).to eq("foo\\nbar\\r")
@@ -350,7 +350,7 @@ describe Vagrant::UI::Prefixed do
 
   describe "#opts" do
     it "is the parent's opts" do
-      ui.stub(opts: Object.new)
+      allow(ui).to receive(:opts).and_return(Object.new)
       expect(subject.opts).to be(ui.opts)
     end
   end