Merge a8050c8 into 6610df3

rails · Jan 27, 2020 · 13cc5d3 · 13cc5d3
2 parents 6610df3 + a8050c8
commit 13cc5d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/lib/thor/shell/color.rb b/lib/thor/shell/color.rb
@@ -101,7 +101,7 @@ def can_display_colors?
       end
 
       def are_colors_supported?
-        stdout.tty? && ![nil, "dumb"].include?(ENV["TERM"])
+        stdout.tty? && ENV["TERM"] != "dumb"
       end
 
       def are_colors_disabled?

diff --git a/spec/shell/color_spec.rb b/spec/shell/color_spec.rb
@@ -145,12 +145,6 @@ def shell
       expect(colorless).to eq("hi!")
     end
 
-    it "does nothing when the TERM environment variable is not set" do
-      allow(ENV).to receive(:[]).with("TERM").and_return(nil)
-      colorless = shell.set_color "hi!", :white
-      expect(colorless).to eq("hi!")
-    end
-
     it "does nothing when the NO_COLOR environment variable is set" do
       allow(ENV).to receive(:[]).with("NO_COLOR").and_return("")
       allow($stdout).to receive(:tty?).and_return(true)