diff options
| author | Greg Nisbet | 2016-08-10 23:19:09 -0700 |
|---|---|---|
| committer | Greg Nisbet | 2016-08-10 23:19:09 -0700 |
| commit | 9a29a306cfd6b116a0cb696ce56bd7bc7679a8e3 (patch) | |
| tree | 19eefeaea0baf5c39e2ea0795d2774ae852a8022 /Library/Homebrew/test/test_utils.rb | |
| parent | 06fe347de97975dc01e726f87bf07a56a6fb713e (diff) | |
| download | brew-9a29a306cfd6b116a0cb696ce56bd7bc7679a8e3.tar.bz2 | |
resolve conflict in diagnostic.rb
Diffstat (limited to 'Library/Homebrew/test/test_utils.rb')
| -rw-r--r-- | Library/Homebrew/test/test_utils.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test_utils.rb index 9b55965b5..3d30baf9c 100644 --- a/Library/Homebrew/test/test_utils.rb +++ b/Library/Homebrew/test/test_utils.rb @@ -1,6 +1,7 @@ require "testing_env" require "utils" require "tempfile" +require "utils/shell" class TtyTests < Homebrew::TestCase def test_strip_ansi @@ -157,15 +158,15 @@ class UtilTests < Homebrew::TestCase def test_shell_profile ENV["SHELL"] = "/bin/sh" - assert_equal "~/.bash_profile", shell_profile + assert_equal "~/.bash_profile", Utils::Shell.shell_profile ENV["SHELL"] = "/bin/bash" - assert_equal "~/.bash_profile", shell_profile + assert_equal "~/.bash_profile", Utils::Shell.shell_profile ENV["SHELL"] = "/bin/another_shell" - assert_equal "~/.bash_profile", shell_profile + assert_equal "~/.bash_profile", Utils::Shell.shell_profile ENV["SHELL"] = "/bin/zsh" - assert_equal "~/.zshrc", shell_profile + assert_equal "~/.zshrc", Utils::Shell.shell_profile ENV["SHELL"] = "/bin/ksh" - assert_equal "~/.kshrc", shell_profile + assert_equal "~/.kshrc", Utils::Shell.shell_profile end def test_popen_read |