gitlab-qa 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f147da355d03473a605dacab05054698ebf98b19f4af618d93bff89cbe09260
-  data.tar.gz: 5f674b1e20a26f2bb6de4588ce02f58450e820701f099372018382bc24783702
+  metadata.gz: 7e9cf3fd69ecf574cc318f194a49e715050b7fe6708327c1555264c589722de3
+  data.tar.gz: 695c6e1e0b2f49615b42b83765353c80c0613b832636231bad0022dbddb2efcb
 SHA512:
-  metadata.gz: ccac752f52ac37f38cbf295ce1b2dd4d92811545a0c3dc244b9930b1140317985523a39cdfaa45c25df129e82973e19abf98420011a941d01c43ed02355c4f3d
-  data.tar.gz: e4be9776a75aba05c1ba40eff3de70e18616856f8c3f72ae5850e1fffb86ddc11f8b72c04d83c205b2088e5ce31459b3e2b7bc7c127810609a757fcdf726bc5c
+  metadata.gz: 2cc293bccacd51527427585000e3058fc2853254c890f4965d3cb0245395b0e12455cbf57f50b1555414a7dd74b375d6f6061a2a7be24d0ecc3dc59360e732eb
+  data.tar.gz: 4b4de8b9fdb59f1ac502a9d5c0d25184bf80121aea31a549cb8577c578ea7fbaa8166803b886872f59a5873eee430c0435a70641d4d20c87d90febca1ff372a1

data/lib/gitlab/qa/report/results_in_issues.rb

@@ -5,10 +5,18 @@ require 'gitlab'
 require 'active_support/core_ext/enumerable'
 
 module Gitlab
-  # Monkey patch the Gitlab client to use the correct API path
+  # Monkey patch the Gitlab client to use the correct API path and add required methods
   class Client
     def team_member(project, id)
-      get("/projects/#{url_encode project}/members/all/#{id}")
+      get("/projects/#{url_encode(project)}/members/all/#{id}")
+    end
+
+    def issue_discussions(project, issue_id, options = {})
+      get("/projects/#{url_encode(project)}/issues/#{issue_id}/discussions", query: options)
+    end
+
+    def add_note_to_issue_discussion_as_thread(project, issue_id, discussion_id, options = {})
+      post("/projects/#{url_encode(project)}/issues/#{issue_id}/discussions/#{discussion_id}/notes", query: options)
     end
   end
 
@@ -141,6 +149,16 @@ module Gitlab
         def note_status(issue, test)
           return if failures(test).empty?
 
+          note = note_content(test)
+
+          Gitlab.issue_discussions(project, issue.iid, order_by: 'created_at', sort: 'asc').each do |discussion|
+            return add_note_to_discussion(issue.iid, discussion.id) if new_note_matches_discussion?(note, discussion)
+          end
+
+          Gitlab.create_issue_note(project, issue.iid, note)
+        end
+
+        def note_content(test)
           errors = failures(test).each_with_object([]) do |failure, text|
             text << <<~TEXT
               Error:
@@ -155,7 +173,23 @@ module Gitlab
             TEXT
           end.join("\n\n")
 
-          Gitlab.create_issue_note(project, issue.iid, ":x: ~\"#{pipeline}::failed\" in job `#{Runtime::Env.ci_job_name}` in #{Runtime::Env.ci_job_url}\n\n#{errors}")
+          "#{failure_summary}\n\n#{errors}"
+        end
+
+        def failure_summary
+          ":x: ~\"#{pipeline}::failed\" in job `#{Runtime::Env.ci_job_name}` in #{Runtime::Env.ci_job_url}"
+        end
+
+        def new_note_matches_discussion?(note, discussion)
+          error_and_stack_trace(note) == error_and_stack_trace(discussion.notes.first['body'])
+        end
+
+        def error_and_stack_trace(text)
+          text.strip[/Error:(.*)/, 1]
+        end
+
+        def add_note_to_discussion(issue_iid, discussion_id)
+          Gitlab.add_note_to_issue_discussion_as_thread(project, issue_iid, discussion_id, body: failure_summary)
         end
 
         def update_labels(issue, test)

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.2.0'.freeze
+    VERSION = '5.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control