danger-junit_results 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 288b1a00d07f2396a6a417944fe37ac8164e4657
-  data.tar.gz: c1daafacda0d15fcecb4c5e927dbfff12c621193
+SHA256:
+  metadata.gz: '08054050ad852d71fa44771604ffdd2dfc7729b31ab769fcb0fe8c3092603216'
+  data.tar.gz: 2ce9a4ba88a9f7d7ca40db3f9f20593c2948a773b3cff009690af60c0b0e9a7e
 SHA512:
-  metadata.gz: 4d9d2c6b4e58b587713a419b630a20f68e802cddbd1291c0ebc2211d81c014fabdcbc639c278e2da1e5bf8ebd81ddcbc6dcaca2d73493f89b7fdeb5b0c51e897
-  data.tar.gz: f2bd69875ba56047d5eea881e71756f6de1828d7ad2ada40365a1cdc08c5d674f62d61ca2f8a93eebbf160b3aae167e61a9c44963d061c0b2a4d120aeb69658a
+  metadata.gz: 845e29368ef67224f67312cbea89788fca84ca3e60f2d51c20f20e457fb58616a34a49a2c883e3c8cd2026c0b960735e181902ad28c27f7576505479ff8ca624
+  data.tar.gz: 86dc85a60dc70a5f8e770da15d2edb238c97c47899640385294bd470c341e1c018fde3e166228d45416226ea40d36f0f12565a2f7d86c407461304c6d3d38b28

data/.github/workflows/ruby.yml

@@ -0,0 +1,38 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 pkg
 .idea/
+.yardoc

data/Gemfile.lock

@@ -1,52 +1,77 @@
 PATH
   remote: .
   specs:
-    danger-junit_results (0.0.4)
+    danger-junit_results (0.0.5)
       danger-plugin-api (~> 1.0)
-      nokogiri
+      nokogiri (~> 1.13)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    claide (1.0.1)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    coderay (1.1.1)
-    colored (1.2)
-    cork (0.2.0)
-      colored (~> 1.2)
-    danger (4.0.3)
+    coderay (1.1.3)
+    colored2 (3.1.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (8.6.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
-      git (~> 1)
-      kramdown (~> 1.5)
-      octokit (~> 4.2)
-      terminal-table (~> 1)
+      faraday (>= 0.9.0, < 2.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.7)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (>= 1, < 4)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    diff-lcs (1.2.5)
-    faraday (0.10.0)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
-      faraday (~> 0.8)
-    ffi (1.9.14)
-    formatador (0.2.5)
-    git (1.3.0)
-    guard (2.14.0)
+    diff-lcs (1.5.0)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.4.1)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    git (1.12.0)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -54,70 +79,81 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (1.13.1)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     listen (3.0.7)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
-    lumberjack (1.0.10)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    multipart-post (2.0.0)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    multipart-post (2.2.3)
     nap (1.1.0)
     nenv (0.3.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    notiffany (0.1.1)
+    no_proxy_fix (0.1.2)
+    nokogiri (1.13.8-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.8-x86_64-linux)
+      racc (~> 1.4)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.6.2)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     open4 (1.3.4)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.4)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.0.0)
+    racc (1.6.0)
     rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rchardet (1.8.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
-    slop (3.6.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    thor (0.19.4)
-    unicode-display_width (1.1.1)
-    yard (0.9.5)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    unicode-display_width (2.2.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler (~> 2.3)
   danger-junit_results!
-  guard (~> 2.14)
+  guard (~> 2.18)
   guard-rspec (~> 4.7)
   listen (= 3.0.7)
-  pry
+  pry (~> 0.13)
   rake (~> 10.0)
   rspec (~> 3.4)
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.13.6
+   2.3.21

data/danger-junit_results.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
-  spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.13'
 
   # General ruby development
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'rake', '~> 10.0'
 
   # Testing support
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard", "~> 0.8"
 
   # Makes testing easy via `bundle exec guard`
-  spec.add_development_dependency 'guard', '~> 2.14'
+  spec.add_development_dependency 'guard', '~> 2.18'
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
 
   # If you want to work on older builds of ruby
@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
   #    require 'pry'
   #    binding.pry
   # This will stop test execution and let you inspect the results
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry', '~> 0.13'
 end

data/lib/junit_results/gem_version.rb

@@ -1,3 +1,3 @@
 module JunitResults
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end

data/lib/junit_results/plugin.rb

@@ -14,9 +14,11 @@ module Danger
 
     def initialize(arg)
         super
+        @total_count = 0
         @skipped_count = 0
         @executed_count = 0
         @failed_count = 0
+        @retried_count = 0
     end
 
     # Total number of tests.
@@ -39,6 +41,11 @@ module Danger
     # @return   [failed_count]
     attr_reader :failed_count
 
+    # Total number of tests retried.
+    #
+    # @return   [retried_count]
+    attr_reader :retried_count
+
     # An array of XML elements of the failed tests.
     #
     # @return   [Array<Nokogiri::XML::Element>]
@@ -51,13 +58,13 @@ module Danger
       require 'nokogiri'
 
       @doc = Nokogiri::XML(File.open(file_path))
-
-      @total_count = @doc.xpath('//testsuite').map { |x| x.attr('tests').to_i }.inject(0){ |sum, x| sum + x }
+      groupedByName = @doc.xpath('//testcase').group_by { |x| "#{x.attr('classname')}.#{x.attr('name')}" }
+      @retried_count = groupedByName.reduce(0) { |sum, (key, value)| sum + (value.count - 1) }
+      @total_count = @doc.xpath('//testsuite').map { |x| x.attr('tests').to_i }.inject(0){ |sum, x| sum + x } - @retried_count
       @skipped_count = @doc.xpath('//testsuite').map { |x| x.attr('skipped').to_i }.inject(0){ |sum, x| sum + x }
       @executed_count = @total_count - @skipped_count
-      @failed_count = @doc.xpath('//testsuite').map { |x| x.attr('failures').to_i }.inject(0){ |sum, x| sum + x }
-
-      @failures = @doc.xpath('//failure')
+      @failures = groupedByName.map { |(key, value)| value.last().xpath('failure') }.select { |x| !x.empty?() }.flatten
+      @failed_count = @failures.count
 
       return @failed_count <= 0
     end
@@ -68,12 +75,15 @@ module Danger
     def report
       tests_executed_string = @executed_count == 1 ? "test" : "tests"
       tests_failed_string = @failed_count == 1 ? "failure" : "failures"
+      tests_retried_string = @retried_count == 1 ? "retry" : "retries"
 
       if @failed_count > 0
         fail("Executed #{@executed_count}(#{@total_count}) #{tests_executed_string}, with **#{@failed_count}** #{tests_failed_string} 🚨")
         @failures.each do |failure|
           fail("`[#{failure.content.split("/").last}] [#{failure.parent['name']}] #{failure['message']}`")
         end
+      elsif @retried_count > 0
+        message("Executed #{@executed_count}(#{@total_count}) #{tests_executed_string}, with #{@failed_count} #{tests_failed_string} and #{@retried_count} #{tests_retried_string} 🎉")
       else
         message("Executed #{@executed_count}(#{@total_count}) #{tests_executed_string}, with #{@failed_count} #{tests_failed_string} 🎉")
       end

data/spec/fixtures/junit-report-retries.xml

@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<testsuites name='myProjectTests.xctest' tests='5' failures='1'>
+  <testsuite name='myProjectTests.RetryTests' tests='5' failures='1'>
+    <testcase classname='myProjectTests.RetryTests' name='testFail'>
+      <failure message='failed - hello world'>myProjectTests/RetryTests.swift:23</failure>
+    </testcase>
+    <testcase classname='myProjectTests.RetryTests' name='testFail' time='0.001'/>
+    <testcase classname='myProjectTests.RetryTests' name='testRegister' time='0.015'/>
+    <testcase classname='myProjectTests.RetryTests' name='testRegisterWithError' time='0.005'/>
+    <testcase classname='myProjectTests.RetryTests' name='testRegisterWithUserAlreadyExistsError' time='0.003'/>
+  </testsuite>
+</testsuites>

data/spec/junit_results_spec.rb

@@ -73,6 +73,36 @@ module Danger
 
       end
 
+      describe 'with retries' do
+
+        before do
+          @junit_results.parse("./spec/fixtures/junit-report-retries.xml")
+        end
+
+        it "has to parse tests" do
+
+          expect(@junit_results.total_count).to eq(4)
+          expect(@junit_results.skipped_count).to eq(0)
+          expect(@junit_results.executed_count).to eq(4)
+          expect(@junit_results.failed_count).to eq(0)
+          expect(@junit_results.retried_count).to eq(1)
+          expect(@junit_results.failures).to be_empty
+          expect(@dangerfile.status_report[:messages]).to be_empty
+          expect(@dangerfile.status_report[:warnings]).to be_empty
+          expect(@dangerfile.status_report[:errors]).to be_empty
+          expect(@dangerfile.status_report[:markdowns]).to be_empty
+        end
+
+        it "has to report successfully" do
+          expect(@junit_results.report).to be true
+          expect(@dangerfile.status_report[:messages].first).to eq("Executed 4(4) tests, with 0 failures and 1 retry 🎉")
+          expect(@dangerfile.status_report[:warnings]).to be_empty
+          expect(@dangerfile.status_report[:errors]).to be_empty
+          expect(@dangerfile.status_report[:markdowns]).to be_empty
+        end
+
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-junit_results
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Valerio Mazzeo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -28,30 +28,30 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.18'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 description: Exposes test results summary with detailed failures, given a path to
   a JUnit report file.
 email:
@@ -158,8 +158,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -172,6 +172,7 @@ files:
 - lib/junit_results/gem_version.rb
 - lib/junit_results/plugin.rb
 - spec/fixtures/junit-report-failures.xml
+- spec/fixtures/junit-report-retries.xml
 - spec/fixtures/junit-report.xml
 - spec/junit_results_spec.rb
 - spec/spec_helper.rb
@@ -179,7 +180,7 @@ homepage: https://github.com/valeriomazzeo/danger-junit_results
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -194,14 +195,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Exposes test results summary with detailed failures, given a path to a JUnit
   report file.
 test_files:
 - spec/fixtures/junit-report-failures.xml
+- spec/fixtures/junit-report-retries.xml
 - spec/fixtures/junit-report.xml
 - spec/junit_results_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-cache:
-  directories:
-    - bundle
-
-rvm:
-  - 2.0
-  - 2.1.3
-  - 2.3.1
-
-script:
-    - bundle exec rake spec
-
-notifications:
-  email: false