minitest-ci 1.0.2 → 1.0.3

data/lib/minitest/ci.rb

@@ -1,13 +1,37 @@
-gem 'minitest', '2.6.0'
-require "minitest/unit"
-abort 'minitest version 2.6.0 required' unless MiniTest::Unit::VERSION == '2.6.0'
+begin
+  gem 'minitest', '2.6.0'
+  require "minitest/unit"
+rescue Gem::LoadError => e
+  msg = [
+    'minitest version 2.6.0 required',
+    'try: gem install minitest -v 2.6.0'
+  ]
+  raise e.exception msg.join("\n")
+end
 
 require 'fileutils'
 require 'cgi'
 
 module MiniTest
   module Ci
-    VERSION = '1.0.2'
+    ###
+    # copied
+    file = if RUBY_VERSION =~ /^1\.9/ then  # bt's expanded, but __FILE__ isn't :(
+             File.expand_path __FILE__
+           elsif  __FILE__ =~ /^[^\.]/ then # assume both relative
+             require 'pathname'
+             pwd = Pathname.new Dir.pwd
+             pn = Pathname.new File.expand_path(__FILE__)
+             pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
+             pn.to_s
+           else                             # assume both are expanded
+             __FILE__
+           end
+    # end of copy
+    ###
+    CI_MINI_DIR = File.dirname(File.dirname(file))
+
+    VERSION = '1.0.3'
 
     @test_dir = nil #'test/reports'
     @error = nil
@@ -55,6 +79,24 @@ module MiniTest
       FileUtils.mkdir_p @test_dir
     end
 
+    def escape o
+      CGI.escapeHTML(o.to_s)
+    end
+
+    # use original as well as filtering this file.
+    def filter_backtrace bt
+      bt = MiniTest::filter_backtrace bt
+      orig_mini_dir = MiniTest::MINI_DIR
+
+      orig_verbose, $VERBOSE = $VERBOSE, nil
+
+      MiniTest.const_set :MINI_DIR, CI_MINI_DIR
+      MiniTest::filter_backtrace bt
+    ensure
+      MiniTest.const_set :MINI_DIR, orig_mini_dir
+      $VERBOSE = orig_verbose
+    end
+
     def generate_suite name, suite
       total_time, assertions, errors, failures, skips = 0, 0, 0, 0, 0
       suite.each do |_, t, a, e|
@@ -77,9 +119,9 @@ module MiniTest
         suite.each do |method, time, asserts, error|
           f.puts "  <testcase time='#{"%6f" % time}' name='#{method}' assertions='#{asserts}'>"
           if error
-            bt = MiniTest::filter_backtrace(error.backtrace).join "\n"
-            f.write "    <#{type error} type='#{error.class}' message='#{CGI.escapeHTML(error.message)}'>"
-            f.puts CGI.escapeHTML(bt)
+            bt = filter_backtrace(error.backtrace).join "\n"
+            f.write "    <#{type error} type='#{escape error.class}' message='#{escape error.message}'>"
+            f.puts escape bt
             f.puts "    </#{type error}>"
           end
           f.puts "  </testcase>"

data/test/test_minitest_ci.rb

@@ -20,9 +20,13 @@ class MockTestSuite < MiniTest::Unit::TestCase
     pass
   end
 
-  def test_cgi_message
+  def test_invalid_characters_in_message
     raise Object.new.inspect
   end
+
+  def test_invalid_error_name
+    raise Class.new(Exception)
+  end
 end
 
 class TestMinitest
@@ -50,21 +54,22 @@ class TestMinitest::TestCi < MiniTest::Unit::TestCase
   def setup
     file = "#{MiniTest::Ci.test_dir}/TEST-MockTestSuite.xml"
     assert File.exists?( file ), 'expected xml file to exists'
-    @doc = Nokogiri.parse File.read file
+    @file = File.read file
+    @doc = Nokogiri.parse @file
     @doc = @doc.at_xpath('/testsuite')
   end
 
   def test_testsuite
     assert_equal "1", @doc['skipped']
     assert_equal "1", @doc['failures']
-    assert_equal "3", @doc['errors']
+    assert_equal "4", @doc['errors']
     assert_equal "2", @doc['assertions']
-    assert_equal "5", @doc['tests']
+    assert_equal "6", @doc['tests']
     assert_equal "MockTestSuite", @doc['name']
   end
 
   def test_testcase
-    assert_equal 5, @doc.children.count {|c| Nokogiri::XML::Element === c}
+    assert_equal 6, @doc.children.count {|c| Nokogiri::XML::Element === c}
     @doc.children.each do |c|
       next unless Nokogiri::XML::Element === c
       assert_equal 'testcase', c.name
@@ -86,13 +91,26 @@ class TestMinitest::TestCi < MiniTest::Unit::TestCase
     assert_equal 'raise an error', error.at_xpath('failure')['message']
     assert_equal '0', error['assertions']
 
-    error = @doc.at_xpath('/testsuite/testcase[@name="test_cgi_message"]')
+    error = @doc.at_xpath('/testsuite/testcase[@name="test_invalid_characters_in_message"]')
     assert_match( /^#<Object/, error.at_xpath('failure')['message'] )
     assert_equal '0', error['assertions']
+
+    error = @doc.at_xpath('/testsuite/testcase[@name="test_invalid_error_name"]')
+    assert_match( /^#<Class/, error.at_xpath('failure')['message'] )
+    assert_equal '0', error['assertions']
   end
 
   def test_output
     self.class.output.rewind
     assert_match( /generating ci files/, self.class.output.read )
   end
+
+  def test_filter_backtrace
+    bt = begin; raise; rescue => e; e.backtrace; end
+
+    bt = MiniTest::Ci.send :filter_backtrace, bt
+
+    assert_equal 1, bt.size
+    assert_match( /#{__FILE__}/, bt.first )
+  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: minitest-ci
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Brian Henderson
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -07:00
-default_executable: 
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -26,11 +20,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
   type: :development
   version_requirements: *id002
@@ -58,11 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 4
-        - 2
         version: 2.4.2
   type: :development
   version_requirements: *id003
@@ -74,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
         version: "2.12"
   type: :development
   version_requirements: *id004
@@ -104,7 +79,6 @@ files:
 - lib/minitest/ci.rb
 - test/test_minitest_ci.rb
 - .gemtest
-has_rdoc: true
 homepage: https://github.com/bhenderson/minitest-ci
 licenses: []
 
@@ -119,23 +93,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: minitest-ci
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CI reporter plugin for MiniTest This gem was made possible by ATT Interactive.