haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5919 from mitchellh/gildegoma/fix-broken-rspec-tests 

core: plugin management requires bundler
This commit is contained in:
Mitchell Hashimoto 2015-07-10 08:58:52 -06:00
parent 8f951291be faeb8a9440
commit c846f3f22a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/shared_helpers.rb
View File

@ -38,11 +38,11 @@ module Vagrant
ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"] ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]
end end
# This returns whether or not 3rd party plugins should be loaded. # This returns whether or not 3rd party plugins should and can be loaded.
# #
# @return [Boolean] # @return [Boolean]
def self.plugins_enabled? def self.plugins_enabled?
!ENV["VAGRANT_NO_PLUGINS"] !ENV["VAGRANT_NO_PLUGINS"] && $vagrant_bundler_runtime
end end
# Whether or not super quiet mode is enabled. This is ill-advised. # Whether or not super quiet mode is enabled. This is ill-advised.

3
test/unit/support/shared/base_context.rb
View File

@ -12,6 +12,9 @@ shared_context "unit" do
# Create a thing to store our temporary files so that they aren't # Create a thing to store our temporary files so that they aren't
# unlinked right away. # unlinked right away.
@_temp_files = [] @_temp_files = []
# Roughly simulate the embedded Bundler availability
$vagrant_bundler_runtime = Object.new
end end
after(:each) do after(:each) do