blinka-reporter 0.2.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda58bde54cfddafa7711c984e477a7781299f90874a137e4e396dd048885afe
-  data.tar.gz: 41ce526368565e1f97884fb13977f8833081681a2f63e29343e78508c4f4535a
+  metadata.gz: d84bd0f016744a88e06403d6f01f730004bf3cfb31b36394174f1335c12cd103
+  data.tar.gz: 3ab3b1744b8be12c29227e080ed0a39e6039ff63e0e883063d21b5c80a212290
 SHA512:
-  metadata.gz: f98b19c0df3fe63a02c322d53c22bdca62a473d106a3984a6803fc856e1203028e4de3f4b1f9d902b399fad285294218ee47c736f6f2f3b984c5ba63048d40fd
-  data.tar.gz: 0d701507d2ae55c3d022694c212a668d91804acbe18040e0476d8bf585f098edc1fc0dbe4a51a7d340c56fcc3309c4aeec6cc199b1990e4f1430e98314d190c7
+  metadata.gz: cd1ee46a25fb0c799ae89054c6b835f11aea3883420320d5809160b2315ad1eb93640aea7588b1509fb744c79dc7fb6a5a35b3b47ba493cdc81b2bcb65ee671a
+  data.tar.gz: 97c433c7f79f60e8441376f47fcc9d937e2d1c02db93d67793655aed288d0367eea13d02fa1a7833ff6a299611e3c971f121d8b5169cc7d0f2dcf4b93e0cde73

data/lib/blinka_client.rb

@@ -2,6 +2,10 @@ require 'mimemagic'
 require 'httparty'
 
 class BlinkaClient
+  DEFAULT_HOST = 'https://www.blinka.app'.freeze
+
+  include HTTParty
+
   class BlinkaConfig
     attr_reader(
       :tag,
@@ -12,13 +16,14 @@ class BlinkaClient
       :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)
+      @commit = BlinkaClient.find_commit
 
       if @team_id.nil? || @team_secret.nil? || @repository.nil?
         raise(BlinkaError, <<~EOS)
@@ -32,7 +37,6 @@ class BlinkaClient
   end
 
   class BlinkaError < StandardError; end
-  include HTTParty
 
   def initialize
     @config = BlinkaConfig.new
@@ -40,6 +44,18 @@ class BlinkaClient
   end
 
   def report(filepath: './blinka_results.json')
+    unless File.exist?(filepath)
+      raise(
+        BlinkaError,
+        '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)
 
@@ -88,6 +104,19 @@ class BlinkaClient
     else
       raise(BlinkaError, "Could not report, got response code #{response.code}")
     end
+  rescue => error
+    raise(BlinkaError, <<-EOS)
+      BLINKA:
+        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:)
@@ -169,4 +198,11 @@ class BlinkaClient
       }
     }
   end
+
+  def self.find_commit
+    ENV.fetch(
+      'BLINKA_COMMIT',
+      ENV.fetch('HEROKU_TEST_RUN_COMMIT_VERSION', `git rev-parse HEAD`.chomp)
+    )
+  end
 end

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/minitest/blinka_plugin.rb

@@ -1,6 +1,7 @@
 require 'minitest'
 require 'json'
 require 'blinka_minitest'
+require 'blinka_client'
 
 module Minitest
   def self.plugin_blinka_init(options)
@@ -25,15 +26,18 @@ module Minitest
       end
 
       def report
-        tap_report unless ENV['BLINKA_TAP'].nil?
-        blinka_report
-
+        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
 
-      def blinka_report
+      def json_report
         result = {
           total_time: total_time,
           nbr_tests: count,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.4
 platform: ruby
 authors:
 - David Wessman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,6 +94,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: []