blinka-reporter 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e193271a3f7ffc8d089ac8e4484edb68e7a8783a1b138ceee55ba667b720e2
-  data.tar.gz: 70dfd466a32dba39ea0d0d28713ed979d56cdbc2cc5451cf35b54464c3ecf42e
+  metadata.gz: 06c9c5c7a1de551d63e7b5c847e8f63141b3947b2e2438bb99682df7533dbf65
+  data.tar.gz: 04efe62851c48eb4b956f9ab749a3c9910edaa13fdb910e3e21ab1b8687815ce
 SHA512:
-  metadata.gz: 2f1bd80ac40f5d2b68a6a72ff166d490835c4c58996d2019d4309cc0806ca19c7588f26f0930c8dbf25f099f7c195c06f191eb2852c4f025e266896356c9c049
-  data.tar.gz: 55abf722700a5a475d1e24fd93a7885c57a6b6272cc383c975b33e7707ae4df415f6560e3a00d9387da7d1dcd60830ec6589b4fee6439e713477e344b1aef501
+  metadata.gz: f2f18d7a70bec74bfa5df5777f3a31b0b87ec7d957d74a1571e1f6ee25c2e71b897f4ce89314c808579ae3448e28c98263dfe3cdbe03d262a6223d6a821a0c90
+  data.tar.gz: 9212e1935d61b03e366407c0a964fa5726c2d523031a61066f8b19233c9f1da23f38de3b21d5ade2e123f60498402dae054a16c8416856c6f338d81e07c5a725

data/lib/blinka_client.rb

@@ -1,24 +1,23 @@
-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
+
   class BlinkaConfig
-    attr_reader(
-      :tag,
-      :commit,
-      :host,
-      :repository,
-      :team_id,
-      :team_secret,
-      :jwt_token
-    )
+    attr_reader(:host, :repository, :team_id, :team_secret, :jwt_token)
+
     def initialize
-      @host = ENV.fetch('BLINKA_HOST', 'https://www.blinka.app')
+      @host = ENV.fetch('BLINKA_HOST', DEFAULT_HOST)
       @team_id = ENV.fetch('BLINKA_TEAM_ID', nil)
       @team_secret = ENV.fetch('BLINKA_TEAM_SECRET', nil)
       @repository = ENV.fetch('BLINKA_REPOSITORY', nil)
-      @tag = ENV.fetch('BLINKA_TAG', '')
-      @commit = ENV.fetch('BLINKA_COMMIT', `git rev-parse HEAD`.chomp)
 
       if @team_id.nil? || @team_secret.nil? || @repository.nil?
         raise(BlinkaError, <<~EOS)
@@ -32,7 +31,6 @@ class BlinkaClient
   end
 
   class BlinkaError < StandardError; end
-  include HTTParty
 
   def initialize
     @config = BlinkaConfig.new
@@ -46,6 +44,12 @@ class BlinkaClient
         'Could not find blinka_results.json, did tests run with environment variable BLINKA_JSON=true set?'
       )
     end
+
+    if ENV.fetch('BLINKA_ALLOW_WEBMOCK_DISABLE', 'true') == 'true' &&
+         defined?(WebMock) && WebMock.respond_to?(:disable!)
+      WebMock.disable!
+    end
+
     self.authenticate
     data = JSON.parse(File.open(filepath).read)
 
@@ -65,13 +69,13 @@ class BlinkaClient
     body = {
       report: {
         repository: @config.repository,
-        tag: @config.tag,
-        commit: @config.commit,
+        tag: data['tag'],
+        commit: data['commit'],
         metadata: {
-          total_time: data.dig('total_time'),
-          nbr_tests: data.dig('nbr_tests'),
-          nbr_assertions: data.dig('nbr_assertions'),
-          seed: data.dig('seed')
+          total_time: data['total_time'],
+          nbr_tests: data['nbr_tests'],
+          nbr_assertions: data['nbr_assertions'],
+          seed: data['seed']
         }.compact,
         results: results
       }
@@ -88,9 +92,7 @@ class BlinkaClient
       )
     case response.code
     when 200
-      puts "Reported #{data.dig('nbr_tests')} tests of commit #{
-             @config.commit
-           }!"
+      puts "Reported #{data['nbr_tests']} tests of commit #{data['commit']}!"
     else
       raise(BlinkaError, "Could not report, got response code #{response.code}")
     end
@@ -100,6 +102,13 @@ class BlinkaClient
         Failed to create report because of #{error.class} with message:
         #{error.message}
       EOS
+  ensure
+    WebMock.enable! if defined?(WebMock) && WebMock.respond_to?(:enable!)
+  end
+
+  def self.report(filepath: './blinka_results.json')
+    client = BlinkaClient.new
+    client.report(filepath: filepath)
   end
 
   def self.upload_image(filepath:)
@@ -107,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

@@ -1,5 +1,4 @@
 class BlinkaMinitest
-  attr_reader(:test_result)
   def initialize(test_result)
     @test_result = test_result
   end
@@ -8,14 +7,19 @@ class BlinkaMinitest
     @path ||= source_location.first.gsub(Dir.getwd, '').delete_prefix('/')
   end
 
+  def line
+    @line ||= source_location.last
+  end
+
   # Handle broken API in Minitest between 5.10 and 5.11
   # https://github.com/minitest-reporters/minitest-reporters/blob/e9092460b5a5cf5ca9eb375428217cbb2a7f6dbb/lib/minitest/reporters/default_reporter.rb#L159
   def source_location
-    if test_result.respond_to?(:klass)
-      test_result.source_location
-    else
-      test_result.method(test_result.name).source_location
-    end
+    @source_location ||=
+      if @test_result.respond_to?(:klass)
+        @test_result.source_location
+      else
+        @test_result.method(@test_result.name).source_location
+      end
   end
 
   def kind
@@ -24,47 +28,34 @@ class BlinkaMinitest
   end
 
   def message
-    failure = test_result.failure
+    failure = @test_result.failure
     return unless failure
     "#{failure.error.class}: #{failure.error.message}"
   end
 
   def backtrace
-    return unless test_result.failure
-    Minitest.filter_backtrace(test_result.failure.backtrace)
+    return unless @test_result.failure
+    Minitest.filter_backtrace(@test_result.failure.backtrace)
   end
 
   def result
-    if test_result.error?
+    if @test_result.error?
       :error
-    elsif test_result.skipped?
+    elsif @test_result.skipped?
       :skip
-    elsif test_result.failure
+    elsif @test_result.failure
       :failed
     else
       :pass
     end
   end
 
-  def line
-    current_backtrace = backtrace
-    return if current_backtrace.nil?
-
-    row =
-      current_backtrace
-        .map { |row| row.split(':')[0..1] }
-        .detect { |row| row[0] == path }
-
-    return if row.nil?
-    row[1].to_i
-  end
-
   def time
-    test_result.time
+    @test_result.time
   end
 
   def name
-    test_result.name
+    @test_result.name
   end
 
   def image

data/lib/blinka_reporter/version.rb

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

data/lib/minitest/blinka_plugin.rb

@@ -26,13 +26,13 @@ module Minitest
       end
 
       def report
+        super
+
         tap_report if ENV['BLINKA_TAP']
         json_report if ENV['BLINKA_JSON'] || ENV['BLINKA_REPORT']
         BlinkaClient.new.report if ENV['BLINKA_REPORT']
       rescue BlinkaClient::BlinkaError => error
         puts(error)
-      ensure
-        super
       end
 
       private
@@ -42,6 +42,8 @@ module Minitest
           total_time: total_time,
           nbr_tests: count,
           nbr_assertions: assertions,
+          commit: find_commit,
+          tag: ENV.fetch('BLINKA_TAG', ''),
           seed: options[:seed],
           results:
             tests.map { |test_result| BlinkaMinitest.new(test_result).report }
@@ -83,6 +85,16 @@ module Minitest
       def print_padded_comment(line)
         puts "##{' ' * TAP_COMMENT_PAD + line}"
       end
+
+      def find_commit
+        ENV.fetch(
+          'BLINKA_COMMIT',
+          ENV.fetch(
+            'HEROKU_TEST_RUN_COMMIT_VERSION',
+            `git rev-parse HEAD`.chomp
+          )
+        )
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - David Wessman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !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
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
 description: Use to format test results from Minitest to use with Blinka.
 email: david@wessman.co
 executables: []
@@ -102,12 +102,18 @@ extra_rdoc_files: []
 files:
 - lib/blinka_client.rb
 - lib/blinka_minitest.rb
+- lib/blinka_reporter/version.rb
 - lib/minitest/blinka_plugin.rb
 homepage: https://github.com/davidwessman/blinka_reporter
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/davidwessman/blinka_reporter
+  bug_tracker_uri: https://github.com/davidwessman/blinka_reporter/issues
+  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:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,7 +129,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: []