diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 03:11:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 03:11:46 +0300 |
| commit | a83fba70a686e21616c0521cf2a3c9525bf54284 (patch) | |
| tree | 6c056ef0185fb7cdb5a1172be9471b535846c36f /spec/controllers/projects | |
| parent | a7aff3e0e4deb15c0902e0f948eb300ba77f3e47 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects')
| -rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 980264bef5c..977879b453c 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -309,6 +309,8 @@ RSpec.describe Projects::IssuesController do it 'fills in an issue for a discussion' do note = create(:note_on_merge_request, project: project) + expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter).to receive(:track_resolve_thread_in_issue_action).with(user: user) + get :new, params: { namespace_id: project.namespace.path, project_id: project, merge_request_to_resolve_discussions_of: note.noteable.iid, discussion_to_resolve: note.discussion_id } expect(assigns(:issue).title).not_to be_empty |