diff --git a/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb index 714e633d8..42f666c30 100644 --- a/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb +++ b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do let(:machine) { double("machine") } diff --git a/test/unit/plugins/guests/smartos/cap/change_host_name_test.rb b/test/unit/plugins/guests/smartos/cap/change_host_name_test.rb index 1d9a84692..3c91edf92 100644 --- a/test/unit/plugins/guests/smartos/cap/change_host_name_test.rb +++ b/test/unit/plugins/guests/smartos/cap/change_host_name_test.rb @@ -1,4 +1,5 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" +require_relative "../../../../../../plugins/guests/smartos/config" describe "VagrantPlugins::VagrantPlugins::Cap::ChangeHostName" do let(:plugin) { VagrantPlugins::GuestSmartos::Plugin.components.guest_capabilities[:smartos].get(:change_host_name) } @@ -30,4 +31,3 @@ describe "VagrantPlugins::VagrantPlugins::Cap::ChangeHostName" do end end end - diff --git a/test/unit/plugins/guests/smartos/cap/configure_networks_test.rb b/test/unit/plugins/guests/smartos/cap/configure_networks_test.rb index ca47a988f..7d6312a24 100644 --- a/test/unit/plugins/guests/smartos/cap/configure_networks_test.rb +++ b/test/unit/plugins/guests/smartos/cap/configure_networks_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" describe "VagrantPlugins::VagrantPlugins::Cap::ConfigureNetworks" do let(:plugin) { VagrantPlugins::GuestSmartos::Plugin.components.guest_capabilities[:smartos].get(:configure_networks) } diff --git a/test/unit/plugins/guests/smartos/cap/halt_test.rb b/test/unit/plugins/guests/smartos/cap/halt_test.rb index 782fc6b09..664b77ec8 100644 --- a/test/unit/plugins/guests/smartos/cap/halt_test.rb +++ b/test/unit/plugins/guests/smartos/cap/halt_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" describe "VagrantPlugins::VagrantPlugins::Cap::Halt" do let(:plugin) { VagrantPlugins::GuestSmartos::Plugin.components.guest_capabilities[:smartos].get(:halt) } diff --git a/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb b/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb index b4038f76a..d41dcd808 100644 --- a/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb +++ b/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" describe "VagrantPlugins::VagrantPlugins::Cap::MountNFS" do let(:plugin) { VagrantPlugins::GuestSmartos::Plugin.components.guest_capabilities[:smartos].get(:mount_nfs_folder) } diff --git a/test/unit/plugins/guests/smartos/cap/rsync_test.rb b/test/unit/plugins/guests/smartos/cap/rsync_test.rb index ed2b20e78..1c3deb716 100644 --- a/test/unit/plugins/guests/smartos/cap/rsync_test.rb +++ b/test/unit/plugins/guests/smartos/cap/rsync_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" describe "VagrantPlugins::VagrantPlugins::Cap::Rsync" do let(:plugin) { VagrantPlugins::GuestSmartos::Plugin.components.guest_capabilities[:smartos].get(:rsync_installed) } diff --git a/test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb b/test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb index ba258261f..ce43cf84c 100644 --- a/test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb +++ b/test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" describe "VagrantPlugins::GuestTinyCore::Cap::ChangeHostName" do let(:described_class) do diff --git a/test/unit/plugins/guests/windows/cap/change_host_name_test.rb b/test/unit/plugins/guests/windows/cap/change_host_name_test.rb index 1f8b45170..33bf261ba 100644 --- a/test/unit/plugins/guests/windows/cap/change_host_name_test.rb +++ b/test/unit/plugins/guests/windows/cap/change_host_name_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" require Vagrant.source_root.join("plugins/guests/windows/cap/change_host_name") diff --git a/test/unit/plugins/guests/windows/cap/halt_test.rb b/test/unit/plugins/guests/windows/cap/halt_test.rb index da4f51f38..913cba188 100644 --- a/test/unit/plugins/guests/windows/cap/halt_test.rb +++ b/test/unit/plugins/guests/windows/cap/halt_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" require Vagrant.source_root.join("plugins/guests/windows/cap/halt") diff --git a/test/unit/plugins/guests/windows/cap/mount_shared_folder_test.rb b/test/unit/plugins/guests/windows/cap/mount_shared_folder_test.rb index bd443142b..851c71da7 100644 --- a/test/unit/plugins/guests/windows/cap/mount_shared_folder_test.rb +++ b/test/unit/plugins/guests/windows/cap/mount_shared_folder_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" require Vagrant.source_root.join("plugins/guests/windows/cap/mount_shared_folder") diff --git a/test/unit/plugins/guests/windows/cap/reboot_test.rb b/test/unit/plugins/guests/windows/cap/reboot_test.rb index 8297b9a26..afa50d381 100644 --- a/test/unit/plugins/guests/windows/cap/reboot_test.rb +++ b/test/unit/plugins/guests/windows/cap/reboot_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" require Vagrant.source_root.join("plugins/guests/windows/cap/reboot") diff --git a/test/unit/plugins/guests/windows/cap/rsync_test.rb b/test/unit/plugins/guests/windows/cap/rsync_test.rb index e28a5b3fb..d32568c40 100644 --- a/test/unit/plugins/guests/windows/cap/rsync_test.rb +++ b/test/unit/plugins/guests/windows/cap/rsync_test.rb @@ -1,4 +1,4 @@ -require File.expand_path("../../../../../base", __FILE__) +require_relative "../../../../base" require Vagrant.source_root.join("plugins/guests/windows/cap/rsync")