Skip to content
Snippets Groups Projects
Commit 5480a841 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

tests: give `e` helper in UtilTests a better name

parent 65dde580
No related branches found
No related tags found
No related merge requests found
...@@ -9,14 +9,10 @@ class UtilTests < Homebrew::TestCase ...@@ -9,14 +9,10 @@ class UtilTests < Homebrew::TestCase
@dir = Pathname.new(mktmpdir) @dir = Pathname.new(mktmpdir)
end end
# Helper for matching escape sequences. def esc(code)
def e(code)
/(\e\[\d+m)*\e\[#{code}m/ /(\e\[\d+m)*\e\[#{code}m/
end end
# Helper for matching that style is reset at the end of a string.
Z = /(\e\[\d+m)*\e\[0m\Z/
def test_ofail def test_ofail
shutup { ofail "foo" } shutup { ofail "foo" }
assert Homebrew.failed? assert Homebrew.failed?
...@@ -32,10 +28,12 @@ class UtilTests < Homebrew::TestCase ...@@ -32,10 +28,12 @@ class UtilTests < Homebrew::TestCase
def test_pretty_installed def test_pretty_installed
$stdout.stubs(:tty?).returns true $stdout.stubs(:tty?).returns true
ENV.delete("HOMEBREW_NO_EMOJI") 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" 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 $stdout.stubs(:tty?).returns false
assert_equal "foo", pretty_installed("foo") assert_equal "foo", pretty_installed("foo")
...@@ -44,10 +42,12 @@ class UtilTests < Homebrew::TestCase ...@@ -44,10 +42,12 @@ class UtilTests < Homebrew::TestCase
def test_pretty_uninstalled def test_pretty_uninstalled
$stdout.stubs(:tty?).returns true $stdout.stubs(:tty?).returns true
ENV.delete("HOMEBREW_NO_EMOJI") 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" 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 $stdout.stubs(:tty?).returns false
assert_equal "foo", pretty_uninstalled("foo") assert_equal "foo", pretty_uninstalled("foo")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment