blinka-reporter 0.7.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d91f6af985c1f6006c8764e5b9a33c6b44a7f29a4ce101704cc924c1671ef53
-  data.tar.gz: caee878d2c6208ac19d39ffe936470c1e010117fec558e243edfab66db9a1d5a
+  metadata.gz: b3cf58900ce1f0eb96c9feb8dc5468c2e4f51c80b8f06c501988439d2a9b241b
+  data.tar.gz: c61e2b22ae72069c8355b277b9f52ebddedfc59217e8d2ac9595fd2ce73b095f
 SHA512:
-  metadata.gz: '040953ad949228b1a23f60323a084d7854cd09c802b498db43fa52e7d81317c136caee762580fec3d07142c59d973a005ad9c80d040f4fbe1501f6fb36dfd2ab'
-  data.tar.gz: 9b01fc45223ce2a111ba85b3260d8965cb633e4f4317cf0bfb965b8e5c8582a7a394d501c417141c3377bd6ba6830da6829eeb4eaf2bb48ea68d606f6727de94
+  metadata.gz: 502fc7e5acbcf80175728d8bf11185437291a986e6f895c262bcd0a025448340518d6c7a05643b911763b31d569f851fe037080f5b636e2e15330840c0173549
+  data.tar.gz: 34348eb00a80ccf7e752d5d0bb628a042b6c96ac431a332726e516d73bd27acfe4da3018e3cd80acfea36ff204fafefc3917d119302b54848a9e22e1caba29cd

data/.github/dependabot.yml

@@ -16,3 +16,9 @@ updates:
     schedule:
       interval: "daily"
     target-branch: "main"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "main"

data/.github/workflows/main.yml

@@ -10,11 +10,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -49,7 +49,7 @@ jobs:
 
       - name: Blinka - Archive
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: blinka-${{ strategy.job-index }}
           path: |

data/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.4.8

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.4.8

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0] - 2026-01-20
+
+- Support Minitest 6.
+
+## [0.8.0] - 2023-03-04
+
+- Removes support for reporting to Blinka, removing the need for httparty.
+- Makes `Capybara.save_path` relative to the current working directory for images
+
 ## [0.7.2] - 2023-02-19
 
 - Adds support for `BLINKA_APPEND=true` to append to existing JSON-files.

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in blinka_reporter.gemspec
 gemspec

data/README.md

@@ -16,7 +16,7 @@ gem install blinka-reporter
 or add to your Gemfile
 
 ```ruby
-gem 'blinka-reporter', '~> 0.7.0'
+gem 'blinka-reporter', '~> 0.7.2'
 ```
 
 ## Which ruby testing frameworks are supported?
@@ -34,6 +34,12 @@ Blinka is a web service developed by [@davidwessman](https://github.com/davidwes
 
 ### Minitest
 
+Minitest 6 no longer auto-loads plugins by default, so make sure the Blinka plugin is loaded in your test helper (eg `test/test_helper.rb`):
+
+```ruby
+require "minitest/blinka_plugin"
+```
+
 ```sh
 BLINKA_PATH=./tests.json bundle exec rails test
 ```
@@ -48,11 +54,6 @@ Make sure [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter)
 bundle exec rspec --formatter RspecJunitFormatter --out ./rspec.xml
 ```
 
-## How to send report to Blinka?
-
-1. Output your test results as described [above](#how-to-generate-test-report-in-the-right-format).
-1. `bundle exec blinka_reporter --path {./blinka_results.json,./rspec.xml} --blinka --team-id <BLINKA_TEAM_ID> --team-secret <BLINKA_TEAM_SECRET> --repository davidwessman/blinka_reporter`
-
 ## How can I send report in Github Action?
 
 Add a step to your Github Action Workflow after running tests:
@@ -74,7 +75,7 @@ Add a step to your Github Action Workflow after running tests:
 // Blinka will automatically fetch the results when the Github Action Workflow is finished.
 - name: Archive results for Blinka
   if: always()
-  uses: actions/upload-artifact@v3
+  uses: actions/upload-artifact@v4
   with:
     name: blinka-${{ strategy.job-index }}
     path: |
@@ -115,7 +116,7 @@ Output the test results to different paths with `BLINKA_PATH`.
 
 - name: Tests
   env:
-    BLINKA_JSON: ./tests.json
+    BLINKA_PATH: ./tests.json
   run: bundle exec rails test
 
 - name: Archive results for Blinka

data/Rakefile

@@ -1,7 +1,7 @@
-require 'rake/testtask'
-require 'dotenv/load'
+require "rake/testtask"
+require "dotenv/load"
 
-Rake::TestTask.new { |t| t.libs << 'test' }
+Rake::TestTask.new { |t| t.libs << "test" }
 
-desc('Run tests')
+desc("Run tests")
 task(default: :test)

data/blinka_reporter.gemspec

@@ -1,41 +1,39 @@
-require_relative 'lib/blinka_reporter/version'
+require_relative "lib/blinka_reporter/version"
 
 Gem::Specification.new do |gem|
-  gem.authors = ['David Wessman']
+  gem.authors = ["David Wessman"]
   gem.description =
-    'Use to format test results from Minitest to use with Blinka.'
-  gem.email = 'david@wessman.co'
-  gem.homepage = 'https://github.com/davidwessman/blinka_reporter'
-  gem.license = 'MIT'
-  gem.summary = 'Format tests for Blinka'
+    "Use to format test results from Minitest to use with Blinka."
+  gem.email = "david@wessman.co"
+  gem.homepage = "https://github.com/davidwessman/blinka_reporter"
+  gem.license = "MIT"
+  gem.summary = "Format tests for Blinka"
 
   gem.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',
-    'rubygems_mfa_required' => 'true'
+    "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",
+    "rubygems_mfa_required" => "true"
   }
 
   gem.files =
-    Dir.chdir(File.expand_path('..', __FILE__)) do
-      `git ls-files -z`
-        .split("\x0")
+    Dir.chdir(File.expand_path("..", __FILE__)) do
+      `git ls-files -z`.split("\x0")
         .reject { |f| f.match(%r{^(test|spec|features)/}) }
     end
-  gem.name = 'blinka-reporter'
+  gem.name = "blinka-reporter"
   gem.version = BlinkaReporter::VERSION
-  gem.executables = ['blinka_reporter']
-  gem.require_path = ['lib']
+  gem.executables = ["blinka_reporter"]
+  gem.require_path = ["lib"]
 
-  gem.add_dependency('httparty', '~> 0.18')
-  gem.add_dependency('ox', '~> 2')
-  gem.add_development_dependency('dotenv', '~> 2.8.0')
-  gem.add_development_dependency('minitest', '~> 5.0')
-  gem.add_development_dependency('mocha', '~> 2.0')
-  gem.add_development_dependency('rake', '~> 13')
-  gem.add_development_dependency('webmock', '~> 3.11')
+  gem.add_dependency("ox", "~> 2")
+  gem.add_development_dependency("dotenv", "~> 3.0.0")
+  gem.add_development_dependency("minitest", ">= 5", "< 7")
+  gem.add_development_dependency("mocha", "~> 2.0")
+  gem.add_development_dependency("rake", "~> 13")
+  gem.add_development_dependency("standard")
 end

data/lib/blinka_reporter/cli.rb

@@ -1,10 +1,10 @@
-require 'blinka_reporter/client'
-require 'blinka_reporter/version'
+require "blinka_reporter/client"
+require "blinka_reporter/version"
 
 module BlinkaReporter
   class Cli
     def self.run(argv)
-      if (argv.index('--help') || -1) >= 0
+      if (argv.index("--help") || -1) >= 0
         puts(<<~EOS)
           blinka_reporter version #{BlinkaReporter::VERSION}
 
@@ -14,46 +14,17 @@ module BlinkaReporter
             - ./rspec.xml from https://github.com/sj26/rspec_junit_formatter
 
           --tap: Flag for outputting test results in TAP-protocol, helpful on Heroku CI
-          --blinka: Flag for reporting test results to blinka.app, requires also supplying:
-            - --team-id
-            - --team-secret
-            - --repository
-            - --commit
-          --team-id <team-id>: Blinka team id, only used with --blinka
-          --team-secret <team-secret>: Blinka team secret, only used with --blinka
-          --commit <commit>: The commit hash to report
-          --tag <tag>: The tag for the run, for example to separate a test matrix
-          --repository <repository>: The Github repository
-          --host <host>: Override Blink host to send report
-
         EOS
         return 0
       end
 
-      tap = (argv.index('--tap') || -1) >= 0
-
-      paths = argv_value_for(argv, '--path')
+      tap = (argv.index("--tap") || -1) >= 0
 
-      blinka = (argv.index('--blinka') || -1) >= 0
-      commit = argv_value_for(argv, '--commit')&.first
-      repository = argv_value_for(argv, '--repository')&.first
-      tag = argv_value_for(argv, '--tag')&.first
-      team_id = argv_value_for(argv, '--team-id')&.first
-      team_secret = argv_value_for(argv, '--team-secret')&.first
-      host = argv_value_for(argv, '--host')&.first
+      paths = argv_value_for(argv, "--path")
 
       client = BlinkaReporter::Client.new
       data = client.parse(paths: paths)
-      config =
-        BlinkaReporter::Config.new(
-          tag: tag,
-          commit: commit,
-          team_id: team_id,
-          team_secret: team_secret,
-          repository: repository,
-          host: host
-        )
-      client.report(data: data, config: config, tap: tap, blinka: blinka)
+      client.report(data: data, tap: tap)
     end
 
     def self.argv_value_for(argv, option_name)

data/lib/blinka_reporter/client.rb

@@ -1,15 +1,13 @@
-require 'httparty'
-require 'ox'
+require "ox"
+require "json"
 
-require 'blinka_reporter/blinka'
-require 'blinka_reporter/config'
-require 'blinka_reporter/error'
-require 'blinka_reporter/tap'
+require "blinka_reporter/error"
+require "blinka_reporter/tap"
 
 module BlinkaReporter
   class Client
     def parse(paths: nil)
-      paths ||= ['./blinka_results.json']
+      paths ||= ["./blinka_results.json"]
       paths = Array(paths)
       paths.each do |path|
         unless File.exist?(path)
@@ -22,9 +20,9 @@ module BlinkaReporter
 
       merge_results(
         paths.map do |path|
-          if path.end_with?('.xml')
+          if path.end_with?(".xml")
             parse_xml(path: path)
-          elsif path.end_with?('.json')
+          elsif path.end_with?(".json")
             parse_json(path: path)
           else
             raise(
@@ -36,16 +34,15 @@ module BlinkaReporter
       )
     end
 
-    def report(data:, blinka: false, tap: false, config: nil)
+    def report(data:, tap: false)
       BlinkaReporter::Tap.report(data) if tap
-      BlinkaReporter::Blinka.report(config: config, data: data) if blinka
       0
     end
 
     private
 
     def merge_results(data_array)
-      data = { total_time: 0, nbr_tests: 0, nbr_assertions: 0, results: [] }
+      data = {total_time: 0, nbr_tests: 0, nbr_assertions: 0, results: []}
       data_array.each do |result|
         data[:total_time] += result[:total_time] || 0
         data[:nbr_tests] += result[:nbr_tests] || 0
@@ -56,18 +53,18 @@ module BlinkaReporter
     end
 
     def parse_json(path:)
-      JSON.parse(File.open(path).read, symbolize_names: true)
+      JSON.parse(File.read(path), symbolize_names: true)
     end
 
     def parse_xml(path:)
-      data = Ox.load_file(path, { symbolize_keys: true, skip: :skip_none })
+      data = Ox.load_file(path, {symbolize_keys: true, skip: :skip_none})
       test_suite = data.root
-      unless test_suite.name == 'testsuite'
+      unless test_suite.name == "testsuite"
         raise("Root element is not <testsuite>, instead #{test_suite.name}")
       end
 
-      properties = test_suite.nodes.select { |node| node.name == 'properties' }
-      test_cases = test_suite.nodes.select { |node| node.name == 'testcase' }
+      properties = test_suite.nodes.select { |node| node.name == "properties" }
+      test_cases = test_suite.nodes.select { |node| node.name == "testcase" }
       {
         nbr_tests: Integer(test_suite.tests || 0),
         total_time: Float(test_suite.time),
@@ -79,7 +76,7 @@ module BlinkaReporter
     def xml_seed(ox_properties)
       ox_properties.each do |property|
         property.nodes.each do |node|
-          return node.attributes[:value] if node.attributes[:name] == 'seed'
+          return node.attributes[:value] if node.attributes[:name] == "seed"
         end
       end
       nil
@@ -89,18 +86,18 @@ module BlinkaReporter
     def xml_test_cases(test_cases)
       test_cases.map do |test_case|
         result = {
-          kind: Array(test_case.attributes[:classname]&.split('.'))[1],
+          kind: Array(test_case.attributes[:classname]&.split("."))[1],
           name: test_case.attributes[:name],
-          path: test_case.attributes[:file]&.delete_prefix('./'),
+          path: test_case.attributes[:file]&.delete_prefix("./"),
           time: Float(test_case.attributes[:time] || 0)
         }
         if test_case.nodes.any?
-          skipped = test_case.nodes.any? { |node| node.name == 'skipped' }
-          result[:result] = 'skip' if skipped
+          skipped = test_case.nodes.any? { |node| node.name == "skipped" }
+          result[:result] = "skip" if skipped
           failure =
-            test_case.nodes.select { |node| node.name == 'failure' }.first
+            test_case.nodes.find { |node| node.name == "failure" }
           if failure
-            result[:result] = 'fail'
+            result[:result] = "fail"
 
             # Needs to be double quotation marks to work properly
             result[:backtrace] = failure.text.split("\n")
@@ -108,7 +105,7 @@ module BlinkaReporter
             result[:message] = failure.attributes[:message]
           end
         else
-          result[:result] = 'pass'
+          result[:result] = "pass"
         end
         result
       end
@@ -116,7 +113,7 @@ module BlinkaReporter
 
     def get_image_path(backtrace)
       backtrace.each do |text|
-        path = /^(\[Screenshot\]|\[Screenshot Image\]):\s([\S]*)$/.match(text)
+        path = /^(\[Screenshot\]|\[Screenshot Image\]):\s(\S*)$/.match(text)
         next if path.nil?
         path = path[-1]
         next unless File.exist?(path)

data/lib/blinka_reporter/error.rb

@@ -1,3 +1,4 @@
 module BlinkaReporter
-  class Error < StandardError; end
+  class Error < StandardError
+  end
 end

data/lib/blinka_reporter/minitest_adapter.rb

@@ -5,7 +5,7 @@ module BlinkaReporter
     end
 
     def path
-      @path ||= source_location.first.gsub(Dir.getwd, '').delete_prefix('/')
+      @path ||= source_location.first.gsub(Dir.getwd, "").delete_prefix("/")
     end
 
     def line
@@ -24,8 +24,8 @@ module BlinkaReporter
     end
 
     def kind
-      parts = self.path.gsub('test/', '').split('/')
-      parts.length > 1 ? parts.first : 'general'
+      parts = path.gsub("test/", "").split("/")
+      (parts.length > 1) ? parts.first : "general"
     end
 
     def message
@@ -60,14 +60,17 @@ module BlinkaReporter
     end
 
     def image
-      return unless kind == 'system'
+      return unless kind == "system"
 
       image_path =
         if defined?(Capybara) && Capybara.respond_to?(:save_path) &&
-             Capybara.save_path.present?
-          "#{Capybara.save_path}/failures_#{name}.png"
+            Capybara.save_path.present?
+          "#{Capybara.save_path}/failures_#{name}.png".gsub(
+            Dir.getwd,
+            ""
+          ).delete_prefix("/")
         else
-          "./tmp/screenshots/failures_#{name}.png"
+          "tmp/screenshots/failures_#{name}.png"
         end
 
       return unless File.exist?(image_path)

data/lib/blinka_reporter/tap.rb

@@ -14,31 +14,31 @@ module BlinkaReporter
       return if results.size == 0
 
       @data = <<~REPORT
-      TAP version 13
-      1..#{results.size}
-      #{test_results(results)}
+        TAP version 13
+        1..#{results.size}
+        #{test_results(results)}
       REPORT
     end
 
     def test_results(results)
       report = []
       results.each_with_index do |test, index|
-        test_str = "#{test[:path]} - #{test[:name].tr('#', '_')}"
+        test_str = "#{test[:path]} - #{test[:name].tr("#", "_")}"
         result = test[:result]
-        if result == 'pass'
+        if result == "pass"
           report << "ok #{index + 1} - #{test_str}"
-        elsif result == 'skip'
+        elsif result == "skip"
           report << "ok #{index + 1} # skip: #{test_str}"
-        elsif result == 'fail'
+        elsif result == "fail"
           report << "not ok #{index + 1} - failed: #{test_str}"
           test[:message].split('\n') do |line|
-            report << "##{' ' * TAP_COMMENT_PAD + line}"
+            report << "##{" " * TAP_COMMENT_PAD + line}"
           end
-          report << '#'
+          report << "#"
           Array(test[:backtrace]).each do |line|
-            report << "##{' ' * TAP_COMMENT_PAD + line}"
+            report << "##{" " * TAP_COMMENT_PAD + line}"
           end
-          report << ''
+          report << ""
         end
       end
       report.join("\n")

data/lib/blinka_reporter/version.rb

@@ -1,3 +1,3 @@
 module BlinkaReporter
-  VERSION = '0.7.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/blinka_reporter.rb

@@ -1,4 +1,5 @@
-require 'blinka_reporter/version'
-require 'blinka_reporter/cli'
+require "blinka_reporter/version"
+require "blinka_reporter/cli"
 
-module BlinkaReporter; end
+module BlinkaReporter
+end

data/lib/minitest/blinka_plugin.rb

@@ -1,14 +1,15 @@
-require 'minitest'
-require 'json'
-require 'blinka_reporter/minitest_adapter'
-require 'blinka_reporter/client'
+require "minitest"
+require "json"
+require "blinka_reporter/minitest_adapter"
+require "blinka_reporter/client"
 
 module Minitest
   def self.plugin_blinka_init(options)
-    reporter.reporters << BlinkaPlugin::Reporter.new(options[:io], options)
+    reporter << BlinkaPlugin::Reporter.new(options[:io], options)
   end
 
-  def plugin_blinka_options(opts, options); end
+  def self.plugin_blinka_options(opts, options)
+  end
 
   module BlinkaPlugin
     class Reporter < Minitest::StatisticsReporter
@@ -31,8 +32,8 @@ module Minitest
       private
 
       def json_report
-        report_path = ENV['BLINKA_PATH']
-        return if report_path.nil? || report_path.eql?('')
+        report_path = ENV["BLINKA_PATH"]
+        return if report_path.nil? || report_path.eql?("")
 
         result = {
           total_time: total_time,
@@ -45,19 +46,17 @@ module Minitest
             end || []
         }
 
-        if ENV['BLINKA_APPEND'] == 'true' && File.exist?(report_path)
+        if ENV["BLINKA_APPEND"] == "true" && File.exist?(report_path)
           existing =
-            JSON.parse(File.open(report_path).read, symbolize_names: true)
+            JSON.parse(File.read(report_path), symbolize_names: true)
           result[:results] = existing[:results] + result[:results]
           result[:nbr_tests] = existing[:nbr_tests] + result[:nbr_tests]
-          result[:nbr_assertions] =
-            existing[:nbr_assertions] + result[:nbr_assertions]
+          result[:nbr_assertions] = existing[:nbr_assertions] +
+            result[:nbr_assertions]
           result[:total_time] = existing[:total_time] + result[:total_time]
         end
 
-        File.open(report_path, 'w+') do |file|
-          file.write(JSON.pretty_generate(result))
-        end
+        File.write(report_path, JSON.pretty_generate(result))
 
         puts
         puts("Test results written to `#{report_path}`")
@@ -65,3 +64,15 @@ module Minitest
     end
   end
 end
+
+if Minitest.respond_to?(:extensions)
+  registered = Minitest.extensions.map(&:to_s).include?("blinka")
+
+  unless registered
+    if Minitest.respond_to?(:register_plugin)
+      Minitest.register_plugin(:blinka)
+    else
+      Minitest.extensions << "blinka"
+    end
+  end
+end

data/package.json

@@ -4,19 +4,21 @@
   "author": "David Wessman <david@wessman.co>",
   "license": "MIT",
   "devDependencies": {
-    "@prettier/plugin-ruby": "^3.2.2",
-    "husky": "^8.0.3",
-    "lint-staged": "^13.1.2"
-  },
-  "scripts": {
-    "pretty": "./node_modules/.bin/prettier --write ."
+    "husky": "^9.1.7",
+    "lint-staged": "^16.2.7",
+    "prettier": "^3.8.0"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
   },
+  "scripts": {
+    "pretty": "./node_modules/.bin/prettier --write . && stree write './**/*.rb'",
+    "prepare": "husky install"
+  },
   "lint-staged": {
-    "*.{md,rb,json,yml,gemspec}": "./node_modules/.bin/prettier --write"
+    "*.{rb,gemspec}": "stree write",
+    "*.{js,css,md,json,yml}": "./node_modules/.bin/prettier --write"
   }
 }