From 3e06afc4cd1b75b3e957e8debf5e4f1963ba18e0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 10 Dec 2020 12:09:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/models/resource_state_event_spec.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'spec/models/resource_state_event_spec.rb') diff --git a/spec/models/resource_state_event_spec.rb b/spec/models/resource_state_event_spec.rb index b8a93bdbe3b..2b4898b750a 100644 --- a/spec/models/resource_state_event_spec.rb +++ b/spec/models/resource_state_event_spec.rb @@ -41,7 +41,7 @@ RSpec.describe ResourceStateEvent, type: :model do end context 'callbacks' do - describe '#usage_metrics' do + describe '#issue_usage_metrics' do it 'tracks closed issues' do expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).to receive(:track_issue_closed_action) @@ -53,6 +53,12 @@ RSpec.describe ResourceStateEvent, type: :model do create(described_class.name.underscore.to_sym, issue: issue, state: described_class.states[:reopened]) end + + it 'does not track merge requests' do + expect(Gitlab::UsageDataCounters::IssueActivityUniqueCounter).not_to receive(:track_issue_closed_action) + + create(described_class.name.underscore.to_sym, merge_request: merge_request, state: described_class.states[:closed]) + end end end end -- cgit v1.2.1