blinka-reporter 0.3.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18126165bf1e12fccca242964c2086abcab1ad37f1ca6b089b5e02edcb0a64b5
-  data.tar.gz: fc47b4d956f56d7c7572e8fd11b4cd9d119d4e14929ac6f73ba35ee20a66abfd
+  metadata.gz: badbf83646cbee4602ea1dc639afe398237a1932615099a733ff84c1acdbb664
+  data.tar.gz: 19dbdeec9e1c8cbf1a4545426e7b0ad88e86aaa01e53abcf6f451bb9ca8ba832
 SHA512:
-  metadata.gz: d362519ba45683ad4cddc22c9fbe7e2f5f72e4281ff5369bda0056789b90ae77d3ddf529728a7c5b305d55a633e719a297e6389c79e4f923138311be1777ce75
-  data.tar.gz: 34416bc8b028746deb93b11a684cfed331c0f7fcb0b0210cc216721faec0c41d99caf3b335a9750db3bc11c131850f04964372b50481a680a6cf1368ee7a1649
+  metadata.gz: 257ec90e005aef2634292bd3f7346e9233f460c830a97adf4349ae89bf27e80c6a67a6b0af961ecb668ed2ec6f58f2777d4b1bc87d95ba5101a55ba812638f5e
+  data.tar.gz: a2795269a1fa2eb0d6716d219c062017f76af7892fdc8c7a390d88f9470583c6d96b448d7a83417fa4877e124bb9c13b5b112e95391974f374d90fe20793d1c2

data/lib/blinka_client.rb

@@ -1,8 +1,12 @@
-require 'mimemagic'
 require 'httparty'
 
 class BlinkaClient
   DEFAULT_HOST = 'https://www.blinka.app'.freeze
+  SUPPORTED_MIME_TYPES = {
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    png: 'image/png'
+  }
 
   include HTTParty
 
@@ -112,7 +116,9 @@ class BlinkaClient
 
     file = File.open(filepath)
     filename = File.basename(filepath)
-    content_type = MimeMagic.by_magic(file).type
+    extension = File.extname(filepath).delete('.').to_sym
+    content_type = SUPPORTED_MIME_TYPES[extension]
+    return if content_type.nil?
 
     presigned_post =
       BlinkaClient.presign_image(filename: filename, content_type: content_type)

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.5'.freeze
+  VERSION = '0.5.1'.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,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.5.1
 platform: ruby
 authors:
 - David Wessman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
-- !ruby/object:Gem::Dependency
-  name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +119,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
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Format tests for Blinka
 test_files: []