requirements: enable userpaths by default during evaluation

1 files changed, 15 insertions, 11 deletions

diff --git a/Library/Homebrew/test/test_requirement.rb b/Library/Homebrew/test/test_requirement.rb
index 0f1cc02de..0319e9e25 100644
--- a/Library/Homebrew/test/test_requirement.rb
+++ b/Library/Homebrew/test/test_requirement.rb
@@ -45,29 +45,33 @@ class RequirementTests < Test::Unit::TestCase
     assert !req.satisfied?
   end
 
-  def test_satisfy_with_userpaths_from_env
-    ENV.expects(:with_build_environment).yields.returns(true)
-    ENV.expects(:userpaths!)
+  def test_satisfy_with_boolean
     req = Class.new(Requirement) do
-      env :userpaths
-      satisfy(:build_env => true) { true }
+      satisfy true
     end.new
     assert req.satisfied?
   end
 
-  def test_satisfy_with_userpaths_from_options
-    ENV.expects(:with_build_environment).yields.returns(true)
-    ENV.expects(:userpaths!)
+  def test_satisfy_sets_up_build_env_by_default
     req = Class.new(Requirement) do
-      satisfy(:build_env => true, :userpaths => true) { true }
+      env :userpaths
+      satisfy { true }
     end.new
+
+    ENV.expects(:with_build_environment).yields.returns(true)
+    ENV.expects(:userpaths!)
+
     assert req.satisfied?
   end
 
-  def test_satisfy_with_boolean
+  def test_satisfy_build_env_can_be_disabled
     req = Class.new(Requirement) do
-      satisfy true
+      satisfy(:build_env => false) { true }
     end.new
+
+    ENV.expects(:with_build_environment).never
+    ENV.expects(:userpaths!).never
+
     assert req.satisfied?
   end
 end