diff --git a/bin/vagrant b/bin/vagrant index 58568ba49..9acbcb024 100755 --- a/bin/vagrant +++ b/bin/vagrant @@ -166,7 +166,7 @@ begin # 0 - Disables experimental features # 1 - Enables all features # String - Enables one or more features, separated by commas - if Vagrant::Util::Experimental.enabled? + if Vagrant::Util::Experimental.global_enabled? experimental = Vagrant::Util::Experimental.features_requested ui = Vagrant::UI::Prefixed.new(env.ui, "vagrant") logger.debug("Experimental flag is enabled") diff --git a/lib/vagrant/util/experimental.rb b/lib/vagrant/util/experimental.rb index cd05cf85a..667e3f8a7 100644 --- a/lib/vagrant/util/experimental.rb +++ b/lib/vagrant/util/experimental.rb @@ -7,7 +7,7 @@ module Vagrant # A method for determining if the experimental flag has been enabled # # @return [Boolean] - def enabled? + def global_enabled? if !defined?(@_experimental) experimental = ENV["VAGRANT_EXPERIMENTAL"].to_s if experimental != "0" && !experimental.empty? diff --git a/test/unit/vagrant/util/experimental_test.rb b/test/unit/vagrant/util/experimental_test.rb index 7ebe53234..6d1f351b0 100644 --- a/test/unit/vagrant/util/experimental_test.rb +++ b/test/unit/vagrant/util/experimental_test.rb @@ -7,25 +7,25 @@ describe Vagrant::Util::Experimental do before(:each) { described_class.reset! } subject { described_class } - describe "#enabled?" do + describe "#global_enabled?" do it "returns true if enabled with '1'" do allow(ENV).to receive(:[]).with("VAGRANT_EXPERIMENTAL").and_return("1") - expect(subject.enabled?).to eq(true) + expect(subject.global_enabled?).to eq(true) end it "returns true if enabled with a list of features" do allow(ENV).to receive(:[]).with("VAGRANT_EXPERIMENTAL").and_return("list,of,features") - expect(subject.enabled?).to eq(true) + expect(subject.global_enabled?).to eq(true) end it "returns false if disabled" do allow(ENV).to receive(:[]).with("VAGRANT_EXPERIMENTAL").and_return("0") - expect(subject.enabled?).to eq(false) + expect(subject.global_enabled?).to eq(false) end it "returns false if not set" do allow(ENV).to receive(:[]).with("VAGRANT_EXPERIMENTAL").and_return(nil) - expect(subject.enabled?).to eq(false) + expect(subject.global_enabled?).to eq(false) end end