diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 09:15:40 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 09:15:40 +0000 |
| commit | 2fc500819f83edf976879789113673389c55a461 (patch) | |
| tree | bf4729e2d6eaea95013c459fe77456161423b20d /spec/models/merge_request_spec.rb | |
| parent | 5dd157be16c04850279373123d9dba4377a9f852 (diff) | |
| parent | 3e4013f21760be5522ac080669b6da9fb9118999 (diff) | |
| download | gitlab-ce-2fc500819f83edf976879789113673389c55a461.tar.gz | |
Merge branch 'issue_36820' into 'master'
Remove closing external issues by reference error
Closes #36820
See merge request !13910
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 09f3b97ec58..f5d079c27c4 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -159,6 +159,7 @@ describe MergeRequest do before do subject.project.has_external_issue_tracker = true subject.project.save! + create(:jira_service, project: subject.project) end it 'does not cache issues from external trackers' do @@ -166,6 +167,7 @@ describe MergeRequest do commit = double('commit1', safe_message: "Fixes #{issue.to_reference}") allow(subject).to receive(:commits).and_return([commit]) + expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to raise_error expect { subject.cache_merge_request_closes_issues!(subject.author) }.not_to change(subject.merge_requests_closing_issues, :count) end |