diff options
Diffstat (limited to 'spec/services/merge_requests/create_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/create_service_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index 9155db16d17..bb40c399b6e 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -59,7 +59,7 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do it 'creates exactly 1 create MR event', :sidekiq_might_not_need_inline do attributes = { - action: Event::CREATED, + action: :created, target_id: merge_request.id, target_type: merge_request.class.name } @@ -136,11 +136,11 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do let!(:pipeline_3) { create(:ci_pipeline, project: project, ref: "other_branch", project_id: project.id) } before do - # rubocop: disable DestroyAll + # rubocop: disable Cop/DestroyAll project.merge_requests .where(source_branch: opts[:source_branch], target_branch: opts[:target_branch]) .destroy_all - # rubocop: enable DestroyAll + # rubocop: enable Cop/DestroyAll end it 'sets head pipeline' do |