Merge pull request #1196 from rspec/correct_rake_task_exit_code

rspec command exits with non zero status, 0 failures

lib/rspec/core/rake_task.rb

@@ -97,7 +97,10 @@ def run_task(verbose)
         rescue
           puts failure_message if failure_message
         end
-        abort("#{command} failed") if fail_on_error unless success
+        if fail_on_error && !success
+          $stderr.puts "#{command} failed"
+          exit $?.exitstatus
+        end
       end
 
     private

spec/rspec/core/rake_task_spec.rb

@@ -53,6 +53,17 @@ def spec_command
       end
     end
 
+    context 'with custom exit status' do
+      it 'returns the correct status on exit' do
+        with_isolated_stderr do
+          expect($stderr).to receive(:puts) { |cmd| expect(cmd).to match /-e "exit\(2\);".* failed/ }
+          expect(task).to receive(:exit).with(2)
+          task.ruby_opts = '-e "exit(2);" ;#'
+          task.run_task false
+        end
+      end
+    end
+
     def specify_consistent_ordering_of_files_to_run(pattern, task)
       orderings = [
         %w[ a/1.rb a/2.rb a/3.rb ],

spec/spec_helper.rb

@@ -122,13 +122,23 @@ def without_env_vars(*vars)
     end
   end
 
+  module StdErrIsolation
+    def with_isolated_stderr
+      original = $stderr
+      $stderr = StringIO.new
+      yield
+      $stderr = original
+    end
+  end
+
   require 'rspec/support/spec'
 
   RSpec.configure do |c|
     # structural
     c.alias_it_behaves_like_to 'it_has_behavior'
     c.around {|example| Sandboxing.sandboxed { example.run }}
     c.include(RSpecHelpers)
+    c.include(StdErrIsolation)
     c.include Aruba::Api, :example_group => {
       :file_path => /spec\/command_line/
     }