vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/test/unit/plugins/communicators/ssh/communicator_test.rb

@@ -109,7 +109,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
   describe ".ready?" do
     before(&connection_setup)
     it "returns true if shell test is successful" do
-      expect(communicator.ready?).to be_true
+      expect(communicator.ready?).to be(true)
     end
 
     context "with an invalid shell test" do
@@ -268,7 +268,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
     before(&connection_setup)
     context "with exit code as zero" do
       it "returns true" do
-        expect(communicator.test("ls")).to be_true
+        expect(communicator.test("ls")).to be(true)
       end
     end
 
@@ -278,7 +278,7 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
       end
 
       it "returns false" do
-        expect(communicator.test("/bin/false")).to be_false
+        expect(communicator.test("/bin/false")).to be(false)
       end
     end
   end
@@ -585,14 +585,14 @@ describe VagrantPlugins::CommunicatorSSH::Communicator do
 
   describe ".generate_environment_export" do
     it "should generate bourne shell compatible export" do
-      communicator.send(:generate_environment_export, "TEST", "value").should eq("export TEST=\"value\"\n")
+      expect(communicator.send(:generate_environment_export, "TEST", "value")).to eq("export TEST=\"value\"\n")
     end
 
     context "with custom template defined" do
       let(:export_command_template){ "setenv %ENV_KEY% %ENV_VALUE%" }
 
       it "should generate custom export based on template" do
-        communicator.send(:generate_environment_export, "TEST", "value").should eq("setenv TEST value\n")
+        expect(communicator.send(:generate_environment_export, "TEST", "value")).to eq("setenv TEST value\n")
       end
     end
   end

data/test/unit/plugins/communicators/winrm/communicator_test.rb

@@ -60,12 +60,12 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
   describe ".ready?" do
     it "returns true if hostname command executes without error" do
       expect(shell).to receive(:cmd).with("hostname").and_return({ exitcode: 0 })
-      expect(subject.ready?).to be_true
+      expect(subject.ready?).to be(true)
     end
 
     it "returns false if hostname command fails with a transient error" do
       expect(shell).to receive(:cmd).with("hostname").and_raise(VagrantPlugins::CommunicatorWinRM::Errors::TransientError)
-      expect(subject.ready?).to be_false
+      expect(subject.ready?).to be(false)
     end
 
     it "raises an error if hostname command fails with an unknown error" do
@@ -112,12 +112,12 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
   describe ".test" do
     it "returns true when exit code is zero" do
       expect(shell).to receive(:powershell).with(kind_of(String)).and_return(good_output)
-      expect(subject.test("test -d c:/windows")).to be_true
+      expect(subject.test("test -d c:/windows")).to be(true)
     end
 
     it "returns false when exit code is non-zero" do
       expect(shell).to receive(:powershell).with(kind_of(String)).and_return(bad_output)
-      expect(subject.test("test -d /tmp/foobar")).to be_false
+      expect(subject.test("test -d /tmp/foobar")).to be(false)
     end
 
     it "returns false when stderr contains output" do
@@ -125,11 +125,11 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
       output.exitcode = 1
       output << { stderr: 'this is an error' }
       expect(shell).to receive(:powershell).with(kind_of(String)).and_return(output)
-      expect(subject.test("[-x stuff] && foo")).to be_false
+      expect(subject.test("[-x stuff] && foo")).to be(false)
     end
 
     it "returns false when command is testing for linux OS" do
-      expect(subject.test("uname -s | grep Debian")).to be_false
+      expect(subject.test("uname -s | grep Debian")).to be(false)
     end
   end
 

data/test/unit/plugins/communicators/winrm/helper_test.rb

@@ -27,24 +27,24 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
     end
 
     it "returns the SSH info host if available" do
-      machine.stub(ssh_info: { host: "bar" })
+      allow(machine).to receive(:ssh_info).and_return({ host: "bar" })
       expect(subject.winrm_address(machine)).to eq("bar")
     end
 
     it "raise an exception if it can't detect a host" do
-      machine.stub(ssh_info: nil)
+      allow(machine).to receive(:ssh_info).and_return(nil)
       expect { subject.winrm_address(machine) }.
         to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
     end
 
     it "raise an exception if it detects an empty host ip" do
-      machine.stub(ssh_info: { host: "" })
+      allow(machine).to receive(:ssh_info).and_return({ host: "" })
       expect { subject.winrm_address(machine) }.
         to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
     end
 
     it "raise a WinRMNotReady exception if it detects an unset host ip" do
-      machine.stub(ssh_info: { host: nil })
+      allow(machine).to receive(:ssh_info).and_return({ host: nil })
       expect { subject.winrm_address(machine) }.
         to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
     end
@@ -52,15 +52,15 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
 
   describe ".winrm_info" do
     before do
-      machine.provider.stub(:capability?).
-        with(:winrm_info).and_return(false)
-      subject.stub(winrm_address: nil)
-      subject.stub(winrm_port: nil)
+      allow(machine.provider).to receive(:capability?)
+        .with(:winrm_info).and_return(false)
+      allow(subject).to receive(:winrm_address).and_return(nil)
+      allow(subject).to receive(:winrm_port).and_return(nil)
     end
 
     it "returns default info if no capability" do
-      subject.stub(winrm_address: "bar")
-      subject.stub(winrm_port: 45)
+      allow(subject).to receive(:winrm_address).and_return("bar")
+      allow(subject).to receive(:winrm_port).and_return(45)
 
       result = subject.winrm_info(machine)
       expect(result[:host]).to eq("bar")
@@ -68,18 +68,19 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
     end
 
     it "raises an exception if capability returns nil" do
-      machine.provider.stub(:capability?).
-        with(:winrm_info).and_return(true)
-      machine.provider.stub(:capability).with(:winrm_info).and_return(nil)
+      allow(machine.provider).to receive(:capability?)
+        .with(:winrm_info).and_return(true)
+      allow(machine.provider).to receive(:capability)
+        .with(:winrm_info).and_return(nil)
 
       expect { subject.winrm_info(machine) }.
         to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
     end
 
     it "returns the proper information if set" do
-      machine.provider.stub(:capability?).
-        with(:winrm_info).and_return(true)
-      machine.provider.stub(:capability).with(:winrm_info).and_return({
+      allow(machine.provider).to receive(:capability?)
+        .with(:winrm_info).and_return(true)
+      allow(machine.provider).to receive(:capability).with(:winrm_info).and_return({
         host: "foo",
         port: 12,
       })
@@ -90,12 +91,12 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
     end
 
     it "defaults information if capability doesn't set it" do
-      machine.provider.stub(:capability?).
-        with(:winrm_info).and_return(true)
-      machine.provider.stub(:capability).with(:winrm_info).and_return({})
+      allow(machine.provider).to receive(:capability?)
+        .with(:winrm_info).and_return(true)
+      allow(machine.provider).to receive(:capability).with(:winrm_info).and_return({})
 
-      subject.stub(winrm_address: "bar")
-      subject.stub(winrm_port: 45)
+      allow(subject).to receive(:winrm_address).and_return("bar")
+      allow(subject).to receive(:winrm_port).and_return(45)
 
       result = subject.winrm_info(machine)
       expect(result[:host]).to eq("bar")
@@ -132,8 +133,8 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
       machine.config.winrm.guest_port = 2222
       machine.config.vm.network "forwarded_port", host: 1234, guest: 2222
 
-      machine.provider.stub(:capability?).with(:forwarded_ports).and_return(true)
-      machine.provider.stub(:capability).with(:forwarded_ports).and_return({
+      allow(machine.provider).to receive(:capability?).with(:forwarded_ports).and_return(true)
+      allow(machine.provider).to receive(:capability).with(:forwarded_ports).and_return({
         1234 => 4567,
         2456 => 2222,
       })

data/test/unit/plugins/communicators/winssh/communicator_test.rb

@@ -127,7 +127,7 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
   describe ".ready?" do
     before(&connection_setup)
     it "returns true if shell test is successful" do
-      expect(communicator.ready?).to be_true
+      expect(communicator.ready?).to be_truthy
     end
 
     context "with an invalid shell test" do
@@ -209,7 +209,7 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
     before(&connection_setup)
     context "with exit code as zero" do
       it "returns true" do
-        expect(communicator.test("dir")).to be_true
+        expect(communicator.test("dir")).to be_truthy
       end
     end
 
@@ -219,7 +219,7 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
       end
 
       it "returns false" do
-        expect(communicator.test("false.exe")).to be_false
+        expect(communicator.test("false.exe")).to be_falsey
       end
     end
   end
@@ -512,14 +512,14 @@ describe VagrantPlugins::CommunicatorWinSSH::Communicator do
 
   describe ".generate_environment_export" do
     it "should generate bourne shell compatible export" do
-      communicator.send(:generate_environment_export, "TEST", "value").should eq("export TEST=\"value\"\n")
+      expect(communicator.send(:generate_environment_export, "TEST", "value")).to eq("export TEST=\"value\"\n")
     end
 
     context "with custom template defined" do
       let(:export_command_template){ "setenv %ENV_KEY% %ENV_VALUE%" }
 
       it "should generate custom export based on template" do
-        communicator.send(:generate_environment_export, "TEST", "value").should eq("setenv TEST value\n")
+        expect(communicator.send(:generate_environment_export, "TEST", "value")).to eq("setenv TEST value\n")
       end
     end
   end

data/test/unit/plugins/guests/darwin/cap/shell_expand_guest_path_test.rb

@@ -0,0 +1,43 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestDarwin::Cap::ShellExpandGuestPath" do
+  let(:caps) do
+    VagrantPlugins::GuestDarwin::Plugin
+      .components
+      .guest_capabilities[:darwin]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  describe "#shell_expand_guest_path" do
+    let(:cap) { caps.get(:shell_expand_guest_path) }
+
+    it "expands the path" do
+      path = "/home/vagrant/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant/folder")
+
+      cap.shell_expand_guest_path(machine, path)
+    end
+
+    it "raises an exception if no path was detected" do
+      path = "/home/vagrant/folder"
+      expect { cap.shell_expand_guest_path(machine, path) }.
+        to raise_error(Vagrant::Errors::ShellExpandFailed)
+    end
+
+    it "returns a path with a space in it" do
+      path = "/home/vagrant folder/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant folder/folder")
+
+      expect(machine.communicate).to receive(:execute).with("printf \"#{path}\"")
+      cap.shell_expand_guest_path(machine, path)
+    end
+  end
+end

data/test/unit/plugins/guests/freebsd/cap/configure_networks_test.rb

@@ -13,7 +13,7 @@ describe "VagrantPlugins::GuestFreeBSD::Cap::ConfigureNetworks" do
 
   before do
     allow(machine).to receive(:communicate).and_return(comm)
-    comm.stub_command("ifconfig -a | grep -o ^[0-9a-z]* | grep -v '^lo'",
+    comm.stub_command("ifconfig -a | grep -o '^[0-9a-z]*' | grep -v '^lo'",
       stdout: "em1\nem2")
   end
 

data/test/unit/plugins/guests/freebsd/cap/shell_expand_guest_path_test.rb

@@ -0,0 +1,44 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestFreeBSD::Cap::ShellExpandGuestPath" do
+  let(:caps) do
+    VagrantPlugins::GuestFreeBSD::Plugin
+      .components
+      .guest_capabilities[:freebsd]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  describe "#shell_expand_guest_path" do
+    let(:cap) { caps.get(:shell_expand_guest_path) }
+
+    it "expands the path" do
+      path = "/home/vagrant/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant/folder")
+
+      cap.shell_expand_guest_path(machine, path)
+    end
+
+    it "raises an exception if no path was detected" do
+      path = "/home/vagrant/folder"
+      expect { cap.shell_expand_guest_path(machine, path) }.
+        to raise_error(Vagrant::Errors::ShellExpandFailed)
+    end
+
+    it "returns a path with a space in it" do
+      path = "/home/vagrant folder/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant folder/folder")
+
+      expect(machine.communicate).to receive(:execute)
+        .with("printf \"#{path}\"", {:shell=>"sh"})
+      cap.shell_expand_guest_path(machine, path)
+    end
+  end
+end

data/test/unit/plugins/guests/linux/cap/shell_expand_guest_path_test.rb

@@ -0,0 +1,43 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestLinux::Cap::ShellExpandGuestPath" do
+  let(:caps) do
+    VagrantPlugins::GuestLinux::Plugin
+      .components
+      .guest_capabilities[:linux]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  describe "#shell_expand_guest_path" do
+    let(:cap) { caps.get(:shell_expand_guest_path) }
+
+    it "expands the path" do
+      path = "/home/vagrant/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant/folder")
+
+      cap.shell_expand_guest_path(machine, path)
+    end
+
+    it "raises an exception if no path was detected" do
+      path = "/home/vagrant/folder"
+      expect { cap.shell_expand_guest_path(machine, path) }.
+        to raise_error(Vagrant::Errors::ShellExpandFailed)
+    end
+
+    it "returns a path with a space in it" do
+      path = "/home/vagrant folder/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant folder/folder")
+
+      expect(machine.communicate).to receive(:execute).with("echo; printf \"#{path}\"")
+      cap.shell_expand_guest_path(machine, path)
+    end
+  end
+end

data/test/unit/plugins/guests/netbsd/cap/shell_expand_guest_path_test.rb

@@ -0,0 +1,43 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestNetBSD::Cap::ShellExpandGuestPath" do
+  let(:caps) do
+    VagrantPlugins::GuestNetBSD::Plugin
+      .components
+      .guest_capabilities[:netbsd]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  describe "#shell_expand_guest_path" do
+    let(:cap) { caps.get(:shell_expand_guest_path) }
+
+    it "expands the path" do
+      path = "/home/vagrant/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant/folder")
+
+      cap.shell_expand_guest_path(machine, path)
+    end
+
+    it "raises an exception if no path was detected" do
+      path = "/home/vagrant/folder"
+      expect { cap.shell_expand_guest_path(machine, path) }.
+        to raise_error(Vagrant::Errors::ShellExpandFailed)
+    end
+
+    it "returns a path with a space in it" do
+      path = "/home/vagrant folder/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant folder/folder")
+
+      expect(machine.communicate).to receive(:execute).with("printf \"#{path}\"")
+      cap.shell_expand_guest_path(machine, path)
+    end
+  end
+end

data/test/unit/plugins/guests/omnios/cap/mount_nfs_folder_test.rb

@@ -40,8 +40,6 @@ describe "VagrantPlugins::GuestOmniOS::Cap:RSync" do
       expect(comm.received_commands[0]).to match(/'1.2.3.4:#{hostpath}' '#{guestpath}'/)
     end
 
-    it "mounts with options" do
-      pending "not yet implemented"
-    end
+    it "mounts with options"
   end
 end

data/test/unit/plugins/guests/openbsd/cap/shell_expand_guest_path_test.rb

@@ -0,0 +1,43 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestOpenBSD::Cap::ShellExpandGuestPath" do
+  let(:caps) do
+    VagrantPlugins::GuestOpenBSD::Plugin
+      .components
+      .guest_capabilities[:openbsd]
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  describe "#shell_expand_guest_path" do
+    let(:cap) { caps.get(:shell_expand_guest_path) }
+
+    it "expands the path" do
+      path = "/home/vagrant/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant/folder")
+
+      cap.shell_expand_guest_path(machine, path)
+    end
+
+    it "raises an exception if no path was detected" do
+      path = "/home/vagrant/folder"
+      expect { cap.shell_expand_guest_path(machine, path) }.
+        to raise_error(Vagrant::Errors::ShellExpandFailed)
+    end
+
+    it "returns a path with a space in it" do
+      path = "/home/vagrant folder/folder"
+      allow(machine.communicate).to receive(:execute).
+        with(any_args).and_yield(:stdout, "/home/vagrant folder/folder")
+
+      expect(machine.communicate).to receive(:execute).with("printf \"#{path}\"")
+      cap.shell_expand_guest_path(machine, path)
+    end
+  end
+end