diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 09:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 09:09:37 +0300 |
| commit | 0301a0cad0063d76b1607358dc6c711ea043fdda (patch) | |
| tree | 894ac424a6fb370ad8dc5de4294cdc87f0ae164e /spec/services/merge_requests | |
| parent | dcce066c5059c4df112dce4a9edf288d74aec48b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 4d72decb632..fa7f745d8a0 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -158,7 +158,7 @@ describe MergeRequests::MergeService do end it 'does not close issue' do - allow(jira_tracker).to receive_messages(jira_issue_transition_id: nil) + jira_tracker.update(jira_issue_transition_id: nil) expect_any_instance_of(JiraService).not_to receive(:transition_issue) |