diff options
author | Blake Hitchcock <rbhitchcock@gmail.com> | 2016-01-25 11:27:03 -0500 |
---|---|---|
committer | Blake Hitchcock <rbhitchcock@gmail.com> | 2016-01-26 15:55:40 -0500 |
commit | 4be65c3231f1bc260134d1c301b24baf87ef1552 (patch) | |
tree | d4ab7e3962fe10533dc56451d3eb5cdbdcaa5648 /spec/lib | |
parent | 95c644dfa2b433e9658f7ea1e76c08bf1fcc74ab (diff) | |
download | gitlab-ce-4be65c3231f1bc260134d1c301b24baf87ef1552.tar.gz |
Update ExternalIssue regex for JIRA integration
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html
* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/closing_issue_extractor_spec.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/lib/gitlab/closing_issue_extractor_spec.rb b/spec/lib/gitlab/closing_issue_extractor_spec.rb index 99288da1e43..04cf11fc6f1 100644 --- a/spec/lib/gitlab/closing_issue_extractor_spec.rb +++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb @@ -135,6 +135,17 @@ describe Gitlab::ClosingIssueExtractor, lib: true do message = "resolve #{reference}" expect(subject.closed_by_message(message)).to eq([issue]) end + + context 'with an external issue tracker reference' do + it 'extracts the referenced issue' do + jira_project = create(:jira_project, name: 'JIRA_EXT1') + jira_issue = ExternalIssue.new("#{jira_project.name}-1", project: jira_project) + closing_issue_extractor = described_class.new jira_project + message = "Resolve #{jira_issue.to_reference}" + + expect(closing_issue_extractor.closed_by_message(message)).to eq([jira_issue]) + end + end end context "with a cross-project reference" do |