aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/test
diff options
context:
space:
mode:
authorAlyssa Ross2017-01-23 18:24:31 +0000
committerAlyssa Ross2017-01-24 11:25:26 +0000
commit5480a84114243fcd0aedda3a650b23b59ae91b2c (patch)
treefe494a459cd468e6a6e711e090be28e904ba27e7 /Library/Homebrew/test
parent65dde58057029d473be9175444b333525fe82850 (diff)
downloadbrew-5480a84114243fcd0aedda3a650b23b59ae91b2c.tar.bz2
tests: give `e` helper in UtilTests a better name
Diffstat (limited to 'Library/Homebrew/test')
-rw-r--r--Library/Homebrew/test/utils_test.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/test/utils_test.rb b/Library/Homebrew/test/utils_test.rb
index 7ae5793e2..1f2fb7b55 100644
--- a/Library/Homebrew/test/utils_test.rb
+++ b/Library/Homebrew/test/utils_test.rb
@@ -9,14 +9,10 @@ class UtilTests < Homebrew::TestCase
@dir = Pathname.new(mktmpdir)
end
- # Helper for matching escape sequences.
- def e(code)
+ def esc(code)
/(\e\[\d+m)*\e\[#{code}m/
end
- # Helper for matching that style is reset at the end of a string.
- Z = /(\e\[\d+m)*\e\[0m\Z/
-
def test_ofail
shutup { ofail "foo" }
assert Homebrew.failed?
@@ -32,10 +28,12 @@ class UtilTests < Homebrew::TestCase
def test_pretty_installed
$stdout.stubs(:tty?).returns true
ENV.delete("HOMEBREW_NO_EMOJI")
- assert_match(/\A#{e 1}foo #{e 32}✔#{Z}/, pretty_installed("foo"))
+ tty_with_emoji_output = /\A#{esc 1}foo #{esc 32}✔#{esc 0}\Z/
+ assert_match tty_with_emoji_output, pretty_installed("foo")
ENV["HOMEBREW_NO_EMOJI"] = "1"
- assert_match(/\A#{e 1}foo \(installed\)#{Z}/, pretty_installed("foo"))
+ tty_no_emoji_output = /\A#{esc 1}foo \(installed\)#{esc 0}\Z/
+ assert_match tty_no_emoji_output, pretty_installed("foo")
$stdout.stubs(:tty?).returns false
assert_equal "foo", pretty_installed("foo")
@@ -44,10 +42,12 @@ class UtilTests < Homebrew::TestCase
def test_pretty_uninstalled
$stdout.stubs(:tty?).returns true
ENV.delete("HOMEBREW_NO_EMOJI")
- assert_match(/\A#{e 1}foo #{e 31}✘#{Z}/, pretty_uninstalled("foo"))
+ tty_with_emoji_output = /\A#{esc 1}foo #{esc 31}✘#{esc 0}\Z/
+ assert_match tty_with_emoji_output, pretty_uninstalled("foo")
ENV["HOMEBREW_NO_EMOJI"] = "1"
- assert_match(/\A#{e 1}foo \(uninstalled\)#{Z}/, pretty_uninstalled("foo"))
+ tty_no_emoji_output = /\A#{esc 1}foo \(uninstalled\)#{esc 0}\Z/
+ assert_match tty_no_emoji_output, pretty_uninstalled("foo")
$stdout.stubs(:tty?).returns false
assert_equal "foo", pretty_uninstalled("foo")