vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/test/unit/plugins/providers/docker/driver_test.rb

@@ -7,7 +7,7 @@ describe VagrantPlugins::DockerProvider::Driver do
   let(:cid)          { 'side-1-song-10' }
 
   before do
-    subject.stub(:execute) { |*args| @cmd = args.join(' ') }
+    allow(subject).to receive(:execute) { |*args| @cmd = args.join(' ') }
   end
 
   describe '#create' do
@@ -74,19 +74,19 @@ describe VagrantPlugins::DockerProvider::Driver do
     end
 
     context 'when container exists' do
-      before { subject.stub(execute: "foo\n#{cid}\nbar") }
-      it { expect(result).to be_true }
+      before { allow(subject).to receive(:execute).and_return("foo\n#{cid}\nbar") }
+      it { expect(result).to be_truthy }
     end
 
     context 'when container does not exist' do
-      before { subject.stub(execute: "foo\n#{cid}extra\nbar") }
-      it { expect(result).to be_false }
+      before { allow(subject).to receive(:execute).and_return("foo\n#{cid}extra\nbar") }
+      it { expect(result).to be_falsey }
     end
   end
 
   describe '#pull' do
     it 'should pull images' do
-      subject.should_receive(:execute).with('docker', 'pull', 'foo')
+      expect(subject).to receive(:execute).with('docker', 'pull', 'foo')
       subject.pull('foo')
     end
   end
@@ -101,43 +101,43 @@ describe VagrantPlugins::DockerProvider::Driver do
     end
 
     context 'when container exists' do
-      before { subject.stub(execute: "foo\n#{cid}\nbar") }
-      it { expect(result).to be_true }
+      before { allow(subject).to receive(:execute).and_return("foo\n#{cid}\nbar") }
+      it { expect(result).to be_truthy }
     end
 
     context 'when container does not exist' do
-      before { subject.stub(execute: "foo\n#{cid}extra\nbar") }
-      it { expect(result).to be_false }
+      before { allow(subject).to receive(:execute).and_return("foo\n#{cid}extra\nbar") }
+      it { expect(result).to be_falsey }
     end
   end
 
   describe '#privileged?' do
     it 'identifies privileged containers' do
-      subject.stub(inspect_container: {'HostConfig' => {"Privileged" => true}})
+      allow(subject).to receive(:inspect_container).and_return({'HostConfig' => {"Privileged" => true}})
       expect(subject).to be_privileged(cid)
     end
 
     it 'identifies unprivileged containers' do
-      subject.stub(inspect_container: {'HostConfig' => {"Privileged" => false}})
+      allow(subject).to receive(:inspect_container).and_return({'HostConfig' => {"Privileged" => false}})
       expect(subject).to_not be_privileged(cid)
     end
   end
 
   describe '#start' do
     context 'when container is running' do
-      before { subject.stub(running?: true) }
+      before { allow(subject).to receive(:running?).and_return(true) }
 
       it 'does not start the container' do
-        subject.should_not_receive(:execute).with('docker', 'start', cid)
+        expect(subject).to_not receive(:execute).with('docker', 'start', cid)
         subject.start(cid)
       end
     end
 
     context 'when container is not running' do
-      before { subject.stub(running?: false) }
+      before { allow(subject).to receive(:running?).and_return(false) }
 
       it 'starts the container' do
-        subject.should_receive(:execute).with('docker', 'start', cid)
+        expect(subject).to receive(:execute).with('docker', 'start', cid)
         subject.start(cid)
       end
     end
@@ -145,24 +145,24 @@ describe VagrantPlugins::DockerProvider::Driver do
 
   describe '#stop' do
     context 'when container is running' do
-      before { subject.stub(running?: true) }
+      before { allow(subject).to receive(:running?).and_return(true) }
 
       it 'stops the container' do
-        subject.should_receive(:execute).with('docker', 'stop', '-t', '1', cid)
+        expect(subject).to receive(:execute).with('docker', 'stop', '-t', '1', cid)
         subject.stop(cid, 1)
       end
 
       it "stops the container with the set timeout" do
-        subject.should_receive(:execute).with('docker', 'stop', '-t', '5', cid)
+        expect(subject).to receive(:execute).with('docker', 'stop', '-t', '5', cid)
         subject.stop(cid, 5)
       end
     end
 
     context 'when container is not running' do
-      before { subject.stub(running?: false) }
+      before { allow(subject).to receive(:running?).and_return(false) }
 
       it 'does not stop container' do
-        subject.should_not_receive(:execute).with('docker', 'stop', '-t', '1', cid)
+        expect(subject).to_not receive(:execute).with('docker', 'stop', '-t', '1', cid)
         subject.stop(cid, 1)
       end
     end
@@ -170,19 +170,19 @@ describe VagrantPlugins::DockerProvider::Driver do
 
   describe '#rm' do
     context 'when container has been created' do
-      before { subject.stub(created?: true) }
+      before { allow(subject).to receive(:created?).and_return(true) }
 
       it 'removes the container' do
-        subject.should_receive(:execute).with('docker', 'rm', '-f', '-v', cid)
+        expect(subject).to receive(:execute).with('docker', 'rm', '-f', '-v', cid)
         subject.rm(cid)
       end
     end
 
     context 'when container has not been created' do
-      before { subject.stub(created?: false) }
+      before { allow(subject).to receive(:created?).and_return(false) }
 
       it 'does not attempt to remove the container' do
-        subject.should_not_receive(:execute).with('docker', 'rm', '-f', '-v', cid)
+        expect(subject).to_not receive(:execute).with('docker', 'rm', '-f', '-v', cid)
         subject.rm(cid)
       end
     end
@@ -191,10 +191,10 @@ describe VagrantPlugins::DockerProvider::Driver do
   describe '#inspect_container' do
     let(:data) { '[{"json": "value"}]' }
 
-    before { subject.stub(execute: data) }
+    before { allow(subject).to receive(:execute).and_return(data) }
 
     it 'inspects the container' do
-      subject.should_receive(:execute).with('docker', 'inspect', cid)
+      expect(subject).to receive(:execute).with('docker', 'inspect', cid)
       subject.inspect_container(cid)
     end
 
@@ -206,10 +206,10 @@ describe VagrantPlugins::DockerProvider::Driver do
   describe '#all_containers' do
     let(:containers) { "container1\ncontainer2" }
 
-    before { subject.stub(execute: containers) }
+    before { allow(subject).to receive(:execute).and_return(containers) }
 
     it 'returns an array of all known containers' do
-      subject.should_receive(:execute).with('docker', 'ps', '-a', '-q', '--no-trunc')
+      expect(subject).to receive(:execute).with('docker', 'ps', '-a', '-q', '--no-trunc')
       expect(subject.all_containers).to eq(['container1', 'container2'])
     end
   end
@@ -217,10 +217,10 @@ describe VagrantPlugins::DockerProvider::Driver do
   describe '#docker_bridge_ip' do
     let(:containers) { " inet 123.456.789.012/16 " }
 
-    before { subject.stub(execute: containers) }
+    before { allow(subject).to receive(:execute).and_return(containers) }
 
     it 'returns an array of all known containers' do
-      subject.should_receive(:execute).with('/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'docker0')
+      expect(subject).to receive(:execute).with('/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'docker0')
       expect(subject.docker_bridge_ip).to eq('123.456.789.012')
     end
   end

data/test/unit/plugins/providers/docker/synced_folder_test.rb

@@ -9,7 +9,7 @@ describe VagrantPlugins::DockerProvider::SyncedFolder do
     let(:machine) { double("machine") }
 
     before do
-      machine.stub(provider_name: :docker)
+      allow(machine).to receive(:provider_name).and_return(:docker)
     end
 
     it "is usable" do
@@ -17,12 +17,12 @@ describe VagrantPlugins::DockerProvider::SyncedFolder do
     end
 
     it "is not usable if provider isn't docker" do
-      machine.stub(provider_name: :virtualbox)
+      allow(machine).to receive(:provider_name).and_return(:virtualbox)
       expect(subject).to_not be_usable(machine)
     end
 
     it "raises an error if bad provider if specified" do
-      machine.stub(provider_name: :virtualbox)
+      allow(machine).to receive(:provider_name).and_return(:virtualbox)
       expect { subject.usable?(machine, true) }.
         to raise_error(VagrantPlugins::DockerProvider::Errors::SyncedFolderNonDocker)
     end

data/test/unit/plugins/providers/hyperv/provider_test.rb

@@ -12,63 +12,63 @@ describe VagrantPlugins::HyperV::Provider do
   before do
     stub_const("Vagrant::Util::Platform", platform)
     stub_const("Vagrant::Util::PowerShell", powershell)
-    machine.stub(id: "foo")
-    platform.stub(windows?: true)
-    platform.stub(windows_admin?: true)
-    platform.stub(windows_hyperv_admin?: true)
-    powershell.stub(available?: true)
+    allow(machine).to receive(:id).and_return("foo")
+    allow(platform).to receive(:windows?).and_return(true)
+    allow(platform).to receive(:windows_admin?).and_return(true)
+    allow(platform).to receive(:windows_hyperv_admin?).and_return(true)
+    allow(powershell).to receive(:available?).and_return(true)
   end
 
   describe ".usable?" do
     subject { described_class }
 
     it "returns false if not windows" do
-      platform.stub(windows?: false)
+      allow(platform).to receive(:windows?).and_return(false)
       expect(subject).to_not be_usable
     end
 
     it "returns false if neither an admin nor a hyper-v admin" do
-      platform.stub(windows_admin?: false)
-      platform.stub(windows_hyperv_admin?: false)
+      allow(platform).to receive(:windows_admin?).and_return(false)
+      allow(platform).to receive(:windows_hyperv_admin?).and_return(false)
       expect(subject).to_not be_usable
     end
 
     it "returns true if not an admin but is a hyper-v admin" do
-      platform.stub(windows_admin?: false)
-      platform.stub(windows_hyperv_admin?: true)
+      allow(platform).to receive(:windows_admin?).and_return(false)
+      allow(platform).to receive(:windows_hyperv_admin?).and_return(true)
       expect(subject).to be_usable
     end
 
     it "returns false if powershell is not available" do
-      powershell.stub(available?: false)
+      allow(powershell).to receive(:available?).and_return(false)
       expect(subject).to_not be_usable
     end
 
     it "raises an exception if not windows" do
-      platform.stub(windows?: false)
+      allow(platform).to receive(:windows?).and_return(false)
 
       expect { subject.usable?(true) }.
         to raise_error(VagrantPlugins::HyperV::Errors::WindowsRequired)
     end
 
     it "raises an exception if neither an admin nor a hyper-v admin" do
-      platform.stub(windows_admin?: false)
-      platform.stub(windows_hyperv_admin?: false)
+      allow(platform).to receive(:windows_admin?).and_return(false)
+      allow(platform).to receive(:windows_hyperv_admin?).and_return(false)
 
       expect { subject.usable?(true) }.
         to raise_error(VagrantPlugins::HyperV::Errors::AdminRequired)
     end
 
     it "raises an exception if neither an admin nor a hyper-v admin" do
-      platform.stub(windows_admin?: false)
-      platform.stub(windows_hyperv_admin?: false)
+      allow(platform).to receive(:windows_admin?).and_return(false)
+      allow(platform).to receive(:windows_hyperv_admin?).and_return(false)
 
       expect { subject.usable?(true) }.
         to raise_error(VagrantPlugins::HyperV::Errors::AdminRequired)
     end
 
     it "raises an exception if powershell is not available" do
-      powershell.stub(available?: false)
+      allow(powershell).to receive(:available?).and_return(false)
 
       expect { subject.usable?(true) }.
         to raise_error(VagrantPlugins::HyperV::Errors::PowerShellRequired)
@@ -83,13 +83,13 @@ describe VagrantPlugins::HyperV::Provider do
 
   describe "#state" do
     it "returns not_created if no ID" do
-      machine.stub(id: nil)
+      allow(machine).to receive(:id).and_return(nil)
 
       expect(subject.state.id).to eq(:not_created)
     end
 
     it "calls an action to determine the ID" do
-      machine.stub(id: "foo")
+      allow(machine).to receive(:id).and_return("foo")
       expect(machine).to receive(:action).with(:read_state).
         and_return({ machine_state_id: :bar })
 

data/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb

@@ -13,7 +13,7 @@ describe VagrantPlugins::ProviderVirtualBox::Action::NetworkFixIPv6 do
 
   let(:machine) do
     iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
-      m.provider.stub(driver: driver)
+      allow(m.provider).to receive(:driver).and_return(driver)
     end
   end
 
@@ -45,7 +45,7 @@ describe VagrantPlugins::ProviderVirtualBox::Action::NetworkFixIPv6 do
         .and_return(private_network: { ip: 'fe:80::' })
       allow(UDPSocket).to receive(:new).with(Socket::AF_INET6)
         .and_return(socket)
-      socket.stub(:connect)
+      allow(socket).to receive(:connect)
     end
 
     it "only checks the interfaces associated with the VM" do

data/test/unit/plugins/providers/virtualbox/action/network_test.rb

@@ -15,7 +15,7 @@ describe VagrantPlugins::ProviderVirtualBox::Action::Network do
 
   let(:machine) do
     iso_env.machine(iso_env.machine_names[0], :virtualbox).tap do |m|
-      m.provider.stub(driver: driver)
+      allow(m.provider).to receive(:driver).and_return(driver)
     end
   end
 

data/test/unit/plugins/providers/virtualbox/action/prepare_nfs_settings_test.rb

@@ -15,7 +15,7 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings do
 
   let(:machine) do
     iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
-      m.provider.stub(driver: driver)
+      allow(m.provider).to receive(:driver).and_return(driver)
     end
   end
 
@@ -33,8 +33,8 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings do
   end
 
   it "calls the next action in the chain" do
-    driver.stub(read_network_interfaces: {2 => {type: :hostonly, hostonly: "vmnet2"}})
-    driver.stub(read_host_only_interfaces: [{name: "vmnet2", ip: "1.2.3.4"}])
+    allow(driver).to receive(:read_network_interfaces).and_return({2 => {type: :hostonly, hostonly: "vmnet2"}})
+    allow(driver).to receive(:read_host_only_interfaces).and_return([{name: "vmnet2", ip: "1.2.3.4"}])
     allow(driver).to receive(:read_guest_ip).with(1).and_return("2.3.4.5")
 
     called = false
@@ -47,20 +47,22 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings do
   end
 
   context "with an nfs synced folder" do
+    let(:host_only_interfaces) {
+      [{name: "vmnet2", ip: "1.2.3.4"}]
+    }
+
     before do
       # We can't be on Windows, because NFS gets disabled on Windows
-      Vagrant::Util::Platform.stub(windows?: false)
+      allow(Vagrant::Util::Platform).to receive(:windows?).and_return(false)
 
       env[:machine].config.vm.synced_folder("/host/path", "/guest/path", type: "nfs")
       env[:machine].config.finalize!
 
       # Stub out the stuff so it just works by default
-      driver.stub(read_network_interfaces: {
+      allow(driver).to receive(:read_network_interfaces).and_return({
         2 => {type: :hostonly, hostonly: "vmnet2"},
       })
-      driver.stub(read_host_only_interfaces: [
-        {name: "vmnet2", ip: "1.2.3.4"},
-      ])
+      allow(driver).to receive(:read_host_only_interfaces).and_return(host_only_interfaces)
       allow(driver).to receive(:read_guest_ip).with(1).and_return("2.3.4.5")
 
       # override sleep to 0 so test does not take seconds
@@ -68,6 +70,30 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings do
       allow(subject).to receive(:retry_options).and_return(retry_options.merge(sleep: 0))
     end
 
+    context "with host interface netmask defined" do
+      context "with machine IP included within host interface range" do
+        let(:host_only_interfaces) {
+          [{name: "vmnet2", ip: "2.3.4.1", netmask: "255.255.255.0"}]
+        }
+
+        it "sets nfs_host_ip and nfs_machine_ip properly" do
+          subject.call(env)
+
+          expect(env[:nfs_host_ip]).to eq("2.3.4.1")
+          expect(env[:nfs_machine_ip]).to eq("2.3.4.5")
+        end
+      end
+      context "with machine IP included within host interface range" do
+        let(:host_only_interfaces) {
+          [{name: "vmnet2", ip: "1.2.3.4", netmask: "255.255.255.0"}]
+        }
+
+        it "raises an error when the machine IP is not within host interface range" do
+          expect{ subject.call(env) }.to raise_error(Vagrant::Errors::NFSNoHostonlyNetwork)
+        end
+      end
+    end
+
     it "sets nfs_host_ip and nfs_machine_ip properly" do
       subject.call(env)
 

data/test/unit/plugins/providers/virtualbox/action/prepare_nfs_valid_ids_test.rb

@@ -13,7 +13,7 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSValidIds do
 
   let(:machine) do
     iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
-      m.provider.stub(driver: driver)
+      allow(m.provider).to receive(:driver).and_return(driver)
     end
   end
 
@@ -24,7 +24,7 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSValidIds do
   subject { described_class.new(app, env) }
 
   before do
-    driver.stub(read_vms: {})
+    allow(driver).to receive(:read_vms).and_return({})
   end
 
   it "calls the next action in the chain" do
@@ -39,7 +39,7 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSValidIds do
 
   it "sets nfs_valid_ids" do
     hash = {"foo" => "1", "bar" => "4"}
-    driver.stub(read_vms: hash)
+    allow(driver).to receive(:read_vms).and_return(hash)
 
     subject.call(env)
 

data/test/unit/plugins/providers/virtualbox/cap_test.rb

@@ -14,8 +14,8 @@ describe VagrantPlugins::ProviderVirtualBox::Cap do
 
   let(:machine) do
     iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
-      m.provider.stub(driver: driver)
-      m.stub(state: state)
+      allow(m.provider).to receive(:driver).and_return(driver)
+      allow(m).to receive(:state).and_return(state)
     end
   end
 

data/test/unit/plugins/providers/virtualbox/config_test.rb

@@ -25,10 +25,10 @@ describe VagrantPlugins::ProviderVirtualBox::Config do
 
   before do
     vm_config = double("vm_config")
-    vm_config.stub(networks: [])
+    allow(vm_config).to receive(:networks).and_return([])
     config = double("config")
-    config.stub(vm: vm_config)
-    machine.stub(config: config)
+    allow(config).to receive(:vm).and_return(vm_config)
+    allow(machine).to receive(:config).and_return(config)
   end
 
   its "valid by default" do
@@ -39,10 +39,10 @@ describe VagrantPlugins::ProviderVirtualBox::Config do
   context "defaults" do
     before { subject.finalize! }
 
-    it { expect(subject.check_guest_additions).to be_true }
-    it { expect(subject.gui).to be_false }
+    it { expect(subject.check_guest_additions).to be(true) }
+    it { expect(subject.gui).to be(false) }
     it { expect(subject.name).to be_nil }
-    it { expect(subject.functional_vboxsf).to be_true }
+    it { expect(subject.functional_vboxsf).to be(true) }
 
     it "should have one NAT adapter" do
       expect(subject.network_adapters).to eql({