Merge pull request #12357 from saraycp/use-merge-request-iid

Use the correct field for the merge request number
openSUSE · Mar 25, 2022 · 229514a · 229514a
2 parents a7cd353 + 55f8eda
commit 229514a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/api/app/components/workflow_run_row_component.rb b/src/api/app/components/workflow_run_row_component.rb
@@ -1,7 +1,7 @@
 class WorkflowRunRowComponent < ApplicationComponent
   SOURCE_NAME_PAYLOAD_MAPPING = {
     'pull_request' => ['pull_request', 'number'],
-    'Merge Request Hook' => ['object_attributes', 'id'],
+    'Merge Request Hook' => ['object_attributes', 'iid'],
     'push' => ['head_commit', 'id'],
     'Push Hook' => ['commits', 0, 'id']
   }.freeze

diff --git a/src/api/spec/components/workflow_run_header_component_spec.rb b/src/api/spec/components/workflow_run_header_component_spec.rb
@@ -174,7 +174,7 @@
               "url": "http://example.com/gitlabhq/gitlab-test.git"
             },
             "object_attributes":{
-              "id": 99,
+              "iid": 1,
               "url": "http://example.com/diaspora/merge_requests/1"
             }
           }
@@ -209,7 +209,7 @@
           <<~END_OF_REQUEST
             {
               "object_attributes":{
-                "id": 99,
+                "iid": 1,
                 "url": "http://example.com/diaspora/merge_requests/1",
                 "action": "unapproved"
               },
@@ -227,7 +227,7 @@
       end
 
       it 'shows a link to the MR' do
-        expect(rendered_component).to have_link('#99', href: 'http://example.com/diaspora/merge_requests/1')
+        expect(rendered_component).to have_link('#1', href: 'http://example.com/diaspora/merge_requests/1')
       end
     end
 

diff --git a/src/api/spec/components/workflow_run_row_component_spec.rb b/src/api/spec/components/workflow_run_row_component_spec.rb
@@ -169,7 +169,7 @@
             "url": "http://example.com/gitlabhq/gitlab-test.git"
           },
           "object_attributes": {
-            "id": 99,
+            "iid": 1,
             "url": "http://example.com/diaspora/merge_requests/1",
             "action": "open"
           }
@@ -202,7 +202,7 @@
       end
 
       it 'shows a link to the pull request' do
-        expect(rendered_component).to have_link('#99', href: 'http://example.com/diaspora/merge_requests/1')
+        expect(rendered_component).to have_link('#1', href: 'http://example.com/diaspora/merge_requests/1')
       end
 
       ['close', 'merge', 'open', 'reopen', 'update'].each do |action|