allure-report-publisher 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef51790888932877d33ebf9edc9307bc14211088fbe41ba34398e9668980f1a0
-  data.tar.gz: 4a3fcce060bcea96aadcc9ab8e37f523148c606bb4f0ca8081798e8a6a239ac3
+  metadata.gz: e07e63b14a3d8101f13eb9f4f824485f0c9eab83a8cc3d2dc13beb72cb3817c4
+  data.tar.gz: 5d040670bafc783b72e803b0fc942714b4aa5a560070711389821461a9f485bf
 SHA512:
-  metadata.gz: 40ccf342af3d5b90cb8b9eb9473bc63379e225c4a8e45466a9e66bc4c16476afd1573edade5101abf63d8f4a7936fd42ef87d61dfcfda950ab3da276c7425766
-  data.tar.gz: 59f451092604006ba5b742aa679c240f37eda76b9bc034b329c1965bd52163bd2ef371e543faca7b4349ffd586fc38497c1563db532405395b1cf98c9f4822ee
+  metadata.gz: bbbef8d211fa162cb3dc3cb170bcc6167247938f9157e28c75f0a12c2d6296e1cc8b546e5b962855a6e6944b9e31d2538153237773a794991c47a822cde2e9bb
+  data.tar.gz: 5734ed15c3c4296394b34a05a86c48e06da2e6e12bcb044941c5624c6775a577019fe071bd4d55a01c07f56bce92e634044591ae0edfc13b5e9e21f5436ff8e2

data/lib/allure_report_publisher/lib/helpers/summary.rb

@@ -23,9 +23,13 @@ module Publisher
       #
       # @return [Terminal::Table]
       def table
-        return terminal_table([short_summary]) if summary_type == TOTAL
+        return terminal_table { |table| table << short_summary } if summary_type == TOTAL
 
-        terminal_table(expanded_summary)
+        terminal_table do |table|
+          expanded_summary.each { |row| table << row }
+          table << :separator
+          table << short_summary
+        end
       end
 
       # Test run status emoji
@@ -44,7 +48,7 @@ module Publisher
       # @return [Array<Array>]
       def expanded_summary
         @expanded_summary ||= summary_data.map do |name, summary|
-          [name, *summary.values, status_icon(summary[:failed], summary[:flaky])]
+          [name, *summary.values, status_icon(summary[:passed], summary[:failed], summary[:flaky])]
         end
       end
 
@@ -67,30 +71,31 @@ module Publisher
           sum[:failed],
           sum[:skipped],
           sum[:flaky],
-          status_icon(sum[:failed], sum[:flaky])
+          status_icon(sum[:passed], sum[:failed], sum[:flaky])
         ]
       end
 
       # Status icon based on run results
       #
+      # @param [Integer] passed
       # @param [Integer] failed
       # @param [Integer] flaky
       # @return [String]
-      def status_icon(failed, flaky)
-        return flaky.zero? ? "✅" : "⚠️" if failed.zero?
+      def status_icon(passed, failed, flaky)
+        return "➖" if passed.zero? && failed.zero?
+        return flaky.zero? ? "✅" : "❗" if failed.zero?
 
         "❌"
       end
 
       # Summary terminal table
       #
-      # @param [Array] rows
       # @return [Terminal::Table]
-      def terminal_table(rows)
+      def terminal_table
         Terminal::Table.new do |table|
           table.title = "#{summary_type} summary"
           table.headings = ["", "passed", "failed", "skipped", "flaky", "result"]
-          table.rows = rows
+          yield(table)
         end
       end
 

data/lib/allure_report_publisher/lib/helpers/url_section_builder.rb

@@ -29,26 +29,30 @@ module Publisher
         urls_block.match?(DESCRIPTION_PATTERN)
       end
 
-      # Get urls for PR update
+      # PR description with allure report urls
       #
-      # @param [String] pr
+      # @param [String] pr_description
       # @return [String]
       def updated_pr_description(pr_description)
-        return strip_separator(body) unless pr_description
-        return "#{pr_description}\n\n#{body}" unless pr_description.match?(DESCRIPTION_PATTERN)
+        stripped_description = (pr_description || "").strip
+
+        return url_section(separator: false) if stripped_description == ""
+        return "#{pr_description}\n\n#{url_section}" unless pr_description.match?(DESCRIPTION_PATTERN)
 
         job_entries = jobs_section(pr_description)
-        pr_description.gsub(DESCRIPTION_PATTERN, body(job_entries))
+        non_empty = stripped_description != pr_description.match(DESCRIPTION_PATTERN)[0]
+        pr_description.gsub(DESCRIPTION_PATTERN, url_section(job_entries: job_entries, separator: non_empty))
       end
 
-      # Allure report url comment without description separator
+      # Comment body with allure report urls
       #
+      # @param [String] pr_comment
       # @return [String]
       def comment_body(pr_comment = nil)
-        return strip_separator(body) unless pr_comment
+        return url_section(separator: false) unless pr_comment
 
         job_entries = jobs_section(pr_comment)
-        strip_separator(body(job_entries))
+        url_section(job_entries: job_entries, separator: false)
       end
 
       attr_reader :report_url,
@@ -59,22 +63,6 @@ module Publisher
 
       private
 
-      # Allure report url pr description
-      #
-      # @return [String]
-      def body(job_entries = job_entry)
-        @body ||= <<~BODY.strip
-          <!-- allure -->
-          ---
-          #{heading}
-
-          <!-- jobs -->
-          #{job_entries}
-          <!-- jobs -->
-          <!-- allurestop -->
-        BODY
-      end
-
       # Url section heading
       #
       # @return [String]
@@ -110,6 +98,24 @@ module Publisher
         @job_entry_pattern ||= /<!-- #{build_name} -->\n([\s\S]+)\n<!-- #{build_name} -->/
       end
 
+      # Allure report url section
+      #
+      # @return [String]
+      def url_section(job_entries: job_entry, separator: true)
+        reports = <<~BODY.strip
+          <!-- allure -->
+          ---
+          #{heading}
+
+          <!-- jobs -->
+          #{job_entries}
+          <!-- jobs -->
+          <!-- allurestop -->
+        BODY
+
+        separator ? reports : reports.gsub("---\n", "")
+      end
+
       # Return updated jobs section
       #
       # @param [String] urls
@@ -120,14 +126,6 @@ module Publisher
 
         "#{jobs}\n#{job_entry}"
       end
-
-      # Strip separator from allure results section
-      #
-      # @param [String] body
-      # @return [String]
-      def strip_separator(body)
-        body.gsub("---\n", "")
-      end
     end
   end
 end

data/lib/allure_report_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Publisher
-  VERSION = "0.5.1"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-report-publisher
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3