ci_reporter_minitest 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d64dd80b9c39c5baaefe727fca515d3d0b658f
-  data.tar.gz: 70c430f164924643ea6de9534fbff1959bcb6020
+  metadata.gz: 25670630bb575e8d923d64e3cd01ee46d3b424ec
+  data.tar.gz: 329601383b8e40ab1011fef80c8b5ba37fea75d5
 SHA512:
-  metadata.gz: 43874ba8e95ea7d038e9fc6f4f17623471556dc5d4257914e5a0f99fb7dcab0075375d4cd5e7a004bbdbd24993bcd65b7ed18b87d8bb3aee1257f68b9de37160
-  data.tar.gz: fa3d51753788f67ec984f25e2dcab1b76a1a3056a7385fdc8cf73c6ec009a9964a6b434dc6bc943faf9fb7e51b6d9b52e9b3a3ca30f5097c479ac0fea7214503
+  metadata.gz: 1b8aa967f94e95644da31b16d405712d66768eaf37ef41d8a8e6975324dabf119845e35065635ef9e54d68d895586e768b63d7fd2128af81285d06c7b83c4e1b
+  data.tar.gz: 1f12fd16cd7d59a81a2526fd6d3bcc3d68f8e9d63090fb08c8136f9832e517342797caf1c8e8d7a455bbd85e8d6a684db2e5d585ab0ab777fdf76162a64ac0ee

data/README.md

@@ -3,12 +3,17 @@
 Connects [Minitest][mt] to [CI::Reporter][ci], and then to your CI
 system.
 
+[![Gem Version](https://badge.fury.io/rb/ci_reporter_minitest.svg)](http://badge.fury.io/rb/ci_reporter_minitest)
+[![Build Status](https://travis-ci.org/ci-reporter/ci_reporter_minitest.svg?branch=master)](https://travis-ci.org/ci-reporter/ci_reporter_minitest)
+[![Dependency Status](https://gemnasium.com/ci-reporter/ci_reporter_minitest.svg)](https://gemnasium.com/ci-reporter/ci_reporter_minitest)
+[![Code Climate](https://codeclimate.com/github/ci-reporter/ci_reporter_minitest.png)](https://codeclimate.com/github/ci-reporter/ci_reporter_minitest)
+
 [mt]: https://github.com/seattlerb/minitest
 [ci]: https://github.com/ci-reporter/ci_reporter
 
 ## Supported versions
 
-The latest release of Minitest 2.2 is supported.
+The latest release of Minitest 5.x is supported.
 
 ## Installation
 
@@ -27,7 +32,7 @@ $ bundle
 ## Usage
 
 Require the reporter in your Rakefile, and ensure that
-`ci:setup:minitest` is a dependency of your RSpec task:
+`ci:setup:minitest` is a dependency of your minitest task:
 
 ```ruby
 require 'ci/reporter/rake/minitest'

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
-require 'ci/reporter/internal'
-include CI::Reporter::Internal
+require 'ci/reporter/test_utils/rake'
+include CI::Reporter::TestUtils::Rake
 
 namespace :generate do
   task :clean do
@@ -8,7 +8,7 @@ namespace :generate do
   end
 
   task :minitest do
-    run_ruby_acceptance "-rci/reporter/rake/minitest_loader acceptance/minitest_example_test.rb"
+    run_ruby_acceptance "acceptance/minitest_example_test.rb --ci-reporter"
   end
 
   task :all => [:clean, :minitest]

data/acceptance/minitest_example_test.rb

@@ -1,17 +1,29 @@
 require 'minitest/autorun'
 
-class MiniTestExampleTestOne < MiniTest::Unit::TestCase
-  def test_one
-    puts "Some <![CDATA[on stdout]]>"
+class ExampleWithAFailure < Minitest::Test
+  def test_failure
     assert false
   end
-  def teardown
+end
+
+class ExampleWithAnError < Minitest::Test
+  def test_error
     raise "second failure"
   end
 end
 
-class MiniTestExampleTestTwo < MiniTest::Unit::TestCase
-  def test_two
+class ExampleThatPasses < Minitest::Test
+  def test_passes
     assert true
   end
 end
+
+class ExampleWithOutput < Minitest::Test
+  def test_stdout
+    $stdout.puts "This is stdout!"
+  end
+
+  def test_stderr
+    $stderr.puts "This is stderr!"
+  end
+end

data/acceptance/verification_spec.rb

@@ -1,38 +1,86 @@
 require 'rexml/document'
+require 'rspec/collection_matchers'
+require 'ci/reporter/test_utils/accessor'
+require 'ci/reporter/test_utils/shared_examples'
 
 REPORTS_DIR = File.dirname(__FILE__) + '/reports'
 
 describe "MiniTest::Unit acceptance" do
-  it "should generate two XML files" do
-    File.exist?(File.join(REPORTS_DIR, 'TEST-MiniTestExampleTestOne.xml')).should == true
-    File.exist?(File.join(REPORTS_DIR, 'TEST-MiniTestExampleTestTwo.xml')).should == true
+  include CI::Reporter::TestUtils::SharedExamples
+  Accessor = CI::Reporter::TestUtils::Accessor
+
+  let(:failure_report_path) { File.join(REPORTS_DIR, 'TEST-ExampleWithAFailure.xml') }
+  let(:error_report_path)   { File.join(REPORTS_DIR, 'TEST-ExampleWithAnError.xml') }
+  let(:passing_report_path) { File.join(REPORTS_DIR, 'TEST-ExampleThatPasses.xml') }
+  let(:output_report_path)  { File.join(REPORTS_DIR, 'TEST-ExampleWithOutput.xml') }
+
+  it "generates only one XML file for each test class" do
+    expect(Dir["#{REPORTS_DIR}/*.xml"].count).to eql 4
   end
 
-  it "should have one error and one failure for MiniTestExampleTestOne" do
-    doc = File.open(File.join(REPORTS_DIR, 'TEST-MiniTestExampleTestOne.xml')) do |f|
-      REXML::Document.new(f)
+  context "a test with a failure" do
+    subject(:result) { Accessor.new(load_xml_result(failure_report_path)) }
+
+    it { is_expected.to have(1).failures }
+    it { is_expected.to have(0).errors }
+    it { is_expected.to have(1).testcases }
+
+    describe "the assertion count" do
+      subject { result.assertions_count }
+      it { is_expected.to eql 1 }
+    end
+
+    it_behaves_like "nothing was output"
+    it_behaves_like "a report with consistent attribute counts"
+  end
+
+  context "a test with an error" do
+    subject(:result) { Accessor.new(load_xml_result(error_report_path)) }
+
+    it { is_expected.to have(0).failures }
+    it { is_expected.to have(1).errors }
+    it { is_expected.to have(1).testcases }
+
+    describe "the assertion count" do
+      subject { result.assertions_count }
+      it { is_expected.to eql 0 }
+    end
+
+    it_behaves_like "nothing was output"
+    it_behaves_like "a report with consistent attribute counts"
+  end
+
+  context "a test that outputs to STDOUT and STDERR" do
+    subject(:result) { Accessor.new(load_xml_result(output_report_path)) }
+
+    it "captures the STDOUT" do
+      expect(result.system_out).to eql "This is stdout!"
+    end
+
+    it "captures the STDERR" do
+      expect(result.system_err).to eql "This is stderr!"
     end
-    doc.root.attributes["errors"].should == "1"
-    doc.root.attributes["failures"].should == "1"
-    doc.root.attributes["assertions"].should == "1"
-    doc.root.attributes["tests"].should == "1"
-    doc.root.elements.to_a("/testsuite/testcase").size.should == 1
-    doc.root.elements.to_a("/testsuite/testcase/error").size.should == 1
-    doc.root.elements.to_a("/testsuite/testcase/failure").size.should == 1
-    doc.root.elements.to_a("/testsuite/system-out").first.texts.inject("") do |c,e|
-      c << e.value; c
-    end.strip.should == "Some <![CDATA[on stdout]]>"
   end
 
-  it "should have no errors or failures for MiniTestExampleTestTwo" do
-    doc = File.open(File.join(REPORTS_DIR, 'TEST-MiniTestExampleTestTwo.xml')) do |f|
+  context "a passing test" do
+    subject(:result) { Accessor.new(load_xml_result(passing_report_path)) }
+
+    it { is_expected.to have(0).failures }
+    it { is_expected.to have(0).errors }
+    it { is_expected.to have(1).testcases }
+
+    describe "the assertion count" do
+      subject { result.assertions_count }
+      it { is_expected.to eql 1 }
+    end
+
+    it_behaves_like "nothing was output"
+    it_behaves_like "a report with consistent attribute counts"
+  end
+
+  def load_xml_result(path)
+    File.open(path) do |f|
       REXML::Document.new(f)
     end
-    doc.root.attributes["errors"].should == "0"
-    doc.root.attributes["failures"].should == "0"
-    doc.root.attributes["assertions"].should == "1"
-    doc.root.attributes["tests"].should == "1"
-    doc.root.elements.to_a("/testsuite/testcase").size.should == 1
-    doc.root.elements.to_a("/testsuite/testcase/failure").size.should == 0
   end
 end

data/ci_reporter_minitest.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|acceptance)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "minitest", "~> 2.2.0"
-  spec.add_dependency "ci_reporter", "2.0.0.alpha1"
+  spec.add_dependency "minitest", "~> 5.0"
+  spec.add_dependency "ci_reporter", "2.0.0.alpha2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "rspec-collection_matchers"
+  spec.add_development_dependency "ci_reporter_test_utils"
 end

data/lib/ci/reporter/minitest.rb

@@ -1,219 +1,124 @@
 require 'ci/reporter/core'
-require 'minitest/unit'
+require 'minitest'
 
 module CI
   module Reporter
     class Failure
-      def self.new(fault, type = nil, meth = nil)
-        return MiniTestSkipped.new(fault) if type == :skip
-        return MiniTestFailure.new(fault, meth) if type == :failure
-        MiniTestError.new(fault)
-      end
-    end
-
-    class FailureCore
-      def location(e)
-        last_before_assertion = ""
-        e.backtrace.reverse_each do |s|
-          break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
-          last_before_assertion = s
+      def self.classify(fault)
+        if fault.class == ::Minitest::Assertion
+          MiniTestFailure.new(fault)
+        else
+          MiniTestError.new(fault)
         end
-        last_before_assertion.sub(/:in .*$/, '')
       end
-    end
 
-    class MiniTestSkipped < FailureCore
       def initialize(fault) @fault = fault end
-      def failure?() false end
-      def error?() false end
-      def name() @fault.class.name end
+      def name() @fault.error.class.name end
       def message() @fault.message end
-      def location() super @fault end
+      def location() @fault.location end
     end
 
-    class MiniTestFailure < FailureCore
-      def initialize(fault, meth) @fault = fault; @meth = meth end
+    class MiniTestFailure < Failure
       def failure?() true end
       def error?() false end
-      def name() @meth end
-      def message() @fault.message end
-      def location() super @fault end
     end
 
-    class MiniTestError < FailureCore
-      def initialize(fault) @fault = fault end
+    class MiniTestError < Failure
       def failure?() false end
       def error?() true end
-      def name() @fault.class.name end
-      def message() @fault.message end
-      def location() @fault.backtrace.join("\n") end
     end
 
-    class Runner < MiniTest::Unit
-
-      @@out = $stdout
-
-      def initialize
-        super
-        @report_manager = ReportManager.new("test")
+    class ActualCapture
+      def start
+        @capture_out = OutputCapture.wrap($stdout) {|io| $stdout = io }
+        @capture_err = OutputCapture.wrap($stderr) {|io| $stderr = io }
       end
 
-      def _run_anything(type)
-        suites = MiniTest::Unit::TestCase.send "#{type}_suites"
-        return if suites.empty?
-
-        started_anything type
-
-        sync = output.respond_to? :"sync=" # stupid emacs
-        old_sync, output.sync = output.sync, true if sync
-
-        _run_suites(suites, type)
-
-        output.sync = old_sync if sync
-
-        finished_anything(type)
+      def finish
+        [@capture_out.finish, @capture_err.finish]
       end
+    end
 
-      def _run_suites(suites, type)
-        suites.map { |suite| _run_suite suite, type }
+    class NoCapture
+      def start
       end
 
-      def _run_suite(suite, type)
-        start_suite(suite)
-
-        header = "#{type}_suite_header"
-        puts send(header, suite) if respond_to? header
-
-        filter_suite_methods(suite, type).each do |method|
-          _run_test(suite, method)
-        end
-
-        finish_suite
+      def finish
+        [nil, nil]
       end
+    end
 
-      def _run_test(suite, method)
-        start_case(method)
-
-        result = run_test(suite, method)
-
-        @assertion_count += result._assertions
-        @test_count += 1
-
-        finish_case
-      end
+    class Runner < ::Minitest::AbstractReporter
+      def initialize
+        @report_manager = ReportManager.new("test")
 
-      def puke(klass, meth, e)
-        e = case e
-            when MiniTest::Skip then
-              @skips += 1
-              fault(e, :skip)
-              return "S" unless @verbose
-              "Skipped:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
-            when MiniTest::Assertion then
-              @failures += 1
-              fault(e, :failure, meth)
-              "Failure:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
-            else
-              @errors += 1
-              fault(e, :error)
-              bt = MiniTest::filter_backtrace(e.backtrace).join "\n    "
-              "Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n    #{bt}\n"
-            end
-        @report << e
-        e[0, 1]
+        # We have to handle this ourselves
+        if ENV['CI_CAPTURE'] == "off"
+          @capturer = NoCapture.new
+        else
+          @capturer = ActualCapture.new
+        end
+        ENV['CI_CAPTURE'] = "off"
       end
 
-      private
-
-      def started_anything(type)
-        @test_count = 0
-        @assertion_count = 0
-        @last_assertion_count = 0
-        @result_assertion_count = 0
-        @start = Time.now
-
-        puts
-        puts "# Running #{type}s:"
-        puts
+      def start
+        # We start to capture the std{out,err} here so that it is
+        # available at the end of the first test run.
+        @capturer.start
       end
 
-      def finished_anything(type)
-        t = Time.now - @start
-        puts
-        puts
-        puts "Finished #{type}s in %.6fs, %.4f tests/s, %.4f assertions/s." %
-          [t, @test_count / t, @assertion_count / t]
+      def record(result)
+        # Get the std{out,err} of the now-finished test before
+        # changing suites so that its lifecycle matches `result`.
+        stdout, stderr = @capturer.finish
+        @capturer.start
 
-        report.each_with_index do |msg, i|
-          puts "\n%3d) %s" % [i + 1, msg]
+        # This is the only method that gets to know what test and
+        # suite we are in, and is only called at the granularity of a
+        # test. We have to work backwards to understand when the suite
+        # changes.
+        if @current_suite_class != result.class
+          finish_suite
+          start_suite
         end
 
-        puts
+        @current_suite_class = result.class
+        @current_suite.name = result.class.to_s
 
-        status
-      end
-
-      def filter_suite_methods(suite, type)
-        filter = options[:filter] || '/./'
-        filter = Regexp.new $1 if filter =~ /\/(.*)\//
+        tc = TestCase.new(result.name, result.time, result.assertions)
+        tc.failures = result.failures.map {|f| Failure.classify(f)}
+        tc.skipped = result.skipped?
 
-        suite.send("#{type}_methods").grep(filter)
+        @current_suite.testcases << tc
+        @current_suite.assertions += tc.assertions
+        @current_suite_stdout << stdout
+        @current_suite_stderr << stderr
       end
 
-      def run_test(suite, method)
-        inst = suite.new method
-        inst._assertions = 0
-
-        print "#{suite}##{method} = " if @verbose
-
-        @start_time = Time.now
-        result = inst.run self
-        time = Time.now - @start_time
-
-        print "%.2f s = " % time if @verbose
-        print result
-        puts if @verbose
-
-        return inst
+      def report
+        finish_suite
       end
 
-      def start_suite(suite_name)
-        @current_suite = CI::Reporter::TestSuite.new(suite_name)
+      private
+
+      def start_suite
+        @current_suite = TestSuite.new("placeholder suite name")
         @current_suite.start
-      end
 
-      def finish_suite
-        if @current_suite
-          @current_suite.finish
-          @current_suite.assertions = @assertion_count - @last_assertion_count
-          @last_assertion_count = @assertion_count
-          @report_manager.write_report(@current_suite)
-        end
+        @current_suite.assertions = 0
+        @current_suite_stdout = []
+        @current_suite_stderr = []
       end
 
-      def start_case(test_name)
-        tc = CI::Reporter::TestCase.new(test_name)
-        tc.start
-        @current_suite.testcases << tc
-      end
+      def finish_suite
+        return unless @current_suite
 
-      def finish_case
-        tc = @current_suite.testcases.last
-        tc.finish
-        tc.assertions = @assertion_count - @result_assertion_count
-        @result_assertion_count = @assertion_count
-      end
+        @current_suite.finish
+        @current_suite.stdout = @current_suite_stdout.join
+        @current_suite.stderr = @current_suite_stderr.join
 
-      def fault(fault, type = nil, meth = nil)
-        tc = @current_suite.testcases.last
-        if :skip == type
-          tc.skipped = true
-        else
-          tc.failures << Failure.new(fault, type, meth)
-        end
+        @report_manager.write_report(@current_suite)
       end
-
     end
-
   end
 end

data/lib/ci/reporter/minitest/version.rb

@@ -1,7 +1,7 @@
 module CI
   module Reporter
-    class Minitest
-      VERSION = "0.0.1"
+    module Minitest
+      VERSION = "0.0.2"
     end
   end
 end

data/lib/ci/reporter/rake/minitest.rb

@@ -4,8 +4,7 @@ namespace :ci do
   namespace :setup do
     task :minitest do
       rm_rf ENV["CI_REPORTS"] || "test/reports"
-      test_loader = CI::Reporter.maybe_quote_filename "#{File.dirname(__FILE__)}/minitest_loader.rb"
-      ENV["TESTOPTS"] = "#{ENV["TESTOPTS"]} #{test_loader}"
+      ENV["TESTOPTS"] = "#{ENV["TESTOPTS"]} --ci-reporter"
     end
   end
 end

data/lib/minitest/ci_reporter_plugin.rb

@@ -0,0 +1,14 @@
+module Minitest
+  def self.plugin_ci_reporter_options(opts, options)
+    opts.on "--ci-reporter", "Output to CI::Reporter" do
+      options[:ci_reporter] = true
+    end
+  end
+
+  def self.plugin_ci_reporter_init(options)
+    if options[:ci_reporter]
+      require 'ci/reporter/minitest'
+      self.reporter << CI::Reporter::Runner.new
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci_reporter_minitest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick Sieger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha1
+        version: 2.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha1
+        version: 2.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter_test_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - nick@nicksieger.com
@@ -102,7 +130,7 @@ files:
 - lib/ci/reporter/minitest.rb
 - lib/ci/reporter/minitest/version.rb
 - lib/ci/reporter/rake/minitest.rb
-- lib/ci/reporter/rake/minitest_loader.rb
+- lib/minitest/ci_reporter_plugin.rb
 homepage: https://github.com/ci-reporter/ci_reporter_minitest
 licenses:
 - MIT

data/lib/ci/reporter/rake/minitest_loader.rb

@@ -1,5 +0,0 @@
-$: << File.dirname(__FILE__) + "/../../.."
-require 'ci/reporter/minitest'
-
-# set defaults
-MiniTest::Unit.runner = CI::Reporter::Runner.new