Merge pull request #881 from MikeMcQuaid/dev-cmd-sticky-homebrew-developer

Set HOMEBREW_DEVELOPER automatically

2 files changed, 8 insertions, 12 deletions

diff --git a/Library/Homebrew/test/test_cmd_audit.rb b/Library/Homebrew/test/test_cmd_audit.rb
index 1a52fa628..57d4e754f 100644
--- a/Library/Homebrew/test/test_cmd_audit.rb
+++ b/Library/Homebrew/test/test_cmd_audit.rb
@@ -2,7 +2,7 @@ require "testing_env"
 require "fileutils"
 require "pathname"
 require "formulary"
-require "cmd/audit"
+require "dev-cmd/audit"
 
 class FormulaTextTests < Homebrew::TestCase
   def setup
diff --git a/Library/Homebrew/test/test_commands.rb b/Library/Homebrew/test/test_commands.rb
index b6dd5c2be..c51e81559 100644
--- a/Library/Homebrew/test/test_commands.rb
+++ b/Library/Homebrew/test/test_commands.rb
@@ -29,8 +29,8 @@ class CommandsTests < Homebrew::TestCase
     refute cmds.include?("rbdevcmd"), "Dev commands shouldn't be included"
   end
 
-  def test_internal_development_commands
-    cmds = Homebrew.internal_development_commands
+  def test_internal_developer_commands
+    cmds = Homebrew.internal_developer_commands
     assert cmds.include?("rbdevcmd"), "Ruby commands files should be recognized"
     assert cmds.include?("shdevcmd"), "Shell commands files should be recognized"
     refute cmds.include?("rbcmd"), "Non-dev commands shouldn't be included"
@@ -63,20 +63,16 @@ class CommandsTests < Homebrew::TestCase
 
   def test_internal_command_path
     assert_equal HOMEBREW_LIBRARY_PATH/"cmd/rbcmd.rb",
-                 Homebrew.send(:internal_command_path, "rbcmd")
+                 Commands.path("rbcmd")
     assert_equal HOMEBREW_LIBRARY_PATH/"cmd/shcmd.sh",
-                 Homebrew.send(:internal_command_path, "shcmd")
-    assert_nil Homebrew.send(:internal_command_path, "idontexist1234")
+                 Commands.path("shcmd")
+    assert_nil Commands.path("idontexist1234")
   end
 
   def test_internal_dev_command_path
-    ARGV.stubs(:homebrew_developer?).returns false
-    assert_nil Homebrew.send(:internal_command_path, "rbdevcmd")
-
-    ARGV.stubs(:homebrew_developer?).returns true
     assert_equal HOMEBREW_LIBRARY_PATH/"dev-cmd/rbdevcmd.rb",
-                 Homebrew.send(:internal_command_path, "rbdevcmd")
+                 Commands.path("rbdevcmd")
     assert_equal HOMEBREW_LIBRARY_PATH/"dev-cmd/shdevcmd.sh",
-                 Homebrew.send(:internal_command_path, "shdevcmd")
+                 Commands.path("shdevcmd")
   end
 end