summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2010-11-17 18:09:17 -0800
committerAndre Arko <andre@arko.net>2010-11-17 18:09:17 -0800
commit3e1e26c3eaf6ce4a702644175bab34874736f9cb (patch)
treed8165bde00f092bbcf886a9004528c9cee134cf8 /spec
parent942c4b3b5421ab73cd4102589ac23941d7997d6c (diff)
downloadbundler-3e1e26c3eaf6ce4a702644175bab34874736f9cb.tar.gz
Sudo.present? != Sudo.test_sudo?, so separate them
Diffstat (limited to 'spec')
-rw-r--r--spec/spec_helper.rb2
-rw-r--r--spec/support/sudo.rb6
2 files changed, 6 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 899170c593..a5f17dba63 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -40,7 +40,7 @@ RSpec.configure do |config|
config.include Spec::Sudo
config.filter_run :focused => true unless ENV['CI']
- config.filter_run_excluding :sudo => true unless Spec::Sudo.present?
+ config.filter_run_excluding :sudo => true unless Spec::Sudo.test_sudo?
config.run_all_when_everything_filtered = true
config.alias_example_to :fit, :focused => true
diff --git a/spec/support/sudo.rb b/spec/support/sudo.rb
index 2b2c72b6de..3530e126de 100644
--- a/spec/support/sudo.rb
+++ b/spec/support/sudo.rb
@@ -2,7 +2,11 @@ module Spec
module Sudo
def self.present?
@which_sudo ||= (`which sudo`.chomp rescue '')
- !@which_sudo.empty? && ENV['BUNDLER_SUDO_TESTS']
+ !@which_sudo.empty?
+ end
+
+ def self.test_sudo?
+ present? && ENV['BUNDLER_SUDO_TESTS']
end
def sudo(cmd)