qat-reporter-xray 6.0.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5fe00eb7f14dfdceb84146458b6a0719afff762e66e104490b396bb7a4ad341
-  data.tar.gz: 4dd113a99f6e47cd2077f788a234a526c852f26ef983e9a8d744f85577d1aab8
+  metadata.gz: 50cce4d0b879eda243798350001c094c8b509bad2c0ce5347a6ac224edf69e45
+  data.tar.gz: 9697c159a902ec243174c158b8b889541ceecb923097e8f78688594709981b68
 SHA512:
-  metadata.gz: e23a8ebd0122392ee14733cc2e992f27dbc82da9a9d1c2d08f8dcc6e8f5b34fea62fd19cb55db1f8695f86e2b1d34e7549bd93b0e81ad24f5a31c5023ff019b4
-  data.tar.gz: bf213535ec65993c3c8e376ee077ac3b9f12def3a7799e76d16b8c5b6d0f6aafe074ab7ae8368cc8bdef869ddba4cacc68a2134b06e7aedddecf28426e70af87
+  metadata.gz: 58f836f2807350c022ffd8f4142ac5f4d62887c5fd0196389dd74cf39a97a57a9808ad04ca1b6d8fcaba6aba0f12b737b29711c23344b136b4d0f4ebdd958538
+  data.tar.gz: c0edadc3b24bc48aa76de0b5abfc2e74c674cfa1d2359f1766a1513cc7cb5e30160cca299e00c3b1b213e080d6d15131bf925cf614476c0f00ffab9a808605a2

data/lib/qat/cucumber/core_ext.rb

@@ -1,3 +1 @@
-require_relative 'core_ext/result'
-require_relative 'core_ext/formatter/html'
-require_relative 'core_ext/formatter/junit'
+require_relative 'core_ext/result'

data/lib/qat/formatter/xray.rb

@@ -6,6 +6,7 @@ require 'time'
 require 'base64'
 require_relative '../reporter/xray/config'
 require_relative '../reporter/xray/test_execution'
+require 'qat/formatter/helper'
 
 module QAT
   # Namespace for custom Cucumber formatters and helpers.
@@ -16,12 +17,17 @@ module QAT
     class Xray
       include ::Cucumber::Formatter::Io
       include QAT::Logger
-
-      #@api private
-      def initialize(runtime, path_or_io, options)
-        @io      = ensure_io(path_or_io)
-        @options = options
-        @tests   = []
+      include QAT::Formatter::Helper
+
+      def initialize(config)
+        @config         = config
+        @io             = ensure_io(config.out_stream, config.error_stream)
+        @ast_lookup     = ::Cucumber::Formatter::AstLookup.new(config)
+        @feature_hashes = []
+        config.on_event :test_case_started, &method(:on_test_case_started)
+        config.on_event :test_case_finished, &method(:on_test_case_finished)
+        config.on_event :test_run_finished, &method(:on_test_run_finished)
+        @tests = []
       end
 
       #@api private
@@ -30,22 +36,32 @@ module QAT
       end
 
       #@api private
-      def before_test_case(test_case)
-        @current_scenario = test_case.source[1]
+      def on_test_case_started(event)
+        return if @config.dry_run?
+        @row_number = nil
+        test_case   = event.test_case
+        build(test_case, @ast_lookup)
+        @current_scenario = @scenario
 
         @exception = nil
 
         @start_time   = Time.now
         @evidences    = []
         @file_counter = 0
+        @current_scenario[:tags].each do |tag|
+          tag_name tag
+        end
+
       end
 
       #@api private
-      def after_test_case(_, status)
+      def on_test_case_finished event
+        return if @config.dry_run?
+        _test_case, result = *event.attributes
         # When jira type is cloud the test result string must be different (accordingly with xray api)
-        test_status = if status.is_a? ::Cucumber::Core::Test::Result::Passed
+        test_status = if result.passed?
                         jira_type == 'cloud' ? 'PASSED' : 'PASS'
-                      elsif status.is_a? ::Cucumber::Core::Test::Result::Failed
+                      elsif result.failed?
                         jira_type == 'cloud' ? 'FAILED' : 'FAIL'
                       else
                         'NO RUN'
@@ -53,10 +69,10 @@ module QAT
 
         @end_time = Time.now
 
-        comment = status.respond_to?(:exception) ? build_exception(status.exception) : ''
+        comment = result.respond_to?(:exception) ? build_exception(result.exception) : ''
 
         log.warn 'Jira ID is not defined!' unless @test_jira_id
-        if @current_scenario.is_a? ::Cucumber::Core::Ast::ScenarioOutline
+        if @examples_values
           save_current_scenario_outline(test_status, comment)
         else
           save_current_scenario(test_status, comment)
@@ -64,12 +80,15 @@ module QAT
 
       end
 
-      #@api private
-      def after_features(*_)
+
+      def on_test_run_finished _event
+        return if @config.dry_run?
         publish_result
       end
 
-      def embed(src, mime_type, label)
+
+
+      def attach(src, mime_type)
 
 
         data = if File.file?(src)
@@ -86,10 +105,8 @@ module QAT
 
         file_name = if File.file?(src)
                       File.basename(src)
-                    elsif label.to_s.empty?
-                      "file_#{@file_counter += 1}.#{ext}"
                     else
-                      "#{label}.#{ext}"
+                      "#{src}.#{ext}"
                     end
 
         @evidences << { data: data, filename: file_name, contentType: mime_type }

data/lib/qat/formatter/xray/test_ids.rb

@@ -1,95 +1,57 @@
 require 'cucumber/formatter/io'
 require 'json'
+require 'qat/formatter/test_ids'
+require 'qat/formatter/helper'
 
 module QAT
   module Formatter
     class Xray
-      class TestIds
+      class TestIds <QAT::Formatter::TestIds
         include Cucumber::Formatter::Io
+        include QAT::Formatter::Helper
 
-        def initialize(runtime, path_or_io, options)
-          @io                 = ensure_io(path_or_io)
-          @tags               = []
-          @scenario_tags      = []
+        def initialize(config)
+          @config             = config
           @no_test_id         = {}
           @max_test_id        = 0
           @duplicate_test_ids = {}
           @test_id_mapping    = {}
-          @options            = options
+          @io                 = ensure_io(config.out_stream, config.error_stream)
+          @ast_lookup         = ::Cucumber::Formatter::AstLookup.new(@config)
+          config.on_event :test_case_started, &method(:on_test_case_started)
+          config.on_event :test_run_finished, &method(:on_test_run_finished)
         end
 
-        def before_feature(feature)
-          @in_scenarios = false
-        end
-
-        def tag_name(tag_name)
-          @scenario_tags << tag_name if @in_scenarios
-        end
-
-        def after_tags(tags)
-          @in_scenarios = true unless @in_scenarios
-        end
 
-        def scenario_name(keyword, name, file_colon_line, source_indent)
-          if @scenario_tags.any? { |tag| tag.match(/@id:(\d+)/) }
-            id           = @scenario_tags.map { |tag| tag.match(/@id:(\d+)/) }.compact.first.captures.first.to_i
+        ###Override because of tag condition
+        def scenario_name
+          path = "#{@current_feature[:uri]}:#{@scenario[:line]}"
+          scenario_tags= @scenario[:tags]
+          if scenario_tags.any? { |tag| tag.match(/@id:(\d+)/) }
+              id           = scenario_tags.map { |tag| tag.match(/@id:(\d+)/) }.compact.first.captures.first.to_i
             @max_test_id = id if id > @max_test_id
 
-            test_id_info = { name: name,
-                             path: file_colon_line }
+            test_id_info = { name: @scenario[:name],
+                             path:  path}
 
             if @test_id_mapping[id]
               if @duplicate_test_ids[id]
-                @duplicate_test_ids[id] << test_id_info
+                @duplicate_test_ids[id].find do |dup|
+                  @exist = true if dup[:path]== test_id_info[:path]
+                end
+                @duplicate_test_ids[id] << test_id_info unless @exist
               else
-                @duplicate_test_ids[id] = [@test_id_mapping[id], test_id_info]
+                @duplicate_test_ids[id] = [@test_id_mapping[id], test_id_info] unless @test_id_mapping[id][:path] == test_id_info[:path]
               end
             else
               @test_id_mapping[id] = test_id_info
             end
-
           else
-            @no_test_id[name] = file_colon_line unless @scenario_tags.include?('@dummy_test')
+            @no_test_id[@scenario[:name]] = path unless scenario_tags.include?('@dummy_test')
           end
-          @scenario_tags = []
-        end
-
-        def after_features(features)
-          publish_result
-          @io.flush
+          @scenario[:tags] = []
         end
 
-        private
-
-        def publish_result
-          content = {
-            max:       @max_test_id,
-            untagged:  @no_test_id,
-            mapping:   Hash[@test_id_mapping.sort],
-            duplicate: Hash[@duplicate_test_ids.sort]
-          }
-
-          if @duplicate_test_ids.any?
-            dups_info = @duplicate_test_ids.map do |id, dups|
-              text = dups.map { |dup| "Scenario: #{dup[:name]} - #{dup[:path]}" }.join("\n")
-              "TEST ID #{id}:\n#{text}\n"
-            end
-
-            duplicates_info = <<-TXT.gsub(/^\s*/, '')
-          ------------------------------------
-          Duplicate test ids found!
-          ------------------------------------
-          #{dups_info.join("\n")}
-            TXT
-            puts duplicates_info
-          end
-
-          @io.puts(content.to_json({
-                                     indent:    ' ',
-                                     space:     ' ',
-                                     object_nl: "\n"
-                                   }))
-        end
       end
     end
   end

data/lib/qat/reporter/xray/tasks/tests.rb

@@ -60,6 +60,7 @@ namespace :qat do
           report.tag_untagged!
         end
 
+
         desc 'Generate features zip file to import in Xray'
         task :zip_features do
           require 'zip'

data/lib/qat/reporter/xray/version.rb

@@ -5,7 +5,7 @@ module QAT
     # Namespace for QAT Reporter's Xray integrations
     class Xray
       # Represents QAT Reporter's Xray integrations' version
-      VERSION = '6.0.1'
+      VERSION = '7.0.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qat-reporter-xray
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - QAT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
@@ -76,42 +76,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 8.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: qat-cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: qat-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="