From cf063c6e38ea0bc79680ce1b5f5b137ff7d8cf02 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Tue, 21 Apr 2020 14:53:42 -0700 Subject: [PATCH] Update validation to look for if provider_config is empty not nil --- plugins/kernel_v2/config/disk.rb | 2 +- test/unit/plugins/kernel_v2/config/disk_test.rb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/kernel_v2/config/disk.rb b/plugins/kernel_v2/config/disk.rb index b84e71e3d..6f3b6c6ca 100644 --- a/plugins/kernel_v2/config/disk.rb +++ b/plugins/kernel_v2/config/disk.rb @@ -184,7 +184,7 @@ module VagrantPlugins end end - if @provider_config + if !@provider_config.empty? if !@provider_config.keys.include?(machine.provider_name) machine.env.ui.warn(I18n.t("vagrant.config.disk.missing_provider", machine: machine.name, diff --git a/test/unit/plugins/kernel_v2/config/disk_test.rb b/test/unit/plugins/kernel_v2/config/disk_test.rb index ebb0f4103..0d7a39959 100644 --- a/test/unit/plugins/kernel_v2/config/disk_test.rb +++ b/test/unit/plugins/kernel_v2/config/disk_test.rb @@ -9,8 +9,11 @@ describe VagrantPlugins::Kernel_V2::VagrantConfigDisk do subject { described_class.new(type) } + let(:ui) { double("ui") } + let(:env) { double("env", ui: ui) } let(:provider) { double("provider") } - let(:machine) { double("machine", provider: provider, provider_name: :virtualbox) } + let(:machine) { double("machine", name: "name", provider: provider, env: env, + provider_name: :virtualbox) } def assert_invalid