vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/test/unit/plugins/guests/smartos/cap/change_host_name_test.rb

@@ -12,8 +12,8 @@ describe "VagrantPlugins::GuestSmartos::Cap::ChangeHostName" do
   let(:config) { double("config", smartos: VagrantPlugins::GuestSmartos::Config.new) }
 
   before do
-    machine.stub(:communicate).and_return(comm)
-    machine.stub(:config).and_return(config)
+    allow(machine).to receive(:communicate).and_return(comm)
+    allow(machine).to receive(:config).and_return(config)
   end
 
   after do

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

@@ -7,8 +7,8 @@ describe "VagrantPlugins::VagrantPlugins::Cap::ConfigureNetworks" do
   let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
-    machine.stub(:communicate).and_return(communicator)
-    machine.stub(:config).and_return(config)
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(machine).to receive(:config).and_return(config)
   end
 
   after do

data/test/unit/plugins/guests/smartos/cap/halt_test.rb

@@ -8,8 +8,8 @@ describe "VagrantPlugins::GuestSmartos::Cap::Halt" do
   let(:shutdown_command){ "pfexec /usr/sbin/poweroff" }
 
   before do
-    machine.stub(:communicate).and_return(communicator)
-    machine.stub(:config).and_return(config)
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(machine).to receive(:config).and_return(config)
   end
 
   after do

data/test/unit/plugins/guests/smartos/cap/insert_public_key_test.rb

@@ -11,7 +11,7 @@ describe "VagrantPlugins::GuestSmartos::Cap::InsertPublicKey" do
   let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
-    machine.stub(:communicate).and_return(comm)
+    allow(machine).to receive(:communicate).and_return(comm)
   end
 
   after do

data/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb

@@ -13,8 +13,8 @@ describe "VagrantPlugins::GuestSmartos::Cap::MountNFS" do
   let(:config) { double("config", smartos: VagrantPlugins::GuestSmartos::Config.new) }
 
   before do
-    machine.stub(:communicate).and_return(comm)
-    machine.stub(:config).and_return(config)
+    allow(machine).to receive(:communicate).and_return(comm)
+    allow(machine).to receive(:config).and_return(config)
   end
 
   after do

data/test/unit/plugins/guests/smartos/cap/rsync_test.rb

@@ -7,8 +7,8 @@ describe "VagrantPlugins::VagrantPlugins::Cap::Rsync" do
   let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
-    machine.stub(:communicate).and_return(communicator)
-    machine.stub(:config).and_return(config)
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(machine).to receive(:config).and_return(config)
   end
 
   after do

data/test/unit/plugins/guests/windows/cap/insert_public_key_test.rb

@@ -41,7 +41,7 @@ describe "VagrantPlugins::GuestWindows::Cap::InsertPublicKey" do
       it "inserts the public key" do
         expect(comm).to receive(:download)
         expect(comm).to receive(:upload)
-        expect(comm).to receive(:execute).with(/move .*/, shell: "cmd")
+        expect(comm).to receive(:execute).with(/Set-Acl .*/, shell: "powershell")
         cap.insert_public_key(machine, "ssh-rsa ...")
         expect(File.read(@tempfile.path)).to include("ssh-rsa ...")
       end
@@ -56,7 +56,7 @@ describe "VagrantPlugins::GuestWindows::Cap::InsertPublicKey" do
       it "inserts the public key" do
         expect(comm).to_not receive(:download)
         expect(comm).to receive(:upload)
-        expect(comm).to receive(:execute).with(/move .*/, shell: "cmd")
+        expect(comm).to receive(:execute).with(/Set-Acl .*/, shell: "powershell")
         cap.insert_public_key(machine, "ssh-rsa ...")
         expect(File.read(@tempfile.path)).to include("ssh-rsa ...")
       end

data/test/unit/plugins/guests/windows/cap/remove_public_key_test.rb

@@ -27,6 +27,7 @@ describe "VagrantPlugins::GuestWindows::Cap::RemovePublicKey" do
     allow(machine).to receive(:communicate).and_return(comm)
 
     allow(comm).to receive(:execute).with(/echo .+/, shell: "cmd").and_yield(:stdout, "TEMP\r\nHOME\r\n")
+    allow(comm).to receive(:execute).with(/dir .+\.ssh/, shell: "cmd")
     allow(comm).to receive(:execute).with(/dir .+authorized_keys/, shell: "cmd", error_check: false).and_return(auth_keys_check_result)
   end
 
@@ -47,7 +48,7 @@ describe "VagrantPlugins::GuestWindows::Cap::RemovePublicKey" do
       it "removes the public key" do
         expect(comm).to receive(:download)
         expect(comm).to receive(:upload)
-        expect(comm).to receive(:execute).with(/move .*/, shell: "cmd")
+        expect(comm).to receive(:execute).with(/Set-Acl .*/, shell: "powershell")
         cap.remove_public_key(machine, public_key_insecure)
         expect(File.read(@tempfile.path)).to include(public_key_other)
         expect(File.read(@tempfile.path)).to_not include(public_key_insecure)
@@ -57,8 +58,8 @@ describe "VagrantPlugins::GuestWindows::Cap::RemovePublicKey" do
     context "when authorized_keys does not exist on guest" do
       it "does nothing" do
         expect(comm).to_not receive(:download)
-        expect(comm).to_not receive(:upload)
-        expect(comm).to_not receive(:execute).with(/move .*/, shell: "cmd")
+        expect(comm).to receive(:upload)
+        expect(comm).to receive(:execute).with(/Set-Acl .*/, shell: "powershell")
         cap.remove_public_key(machine, public_key_insecure)
       end
     end

data/test/unit/plugins/guests/windows/config_test.rb

@@ -23,7 +23,7 @@ describe VagrantPlugins::GuestWindows::Config do
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, 10)
         subject.finalize!
-        subject.send(attribute).should == 10
+        expect(subject.send(attribute)).to be(10)
       end
 
       it "should return error #{attribute} if nil" do

data/test/unit/plugins/guests/windows/guest_network_test.rb

@@ -12,14 +12,14 @@ describe "VagrantPlugins::GuestWindows::GuestNetwork" do
       expect(communicator).to receive(:test).with(
         /.+Get-WmiObject -Class Win32_NetworkAdapterConfiguration -Filter "Index=7 and DHCPEnabled=True"/).
         and_return(true)
-      expect(subject.is_dhcp_enabled(7)).to be_true
+      expect(subject.is_dhcp_enabled(7)).to be(true)
     end
 
     it "should return false for non-DHCP NICs" do
       expect(communicator).to receive(:test).with(
         /.+Get-WmiObject -Class Win32_NetworkAdapterConfiguration -Filter "Index=8 and DHCPEnabled=True"/).
         and_return(false)
-      expect(subject.is_dhcp_enabled(8)).to be_false
+      expect(subject.is_dhcp_enabled(8)).to be(false)
     end
   end
 

data/test/unit/plugins/hosts/linux/cap/nfs_test.rb

@@ -147,10 +147,12 @@ EOH
 
     it "should retain existing file owner and group IDs" do
       pending("investigate using a simulated FS to test")
+      test_with_simulated_fs
     end
 
     it "should raise custom exception when chown fails" do
       pending("investigate using a simulated FS to test")
+      test_with_simulated_fs
     end
   end
 end

data/test/unit/plugins/kernel_v2/config/push_test.rb

@@ -71,7 +71,7 @@ describe VagrantPlugins::Kernel_V2::PushConfig do
   describe "#__compiled_pushes" do
     it "raises an exception if not finalized" do
       subject.instance_variable_set(:@__finalized, false)
-      expect { subject.__compiled_pushes }.to raise_error
+      expect { subject.__compiled_pushes }.to raise_error(RuntimeError)
     end
 
     it "returns a copy of the compiled pushes" do

data/test/unit/plugins/kernel_v2/config/vm_test.rb

@@ -32,10 +32,10 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
 
   before do
     env = double("env")
-    env.stub(root_path: nil)
-    machine.stub(env: env)
-    machine.stub(provider_config: nil)
-    machine.stub(provider_options: {})
+    allow(env).to receive(:root_path).and_return(nil)
+    allow(machine).to receive(:env).and_return(env)
+    allow(machine).to receive(:provider_config).and_return(nil)
+    allow(machine).to receive(:provider_options).and_return({})
 
     subject.box = "foo"
   end
@@ -356,7 +356,7 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
 
       config = subject.get_provider_config(:virtualbox)
       expect(config.name).to eq("foo")
-      expect(config.gui).to be_true
+      expect(config.gui).to be(true)
     end
 
     it "raises an exception if there is a problem loading" do
@@ -543,7 +543,7 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
       sf = subject.synced_folders
       expect(sf.length).to eq(1)
       expect(sf).to have_key("/vagrant")
-      expect(sf["/vagrant"][:disabled]).to be_true
+      expect(sf["/vagrant"][:disabled]).to be(true)
     end
 
     it "allows overriding previously set options" do
@@ -553,7 +553,7 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
       sf = subject.synced_folders
       expect(sf.length).to eq(1)
       expect(sf).to have_key("/vagrant")
-      expect(sf["/vagrant"][:disabled]).to be_false
+      expect(sf["/vagrant"][:disabled]).to be(false)
       expect(sf["/vagrant"][:foo]).to eq(:bar)
     end
 

data/test/unit/plugins/providers/docker/action/create_test.rb

@@ -15,7 +15,7 @@ describe VagrantPlugins::DockerProvider::Action::Create 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/docker/command/exec_test.rb

@@ -22,7 +22,7 @@ describe VagrantPlugins::DockerProvider::Command::Exec do
   end
 
   before do
-    Vagrant.plugin("2").manager.stub(commands: {})
+    allow(Vagrant.plugin("2").manager).to receive(:commands).and_return({})
     allow(subject).to receive(:exec_command)
   end
 

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

@@ -46,11 +46,11 @@ describe VagrantPlugins::DockerProvider::Config do
     its(:expose) { should eq([]) }
     its(:cmd) { should eq([]) }
     its(:env) { should eq({}) }
-    its(:force_host_vm) { should be_false }
+    its(:force_host_vm) { should be(false) }
     its(:host_vm_build_dir_options) { should be_nil }
     its(:image) { should be_nil }
     its(:name) { should be_nil }
-    its(:privileged) { should be_false }
+    its(:privileged) { should be(false) }
     its(:stop_timeout) { should eq(1) }
     its(:vagrant_machine) { should be_nil }
     its(:vagrant_vagrantfile) { should be_nil }
@@ -63,8 +63,8 @@ describe VagrantPlugins::DockerProvider::Config do
 
   before do
     # By default lets be Linux for validations
-    Vagrant::Util::Platform.stub(linux: true)
-    Vagrant::Util::Platform.stub(linux?: true)
+    allow(Vagrant::Util::Platform).to receive(:linux).and_return(true)
+    allow(Vagrant::Util::Platform).to receive(:linux?).and_return(true)
   end
 
   it "should be invalid if both build dir and image are set" do
@@ -89,6 +89,25 @@ describe VagrantPlugins::DockerProvider::Config do
     end
   end
 
+  describe "#compose" do
+    before do
+      valid_defaults
+    end
+
+    it "should be valid when enabled" do
+      subject.compose = true
+      subject.finalize!
+      assert_valid
+    end
+
+    it "should be invalid when force_host_vm is enabled" do
+      subject.compose = true
+      subject.force_host_vm = true
+      subject.finalize!
+      assert_invalid
+    end
+  end
+
   describe "#create_args" do
     before do
       valid_defaults

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

@@ -41,13 +41,14 @@ describe VagrantPlugins::DockerProvider::Driver::Compose do
     allow(Vagrant::Util::Which).to receive(:which).and_return("/dev/null/docker-compose")
     allow(env).to receive(:lock).and_yield
     allow(Pathname).to receive(:new).with(local_data_path).and_return(local_data_path)
+    allow(Pathname).to receive(:new).with('/host/path').and_call_original
     allow(local_data_path).to receive(:join).and_return(data_directory)
     allow(data_directory).to receive(:mkpath)
     allow(FileUtils).to receive(:mv)
     allow(Tempfile).to receive(:new).with("vagrant-docker-compose").and_return(docker_yml)
     allow(docker_yml).to receive(:write)
     allow(docker_yml).to receive(:close)
-    subject.stub(:execute) do |*args|
+    allow(subject).to receive(:execute) do |*args|
       args.delete_if{|i| i.is_a?(Hash) }
       @cmd = args.join(' ')
     end
@@ -82,11 +83,34 @@ describe VagrantPlugins::DockerProvider::Driver::Compose do
       expect(docker_yml).to receive(:write).with(/#{params[:volumes]}/)
     end
 
+    context 'when links are provided as strings' do
+      before{ params[:links] = ["linkl1:linkr1", "linkl2:linkr2"] }
+
+      it 'links containers' do
+        params[:links].flatten.map{|l| l.split(':')}.each do |link|
+          expect(docker_yml).to receive(:write).with(/#{link}/)
+        end
+        subject.create(params)
+      end
+    end
+
+    context 'with relative path in share folders' do
+      before do
+        params[:volumes] = './path:guest/path'
+        allow(Pathname).to receive(:new).with('./path').and_call_original
+        allow(Pathname).to receive(:new).with('/compose/cwd/path').and_call_original
+      end
+
+      it 'should expand the relative host directory' do
+        expect(docker_yml).to receive(:write).with(%r{/compose/cwd/path})
+      end
+    end
+
     it 'links containers' do
       params[:links].each do |link|
         expect(docker_yml).to receive(:write).with(/#{link}/)
-        subject.create(params)
       end
+      subject.create(params)
     end
 
     it 'sets environmental variables' do
@@ -115,19 +139,21 @@ describe VagrantPlugins::DockerProvider::Driver::Compose 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
@@ -142,43 +168,47 @@ describe VagrantPlugins::DockerProvider::Driver::Compose 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).not_to 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
@@ -186,24 +216,24 @@ describe VagrantPlugins::DockerProvider::Driver::Compose 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).not_to receive(:execute).with('docker', 'stop', '-t', '1', cid)
         subject.stop(cid, 1)
       end
     end
@@ -211,7 +241,7 @@ describe VagrantPlugins::DockerProvider::Driver::Compose 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
         expect(subject).to receive(:execute).with("docker-compose", "-f", "docker-compose.yml", "-p", "cwd", "rm", "-f", "docker_1", {})
@@ -220,7 +250,7 @@ describe VagrantPlugins::DockerProvider::Driver::Compose do
     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
         expect(subject).not_to receive(:execute).with("docker-compose", "-f", "docker-compose.yml", "-p", "cwd", "rm", "-f", "docker_1", {})
@@ -232,10 +262,10 @@ describe VagrantPlugins::DockerProvider::Driver::Compose 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
 
@@ -247,10 +277,10 @@ describe VagrantPlugins::DockerProvider::Driver::Compose 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
@@ -258,10 +288,10 @@ describe VagrantPlugins::DockerProvider::Driver::Compose 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