Merge pull request #280 from DavidS/default-to-rspec-behaviour

Remove `--color` from everywhere, use RSpec default detection instead
puppetlabs · Feb 19, 2019 · 33247c8 · 33247c8
2 parents e502d1a + 64ce0aa
commit 33247c8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.rspec b/.rspec
@@ -1,3 +1,2 @@
 --format documentation
---color
 --order rand
diff --git a/lib/puppetlabs_spec_helper/rake_tasks.rb b/lib/puppetlabs_spec_helper/rake_tasks.rb
@@ -29,7 +29,7 @@
 pattern = 'spec/{aliases,classes,defines,functions,hosts,integration,plans,tasks,type_aliases,types,unit}/**/*_spec.rb'
 
 RSpec::Core::RakeTask.new(:spec_standalone) do |t, args|
-  t.rspec_opts = ['--color']
+  t.rspec_opts = []
   t.rspec_opts << ENV['CI_SPEC_OPTIONS'] unless ENV['CI_SPEC_OPTIONS'].nil?
   if ENV['CI_NODE_TOTAL'] && ENV['CI_NODE_INDEX']
     ci_total = ENV['CI_NODE_TOTAL'].to_i

diff --git a/lib/puppetlabs_spec_helper/tasks/beaker.rb b/lib/puppetlabs_spec_helper/tasks/beaker.rb
@@ -59,7 +59,7 @@ def vagrant_ssh(set, node = nil)
 
 class SetupBeaker
   def self.setup_beaker(t)
-    t.rspec_opts = ['--color']
+    t.rspec_opts = []
     t.pattern = 'spec/acceptance'
     # TEST_TIERS env variable is a comma separated list of tiers to run. e.g. low, medium, high
     if ENV['TEST_TIERS']

diff --git a/spec/watchr.rb b/spec/watchr.rb
@@ -24,7 +24,7 @@ def run(cmd)
 
 def run_spec_test(file)
   if File.exist? file
-    result = run "rspec --format p --color #{file}"
+    result = run "rspec --format p #{file}"
     growl result.split("\n").last
     puts result
   else