From 3516bb68d3ca06d14fbcec343fa8792cef922792 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Thu, 12 Dec 2013 15:42:31 -0600
Subject: [PATCH] Combine superenv tests

---
 Library/Homebrew/test/test_ENV.rb      | 17 +++++++++++++++++
 Library/Homebrew/test/test_superenv.rb | 25 -------------------------
 2 files changed, 17 insertions(+), 25 deletions(-)
 delete mode 100644 Library/Homebrew/test/test_superenv.rb

diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb
index 92b1859491..7be01b6ff9 100644
--- a/Library/Homebrew/test/test_ENV.rb
+++ b/Library/Homebrew/test/test_ENV.rb
@@ -138,7 +138,24 @@ end
 class SuperenvTests < Test::Unit::TestCase
   include SharedEnvTests
 
+  attr_reader :env, :bin
+
   def setup
     @env = {}.extend(Superenv)
+    @bin = HOMEBREW_REPOSITORY/"Library/ENV/#{MacOS::Xcode.version}"
+    bin.mkpath
+  end
+
+  def test_bin
+    assert_equal bin, Superenv.bin
+  end
+
+  def test_initializes_deps
+    assert_equal [], env.deps
+    assert_equal [], env.keg_only_deps
+  end
+
+  def teardown
+    bin.rmtree
   end
 end
diff --git a/Library/Homebrew/test/test_superenv.rb b/Library/Homebrew/test/test_superenv.rb
deleted file mode 100644
index 791502c6c1..0000000000
--- a/Library/Homebrew/test/test_superenv.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'testing_env'
-require 'extend/ENV/super'
-
-class SuperenvTests < Test::Unit::TestCase
-  attr_reader :env, :bin
-
-  def setup
-    @env = {}.extend(Superenv)
-    @bin = HOMEBREW_REPOSITORY/"Library/ENV/#{MacOS::Xcode.version}"
-    bin.mkpath
-  end
-
-  def test_bin
-    assert_equal bin, Superenv.bin
-  end
-
-  def test_initializes_deps
-    assert_equal [], env.deps
-    assert_equal [], env.keg_only_deps
-  end
-
-  def teardown
-    bin.rmtree
-  end
-end