Fix mr pipeline detection for child pipelines (#610)

andrcuns · Dec 11, 2023 · cdb49e8 · cdb49e8
1 parent 95a938d
commit cdb49e8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/lib/allure_report_publisher/lib/providers/gitlab.rb b/lib/allure_report_publisher/lib/providers/gitlab.rb
@@ -12,6 +12,7 @@ class Gitlab < Provider
 
       def_delegators :"Publisher::Providers::Info::Gitlab.instance",
                      :allure_project,
+                     :mr_iid,
                      :allure_mr_iid,
                      :server_url,
                      :build_name
@@ -68,13 +69,6 @@ def project
         @project ||= allure_project || env("CI_MERGE_REQUEST_PROJECT_PATH") || env("CI_PROJECT_PATH")
       end
 
-      # Merge request iid
-      #
-      # @return [Integer]
-      def mr_iid
-        @mr_iid ||= allure_mr_iid || env("CI_MERGE_REQUEST_IID")
-      end
-
       # Commit sha url
       #
       # @return [String]

diff --git a/lib/allure_report_publisher/lib/providers/info/gitlab.rb b/lib/allure_report_publisher/lib/providers/info/gitlab.rb
@@ -27,7 +27,7 @@ def executor(report_url)
         #
         # @return [Boolean]
         def pr?
-          !!(allure_project && allure_mr_iid) || ENV["CI_PIPELINE_SOURCE"] == "merge_request_event"
+          !!((allure_project && allure_mr_iid) || mr_iid)
         end
 
         # Get ci run ID without creating instance of ci provider
@@ -58,6 +58,13 @@ def allure_project
           @allure_project ||= env("ALLURE_PROJECT_PATH")
         end
 
+        # Merge request iid
+        #
+        # @return [Integer]
+        def mr_iid
+          @mr_iid ||= allure_mr_iid || env("CI_MERGE_REQUEST_IID")
+        end
+
         # Custom mr iid name
         #
         # @return [String]

diff --git a/spec/allure_report_publisher/lib/providers/info/gitlab_spec.rb b/spec/allure_report_publisher/lib/providers/info/gitlab_spec.rb
@@ -1,15 +1,15 @@
 RSpec.describe Publisher::Providers::Info::Gitlab, epic: "providers" do
   subject(:pr) { described_class.instance.pr? }
 
+  let(:mr_iid) { nil }
   let(:allure_project) { nil }
   let(:allure_mr_iid) { nil }
-  let(:pipeline_source) { "push" }
 
   let(:env) do
     {
       ALLURE_PROJECT_PATH: allure_project,
       ALLURE_MERGE_REQUEST_IID: allure_mr_iid,
-      CI_PIPELINE_SOURCE: pipeline_source
+      CI_MERGE_REQUEST_IID: mr_iid
     }
   end
 
@@ -18,12 +18,12 @@
   end
 
   describe "#pr?" do
-    context "with push event" do
+    context "with non merge request pipeline" do
       it { is_expected.to be(false) }
     end
 
-    context "with merge request event" do
-      let(:pipeline_source) { "merge_request_event" }
+    context "with merge request pipeline" do
+      let(:mr_iid) { "1" }
 
       it { is_expected.to be(true) }
     end