blinka-reporter 0.3.6 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06c9c5c7a1de551d63e7b5c847e8f63141b3947b2e2438bb99682df7533dbf65
-  data.tar.gz: 04efe62851c48eb4b956f9ab749a3c9910edaa13fdb910e3e21ab1b8687815ce
+  metadata.gz: 7e989cf76be03d9a1010a66f3f76a0b00926a5b294bc07ce532266fed4bd1b0c
+  data.tar.gz: fa30a9180feada7dd619e2e0040bce323114c06655f6c99ed20764fc5fe89538
 SHA512:
-  metadata.gz: f2f18d7a70bec74bfa5df5777f3a31b0b87ec7d957d74a1571e1f6ee25c2e71b897f4ce89314c808579ae3448e28c98263dfe3cdbe03d262a6223d6a821a0c90
-  data.tar.gz: 9212e1935d61b03e366407c0a964fa5726c2d523031a61066f8b19233c9f1da23f38de3b21d5ade2e123f60498402dae054a16c8416856c6f338d81e07c5a725
+  metadata.gz: 31256af730acd4d5521dc3f978df9b379698d0b254eb0cb1df12bdcc885bddb01a98694b9c454b78e9e51d9bca32574e53b07a7563444a08ec5494e1e633a770
+  data.tar.gz: aa9408c278883df6c8958f1a3332d44f666fd5fc0cbcd9c1b246b64f1a6134886947e4b1da68e27c5873b99e5627c0f561c0c6bb2e591aff96652b7d1a4a9bfe

data/lib/blinka_minitest.rb

@@ -44,7 +44,7 @@ class BlinkaMinitest
     elsif @test_result.skipped?
       :skip
     elsif @test_result.failure
-      :failed
+      :fail
     else
       :pass
     end
@@ -61,7 +61,14 @@ class BlinkaMinitest
   def image
     return unless kind == 'system'
 
-    image_path = "./tmp/screenshots/failures_#{name}.png"
+    image_path =
+      if defined?(Capybara) && Capybara.respond_to?(:save_path) &&
+           Capybara.save_path.present?
+        "#{Capybara.save_path}/failures_#{name}.png"
+      else
+        "./tmp/screenshots/failures_#{name}.png"
+      end
+
     return unless File.exist?(image_path)
 
     image_path

data/lib/blinka_reporter/version.rb

@@ -1,3 +1,3 @@
 module BlinkaReporter
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.5.2'.freeze
 end

data/lib/minitest/blinka_plugin.rb

@@ -11,6 +11,7 @@ module Minitest
   def plugin_blinka_options(opts, options); end
 
   module BlinkaPlugin
+    REPORT_PATH = 'blinka_results.json'.freeze
     TAP_COMMENT_PAD = 8
     class Reporter < Minitest::StatisticsReporter
       attr_accessor :tests
@@ -29,7 +30,9 @@ module Minitest
         super
 
         tap_report if ENV['BLINKA_TAP']
-        json_report if ENV['BLINKA_JSON'] || ENV['BLINKA_REPORT']
+        if ENV['BLINKA_JSON'] || ENV['BLINKA_REPORT']
+          json_report(append: !ENV['BLINKA_APPEND'].nil?)
+        end
         BlinkaClient.new.report if ENV['BLINKA_REPORT']
       rescue BlinkaClient::BlinkaError => error
         puts(error)
@@ -37,7 +40,7 @@ module Minitest
 
       private
 
-      def json_report
+      def json_report(append:)
         result = {
           total_time: total_time,
           nbr_tests: count,
@@ -48,12 +51,14 @@ module Minitest
           results:
             tests.map { |test_result| BlinkaMinitest.new(test_result).report }
         }
+        result = append_previous(result) if append
 
-        File.open('blinka_results.json', 'w+') do |file|
+        File.open(REPORT_PATH, 'w+') do |file|
           file.write(JSON.pretty_generate(result))
         end
+
         puts
-        puts('Test results written to `./blinka_results.json`')
+        puts("Test results written to `#{REPORT_PATH}`")
       end
 
       # Based on https://github.com/kern/minitest-reporters/blob/master/lib/minitest/reporters/progress_reporter.rb
@@ -95,6 +100,26 @@ module Minitest
           )
         )
       end
+
+      private
+
+      def parse_report
+        return unless File.exist?(REPORT_PATH)
+        JSON.parse(File.read(REPORT_PATH))
+      end
+
+      def append_previous(result)
+        previous = parse_report
+        return if previous.nil?
+        return if result[:commit] != previous['commit']
+        return if result[:tag] != previous['tag']
+
+        result[:total_time] += previous['total_time'] || 0
+        result[:nbr_tests] += previous['nbr_tests'] || 0
+        result[:nbr_assertions] += previous['nbr_assertions'] || 0
+        result[:results] += previous['results'] || []
+        result
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.5.2
 platform: ruby
 authors:
 - David Wessman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,7 @@ metadata:
   documentation_uri: https://github.com/davidwessman/blinka_reporter
   changelog_uri: https://github.com/davidwessman/blinka_reporter/main/CHANGELOG.md
   source_code_uri: https://github.com/davidwessman/blinka_reporter
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: