summaryrefslogtreecommitdiff
path: root/lib/test/unit.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/test/unit.rb')
-rw-r--r--lib/test/unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index b48f49815ba..3048adefac6 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -671,7 +671,7 @@ module Test
when :always
color = true
when :auto, nil
- color = @options[:job_status] == :replace and /mswin|mingw/ !~ RUBY_PLATFORM and /dumb/ !~ ENV["TERM"]
+ color = @options[:job_status] == :replace && /mswin|mingw/ !~ RUBY_PLATFORM && /dumb/ !~ ENV["TERM"]
else
color = false
end