Merge branch 'reference-pattern-word-boundary' into 'master'

Improve reference pattern with word boundary

See merge request gitlab-org/gitlab!25266

app/models/issue.rb

@@ -128,12 +128,12 @@ class Issue < ApplicationRecord
   def self.reference_pattern
     @reference_pattern ||= %r{
       (#{Project.reference_pattern})?
-      #{Regexp.escape(reference_prefix)}(?<issue>\d+)
+      #{Regexp.escape(reference_prefix)}#{Gitlab::Regex.issue}
     }x
   end
 
   def self.link_reference_pattern
-    @link_reference_pattern ||= super("issues", /(?<issue>\d+)/)
+    @link_reference_pattern ||= super("issues", Gitlab::Regex.issue)
   end
 
   def self.reference_valid?(reference)

app/models/project_services/issue_tracker_service.rb

@@ -19,9 +19,9 @@ class IssueTrackerService < Service
   # overridden patterns. See ReferenceRegexes.external_pattern
   def self.reference_pattern(only_long: false)
     if only_long
-      /(\b[A-Z][A-Z0-9_]*-)(?<issue>\d+)/
+      /(\b[A-Z][A-Z0-9_]*-)#{Gitlab::Regex.issue}/
     else
-      /(\b[A-Z][A-Z0-9_]*-|#{Issue.reference_prefix})(?<issue>\d+)/
+      /(\b[A-Z][A-Z0-9_]*-|#{Issue.reference_prefix})#{Gitlab::Regex.issue}/
     end
   end
 

app/models/project_services/youtrack_service.rb

@@ -8,7 +8,7 @@ class YoutrackService < IssueTrackerService
     if only_long
       /(?<issue>\b[A-Za-z][A-Za-z0-9_]*-\d+\b)/
     else
-      /(?<issue>\b[A-Za-z][A-Za-z0-9_]*-\d+\b)|(#{Issue.reference_prefix}(?<issue>\d+))/
+      /(?<issue>\b[A-Za-z][A-Za-z0-9_]*-\d+\b)|(#{Issue.reference_prefix}#{Gitlab::Regex.issue})/
     end
   end
 

ee/app/models/design_management/design.rb

@@ -165,7 +165,7 @@ module DesignManagement
     def self.link_reference_pattern
       @link_reference_pattern ||= begin
         exts = SAFE_IMAGE_EXT + DANGEROUS_IMAGE_EXT
-        path_segment = %r{issues/(?<issue>\d+)/designs}
+        path_segment = %r{issues/#{Gitlab::Regex.issue}/designs}
         filename_pattern = %r{(?<simple_file_name>[a-z0-9_=-]+\.(#{exts.join('|')}))}i
 
         super(path_segment, filename_pattern)

lib/gitlab/regex.rb

@@ -112,7 +112,7 @@ module Gitlab
     # Based on Jira's project key format
     # https://confluence.atlassian.com/adminjiraserver073/changing-the-project-key-format-861253229.html
     def jira_issue_key_regex
-      @jira_issue_key_regex ||= /[A-Z][A-Z_0-9]+-\d+/
+      @jira_issue_key_regex ||= /[A-Z][A-Z_0-9]+-\d+\b/
     end
 
     def jira_transition_id_regex
@@ -144,6 +144,10 @@ module Gitlab
     def utc_date_regex
       @utc_date_regex ||= /\A[0-9]{4}-[0-9]{2}-[0-9]{2}\z/.freeze
     end
+
+    def issue
+      @issue ||= /(?<issue>\d+\b)/
+    end
   end
 end
 

spec/models/project_services/youtrack_service_spec.rb

@@ -38,8 +38,8 @@ describe YoutrackService do
       expect(described_class.reference_pattern.match('YT-123')[:issue]).to eq('YT-123')
     end
 
-    it 'does not allow issue number to be followed by a letter' do
-      expect(described_class.reference_pattern.match('YT-123A')).to eq(nil)
+    it 'allows lowercase project key on the reference' do
+      expect(described_class.reference_pattern.match('yt-123')[:issue]).to eq('yt-123')
     end
   end
 

spec/support/shared_examples/models/issue_tracker_service_shared_examples.rb

@@ -21,4 +21,8 @@ RSpec.shared_examples 'allows project key on reference pattern' do |url_attr|
     expect(described_class.reference_pattern.match('3EXT_EXT-1234')).to eq nil
     expect(described_class.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
   end
+
+  it 'does not allow issue number to finish with a letter' do
+    expect(described_class.reference_pattern.match('EXT-123A')).to eq(nil)
+  end
 end