Combine superenv tests

2 files changed, 17 insertions, 25 deletions

diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb
index 92b185949..7be01b6ff 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 791502c6c..000000000
--- 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