diff --git a/lib/atlassian/jira_connect/serializers/build_entity.rb b/lib/atlassian/jira_connect/serializers/build_entity.rb index a3434c529a49eb2014dd59c895ee425fb9ccb20e..10e4bb0e70936ced5ce1d1aa080dce52ba6bfd8f 100644 --- a/lib/atlassian/jira_connect/serializers/build_entity.rb +++ b/lib/atlassian/jira_connect/serializers/build_entity.rb @@ -26,7 +26,7 @@ def issue_keys # merge request title. @issue_keys ||= begin pipeline.all_merge_requests.flat_map do |mr| - src = "#{mr.source_branch} #{mr.title}" + src = "#{mr.source_branch} #{mr.title} #{mr.description}" JiraIssueKeyExtractor.new(src).issue_keys end.uniq end diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 6f7065464029ace370fe60fb65e7c2d266bc3b61..26804b38db8f8b3ad2824036e1c510d603053a7e 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -33,6 +33,10 @@ title { generate(:jira_title) } end + trait :jira_description do + description { generate(:jira_description) } + end + trait :jira_branch do source_branch { generate(:jira_branch) } end diff --git a/spec/factories/sequences.rb b/spec/factories/sequences.rb index 893865962d87ecde873b408692e5eb9d1860891b..6b86154aa91121ce19d093041f2f493cbfb1e0bd 100644 --- a/spec/factories/sequences.rb +++ b/spec/factories/sequences.rb @@ -18,6 +18,7 @@ sequence(:draft_title) { |n| "Draft: #{n}" } sequence(:wip_title) { |n| "WIP: #{n}" } sequence(:jira_title) { |n| "[PROJ-#{n}]: fix bug" } + sequence(:jira_description) { |n| "This is a description\n here is the description\n Related to: PROJ-#{n}" } sequence(:jira_branch) { |n| "feature/PROJ-#{n}" } sequence(:job_name) { |n| "job #{n}" } sequence(:work_item_type_name) { |n| "bug#{n}" } diff --git a/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb b/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb index 4bbd654655d2e7edfcb7fba4944c832e0cffd942..a29f32d35b83d9df2ecdbdd7abab2f7d13f11b77 100644 --- a/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb +++ b/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb @@ -31,7 +31,7 @@ context 'when the pipeline does belong to a Jira issue' do let(:pipeline) { create(:ci_pipeline, merge_request: merge_request) } - %i[jira_branch jira_title].each do |trait| + %i[jira_branch jira_title jira_description].each do |trait| context "because it belongs to an MR with a #{trait}" do let(:merge_request) { create(:merge_request, trait) }