A platform for community discussion. Free, open, simple.
DEV: Set LOAD_PLUGIN=1 in bin/rspec in more cases (#40514)
Martin Brennan506068b24588
diff --git a/bin/rspec b/bin/rspecindex 6cb4281c6e1..6ecd833153a 100755--- a/bin/rspec+++ b/bin/rspec@@ -14,7 +14,14 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE_require "rubygems"require "bundler/setup"-if ENV["LOAD_PLUGINS"].nil? && ARGV.any? { |pattern| pattern.include?("plugins/") }+if ENV["LOAD_PLUGINS"].nil? &&+ ARGV.any? { |pattern|+ pattern.include?("plugins/") ||+ (+ ENV.key?("DISCOURSE_REPO_BASE_DIRECTORY") &&+ !pattern.include?(ENV["DISCOURSE_REPO_BASE_DIRECTORY"] + "/spec")+ )+ }STDERR.puts "Detected plugin spec path, setting LOAD_PLUGINS to 1"ENV["LOAD_PLUGINS"] = "1"end