Merge pull request #66 from sbl/pride_bug

Don't use the --pride option for Minitest < 5.0
guard · Jun 19, 2013 · 16a6112 · 16a6112
2 parents e9864dc + 05311fc
commit 16a6112
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/guard/minitest/runner.rb b/lib/guard/minitest/runner.rb
@@ -108,13 +108,13 @@ def ruby_command(paths)
         cmd_parts += paths.map { |path| "-r ./#{path}" }
         if ::MiniTest::Unit::VERSION =~ /^5/
           cmd_parts << '-e \'Minitest.autorun\''
+          cmd_parts << '--pride' # uses pride for output colorization
         else
           cmd_parts << "-r #{File.expand_path('../runners/old_runner.rb', __FILE__)}"
           cmd_parts << '-e \'MiniTest::Unit.autorun\''
         end
         cmd_parts << '--'
         cmd_parts += cli_options
-        cmd_parts << '--pride' # uses pride for output colorization
       end
 
       def relative_paths(paths)

diff --git a/spec/guard/minitest/runner_spec.rb b/spec/guard/minitest/runner_spec.rb
@@ -8,6 +8,7 @@
     @old_runner = ::MiniTest::Unit::VERSION =~ /^5/ ? '' : " #{File.expand_path('../../../../lib/guard/minitest/runners/old_runner.rb', __FILE__)}"
     @minitest_autorun = ::MiniTest::Unit::VERSION =~ /^5/ ? 'Minitest.autorun' : 'MiniTest::Unit.autorun'
     @require_old_runner = ::MiniTest::Unit::VERSION =~ /^5/ ? '' : " -r#{@old_runner}"
+    @default_run_arguments = ::MiniTest::Unit::VERSION =~ /^5/ ? '--pride --' : '--'
   end
 
   describe 'options' do
@@ -131,7 +132,7 @@
     it 'should run with specified seed' do
       runner = subject.new(:test_folders => %w[test], :cli => '--seed 12345')
       runner.expects(:system).with(
-        "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' -- --seed 12345 --pride"
+        "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' #{@default_run_arguments} --seed 12345"
       )
 
       runner.run(['test/test_minitest.rb'])
@@ -140,7 +141,7 @@
     it 'should run in verbose mode' do
       runner = subject.new(:test_folders => %w[test], :cli => '--verbose')
       runner.expects(:system).with(
-        "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' -- --verbose --pride"
+        "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' #{@default_run_arguments} --verbose"
       )
 
       runner.run(['test/test_minitest.rb'])
@@ -156,7 +157,7 @@
         runner = subject.new(:test_folders => %w[test])
         Guard::UI.expects(:info)
         runner.expects(:system).with(
-          "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' -- --pride"
+          "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' #{@default_run_arguments}"
         )
 
         runner.run(['test/test_minitest.rb'])
@@ -166,7 +167,7 @@
         runner = subject.new(:test_folders => %w[test], :rubygems => true)
         Guard::UI.expects(:info)
         runner.expects(:system).with(
-          "ruby -I\"test\" -r rubygems -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' -- --pride"
+          "ruby -I\"test\" -r rubygems -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' #{@default_run_arguments}"
         )
 
         runner.run(['test/test_minitest.rb'])
@@ -183,7 +184,7 @@
         runner = subject.new(:test_folders => %w[test], :bundler => true, :rubygems => false)
         Guard::UI.expects(:info)
         runner.expects(:system).with(
-          "bundle exec ruby -I\"test\" -r bundler/setup -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' -- --pride"
+          "bundle exec ruby -I\"test\" -r bundler/setup -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' #{@default_run_arguments}"
         )
 
         runner.run(['test/test_minitest.rb'])
@@ -193,7 +194,7 @@
         runner = subject.new(:test_folders => %w[test], :bundler => false, :rubygems => true)
         Guard::UI.expects(:info)
         runner.expects(:system).with(
-          "ruby -I\"test\" -r rubygems -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' -- --pride"
+          "ruby -I\"test\" -r rubygems -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' #{@default_run_arguments}"
         )
 
         runner.run(['test/test_minitest.rb'], :bundler => false, :rubygems => true)
@@ -203,7 +204,7 @@
         runner = subject.new(:test_folders => %w[test], :bundler => false, :rubygems => false)
         Guard::UI.expects(:info)
         runner.expects(:system).with(
-          "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' -- --pride"
+          "ruby -I\"test\" -r ./test/test_minitest.rb#{@require_old_runner} -e '#{@minitest_autorun}' #{@default_run_arguments}"
         )
 
         runner.run(['test/test_minitest.rb'], :bundler => false, :rubygems => false)