diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/services/merge_requests/reopen_service_spec.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/services/merge_requests/reopen_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/reopen_service_spec.rb | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb index 25ab79d70c3..3807c44b01f 100644 --- a/spec/services/merge_requests/reopen_service_spec.rb +++ b/spec/services/merge_requests/reopen_service_spec.rb @@ -20,8 +20,11 @@ describe MergeRequests::ReopenService do context 'valid params' do let(:service) { described_class.new(project, user, {}) } + let(:state_tracking) { true } before do + stub_feature_flags(track_resource_state_change_events: state_tracking) + allow(service).to receive(:execute_hooks) perform_enqueued_jobs do @@ -43,9 +46,22 @@ describe MergeRequests::ReopenService do expect(email.subject).to include(merge_request.title) end - it 'creates system note about merge_request reopen' do - note = merge_request.notes.last - expect(note.note).to include 'reopened' + context 'note creation' do + context 'when state event tracking is disabled' do + let(:state_tracking) { false } + + it 'creates system note about merge_request reopen' do + note = merge_request.notes.last + expect(note.note).to include 'reopened' + end + end + + context 'when state event tracking is enabled' do + it 'creates resource state event about merge_request reopen' do + event = merge_request.resource_state_events.last + expect(event.state).to eq('reopened') + end + end end end |