2 files changed, 32 insertions, 33 deletions
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index c4a9c1587..95bf7e021 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -92,9 +92,7 @@ class FormulaTests < Homebrew::TestCase
   end
 
   def test_installed_prefix_head_active_spec
-    ARGV.stubs(:build_head? => true)
-
-    f = formula do
+    f = formula("test", Pathname.new(__FILE__).expand_path, :head) do
       head 'foo'
       devel do
         url 'foo'
@@ -106,9 +104,7 @@ class FormulaTests < Homebrew::TestCase
   end
 
   def test_installed_prefix_devel_active_spec
-    ARGV.stubs(:build_devel? => true)
-
-    f = formula do
+    f = formula("test", Pathname.new(__FILE__).expand_path, :devel) do
       head 'foo'
       devel do
         url 'foo'
@@ -244,9 +240,7 @@ class FormulaTests < Homebrew::TestCase
   end
 
   def test_head_ignores_revisions
-    ARGV.stubs(:build_head?).returns(true)
-
-    f = formula do
+    f = formula("test", Pathname.new(__FILE__).expand_path, :head) do
       url 'foo-1.0.bar'
       revision 1
       head 'foo'
diff --git a/Library/Homebrew/test/test_formula_spec_selection.rb b/Library/Homebrew/test/test_formula_spec_selection.rb
index 19cdadffd..aeb55fc1a 100644
--- a/Library/Homebrew/test/test_formula_spec_selection.rb
+++ b/Library/Homebrew/test/test_formula_spec_selection.rb
@@ -10,30 +10,6 @@ class FormulaSpecSelectionTests < Homebrew::TestCase
     assert_nil @_f.send(spec)
   end
 
-  def test_selects_head_when_requested
-    ARGV.stubs(:build_head?).returns(true)
-
-    formula do
-      url 'foo-1.0'
-      devel { url 'foo-1.1a' }
-      head 'foo'
-    end
-
-    assert_spec_selected :head
-  end
-
-  def test_selects_devel_when_requested
-    ARGV.stubs(:build_devel?).returns(true)
-
-    formula do
-      url 'foo-1.0'
-      devel { url 'foo-1.1a' }
-      head 'foo'
-    end
-
-    assert_spec_selected :devel
-  end
-
   def test_selects_stable_by_default
     formula do
       url 'foo-1.0'
@@ -98,6 +74,26 @@ class FormulaSpecSelectionTests < Homebrew::TestCase
     assert_spec_selected :devel
   end
 
+  def test_selects_head_when_requested
+    formula("test", Pathname.new(__FILE__).expand_path, :head) do
+      url 'foo-1.0'
+      devel { url 'foo-1.1a' }
+      head 'foo'
+    end
+
+    assert_spec_selected :head
+  end
+
+  def test_selects_devel_when_requested
+    formula("test", Pathname.new(__FILE__).expand_path, :devel) do
+      url 'foo-1.0'
+      devel { url 'foo-1.1a' }
+      head 'foo'
+    end
+
+    assert_spec_selected :devel
+  end
+
   def test_incomplete_devel_not_set
     formula do
       url 'foo-1.0'
@@ -108,4 +104,13 @@ class FormulaSpecSelectionTests < Homebrew::TestCase
     assert_spec_unset :devel
     assert_spec_selected :stable
   end
+
+  def test_does_not_raise_for_missing_spec
+    formula("test", Pathname.new(__FILE__).expand_path, :devel) do
+      url 'foo-1.0'
+      head 'foo'
+    end
+
+    assert_spec_selected :stable
+  end
 end