diff options
Diffstat (limited to 'spec/services/merge_requests')
10 files changed, 36 insertions, 36 deletions
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb index d546a092680..61cb60e1536 100644 --- a/spec/services/merge_requests/build_service_spec.rb +++ b/spec/services/merge_requests/build_service_spec.rb @@ -130,7 +130,7 @@ describe MergeRequests::BuildService do let!(:project) { fork_project(target_project, user, namespace: user.namespace, repository: true) } let(:source_project) { project } - it 'creates compare object with target branch as default branch' do + it 'creates compare object with target branch as default branch', :sidekiq_might_not_need_inline do expect(merge_request.compare).to be_present expect(merge_request.target_branch).to eq(project.default_branch) end diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb index 29b7e0f17e2..b037b73752e 100644 --- a/spec/services/merge_requests/close_service_spec.rb +++ b/spec/services/merge_requests/close_service_spec.rb @@ -38,7 +38,7 @@ describe MergeRequests::CloseService do .with(@merge_request, 'close') end - it 'sends email to user2 about assign of new merge_request' do + it 'sends email to user2 about assign of new merge_request', :sidekiq_might_not_need_inline do email = ActionMailer::Base.deliveries.last expect(email.to.first).to eq(user2.email) expect(email.subject).to include(merge_request.title) diff --git a/spec/services/merge_requests/create_from_issue_service_spec.rb b/spec/services/merge_requests/create_from_issue_service_spec.rb index 51a5c51f6c3..7145cfe7897 100644 --- a/spec/services/merge_requests/create_from_issue_service_spec.rb +++ b/spec/services/merge_requests/create_from_issue_service_spec.rb @@ -36,25 +36,25 @@ describe MergeRequests::CreateFromIssueService do expect(result[:message]).to eq('Invalid issue iid') end - it 'creates a branch based on issue title' do + it 'creates a branch based on issue title', :sidekiq_might_not_need_inline do service.execute expect(target_project.repository.branch_exists?(issue.to_branch_name)).to be_truthy end - it 'creates a branch using passed name' do + it 'creates a branch using passed name', :sidekiq_might_not_need_inline do service_with_custom_source_branch.execute expect(target_project.repository.branch_exists?(custom_source_branch)).to be_truthy end - it 'creates the new_merge_request system note' do + it 'creates the new_merge_request system note', :sidekiq_might_not_need_inline do expect(SystemNoteService).to receive(:new_merge_request).with(issue, project, user, instance_of(MergeRequest)) service.execute end - it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created' do + it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created', :sidekiq_might_not_need_inline do expect_any_instance_of(MergeRequest).to receive(:valid?).at_least(:once).and_return(false) expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, issue.to_branch_name, branch_project: target_project) @@ -62,35 +62,35 @@ describe MergeRequests::CreateFromIssueService do service.execute end - it 'creates a merge request' do + it 'creates a merge request', :sidekiq_might_not_need_inline do expect { service.execute }.to change(target_project.merge_requests, :count).by(1) end - it 'sets the merge request author to current user' do + it 'sets the merge request author to current user', :sidekiq_might_not_need_inline do result = service.execute expect(result[:merge_request].author).to eq(user) end - it 'sets the merge request source branch to the new issue branch' do + it 'sets the merge request source branch to the new issue branch', :sidekiq_might_not_need_inline do result = service.execute expect(result[:merge_request].source_branch).to eq(issue.to_branch_name) end - it 'sets the merge request source branch to the passed branch name' do + it 'sets the merge request source branch to the passed branch name', :sidekiq_might_not_need_inline do result = service_with_custom_source_branch.execute expect(result[:merge_request].source_branch).to eq(custom_source_branch) end - it 'sets the merge request target branch to the project default branch' do + it 'sets the merge request target branch to the project default branch', :sidekiq_might_not_need_inline do result = service.execute expect(result[:merge_request].target_branch).to eq(target_project.default_branch) end - it 'executes quick actions if the build service sets them in the description' do + it 'executes quick actions if the build service sets them in the description', :sidekiq_might_not_need_inline do allow(service).to receive(:merge_request).and_wrap_original do |m, *args| m.call(*args).tap do |merge_request| merge_request.description = "/assign #{user.to_reference}" @@ -102,7 +102,7 @@ describe MergeRequests::CreateFromIssueService do expect(result[:merge_request].assignees).to eq([user]) end - context 'when ref branch is set' do + context 'when ref branch is set', :sidekiq_might_not_need_inline do subject { described_class.new(project, user, ref: 'feature', **service_params).execute } it 'sets the merge request source branch to the new issue branch' do @@ -193,7 +193,7 @@ describe MergeRequests::CreateFromIssueService do it_behaves_like 'a service that creates a merge request from an issue' - it 'sets the merge request title to: "WIP: $issue-branch-name' do + it 'sets the merge request title to: "WIP: $issue-branch-name', :sidekiq_might_not_need_inline do result = service.execute expect(result[:merge_request].title).to eq("WIP: #{issue.to_branch_name.titleize.humanize}") diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb index 699f2a98088..3db1471bf3c 100644 --- a/spec/services/merge_requests/create_service_spec.rb +++ b/spec/services/merge_requests/create_service_spec.rb @@ -57,7 +57,7 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do expect(Todo.where(attributes).count).to be_zero end - it 'creates exactly 1 create MR event' do + it 'creates exactly 1 create MR event', :sidekiq_might_not_need_inline do attributes = { action: Event::CREATED, target_id: merge_request.id, @@ -216,7 +216,7 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do target_project.add_maintainer(user) end - it 'create legacy detached merge request pipeline for fork merge request' do + it 'create legacy detached merge request pipeline for fork merge request', :sidekiq_might_not_need_inline do expect(merge_request.actual_head_pipeline) .to be_legacy_detached_merge_request_pipeline end @@ -477,7 +477,7 @@ describe MergeRequests::CreateService, :clean_gitlab_redis_shared_state do project.add_developer(user) end - it 'creates the merge request' do + it 'creates the merge request', :sidekiq_might_not_need_inline do merge_request = described_class.new(project, user, opts).execute expect(merge_request).to be_persisted diff --git a/spec/services/merge_requests/push_options_handler_service_spec.rb b/spec/services/merge_requests/push_options_handler_service_spec.rb index ff4cdd3e7e2..75b9c2304a6 100644 --- a/spec/services/merge_requests/push_options_handler_service_spec.rb +++ b/spec/services/merge_requests/push_options_handler_service_spec.rb @@ -46,7 +46,7 @@ describe MergeRequests::PushOptionsHandlerService do expect(last_mr.assignees).to contain_exactly(user) end - context 'when project has been forked' do + context 'when project has been forked', :sidekiq_might_not_need_inline do let(:forked_project) { fork_project(project, user, repository: true) } let(:service) { described_class.new(forked_project, user, changes, push_options) } diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb index 7b8c94c86fe..9c535664c26 100644 --- a/spec/services/merge_requests/rebase_service_spec.rb +++ b/spec/services/merge_requests/rebase_service_spec.rb @@ -174,7 +174,7 @@ describe MergeRequests::RebaseService do target_branch: 'master', target_project: project) end - it 'rebases source branch' do + it 'rebases source branch', :sidekiq_might_not_need_inline do parent_sha = forked_project.repository.commit(merge_request_from_fork.source_branch).parents.first.sha target_branch_sha = project.repository.commit(merge_request_from_fork.target_branch).sha expect(parent_sha).to eq(target_branch_sha) diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 2dc932c9f2c..58302ce14ba 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -137,7 +137,7 @@ describe MergeRequests::RefreshService do subject { service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/master') } - it 'updates the head_pipeline_id for @merge_request' do + it 'updates the head_pipeline_id for @merge_request', :sidekiq_might_not_need_inline do expect { subject }.to change { @merge_request.reload.head_pipeline_id }.from(nil).to(pipeline.id) end @@ -200,7 +200,7 @@ describe MergeRequests::RefreshService do context 'when service runs on forked project' do let(:project) { @fork_project } - it 'creates legacy detached merge request pipeline for fork merge request' do + it 'creates legacy detached merge request pipeline for fork merge request', :sidekiq_might_not_need_inline do expect { subject } .to change { @fork_merge_request.pipelines_for_merge_request.count }.by(1) @@ -232,7 +232,7 @@ describe MergeRequests::RefreshService do subject end - it 'sets the latest detached merge request pipeline as a head pipeline' do + it 'sets the latest detached merge request pipeline as a head pipeline', :sidekiq_might_not_need_inline do @merge_request.reload expect(@merge_request.actual_head_pipeline).to be_merge_request_event end @@ -304,7 +304,7 @@ describe MergeRequests::RefreshService do end end - context 'push to origin repo target branch' do + context 'push to origin repo target branch', :sidekiq_might_not_need_inline do context 'when all MRs to the target branch had diffs' do before do service.new(@project, @user).execute(@oldrev, @newrev, 'refs/heads/feature') @@ -354,7 +354,7 @@ describe MergeRequests::RefreshService do end end - context 'manual merge of source branch' do + context 'manual merge of source branch', :sidekiq_might_not_need_inline do before do # Merge master -> feature branch @project.repository.merge(@user, @merge_request.diff_head_sha, @merge_request, 'Test message') @@ -374,7 +374,7 @@ describe MergeRequests::RefreshService do end end - context 'push to fork repo source branch' do + context 'push to fork repo source branch', :sidekiq_might_not_need_inline do let(:refresh_service) { service.new(@fork_project, @user) } def refresh @@ -431,7 +431,7 @@ describe MergeRequests::RefreshService do end end - context 'push to fork repo target branch' do + context 'push to fork repo target branch', :sidekiq_might_not_need_inline do describe 'changes to merge requests' do before do service.new(@fork_project, @user).execute(@oldrev, @newrev, 'refs/heads/feature') @@ -457,7 +457,7 @@ describe MergeRequests::RefreshService do end end - context 'forked projects with the same source branch name as target branch' do + context 'forked projects with the same source branch name as target branch', :sidekiq_might_not_need_inline do let!(:first_commit) do @fork_project.repository.create_file(@user, 'test1.txt', 'Test data', message: 'Test commit', @@ -537,7 +537,7 @@ describe MergeRequests::RefreshService do context 'push new branch that exists in a merge request' do let(:refresh_service) { service.new(@fork_project, @user) } - it 'refreshes the merge request' do + it 'refreshes the merge request', :sidekiq_might_not_need_inline do expect(refresh_service).to receive(:execute_hooks) .with(@fork_merge_request, 'update', old_rev: Gitlab::Git::BLANK_SHA) allow_any_instance_of(Repository).to receive(:merge_base).and_return(@oldrev) diff --git a/spec/services/merge_requests/reopen_service_spec.rb b/spec/services/merge_requests/reopen_service_spec.rb index 7a98437f724..25ab79d70c3 100644 --- a/spec/services/merge_requests/reopen_service_spec.rb +++ b/spec/services/merge_requests/reopen_service_spec.rb @@ -37,7 +37,7 @@ describe MergeRequests::ReopenService do .with(merge_request, 'reopen') end - it 'sends email to user2 about reopen of merge_request' do + it 'sends email to user2 about reopen of merge_request', :sidekiq_might_not_need_inline do email = ActionMailer::Base.deliveries.last expect(email.to.first).to eq(user2.email) expect(email.subject).to include(merge_request.title) diff --git a/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb b/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb index 0a10a9ee13b..dc2bd5bf3d0 100644 --- a/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb +++ b/spec/services/merge_requests/resolved_discussion_notification_service_spec.rb @@ -38,7 +38,7 @@ describe MergeRequests::ResolvedDiscussionNotificationService do subject.execute(merge_request) end - it "sends a notification email" do + it "sends a notification email", :sidekiq_might_not_need_inline do expect_any_instance_of(NotificationService).to receive(:resolve_all_discussions).with(merge_request, user) subject.execute(merge_request) diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index d3c4c436901..8c796475de0 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -98,7 +98,7 @@ describe MergeRequests::UpdateService, :mailer do ) end - it 'sends email to user2 about assign of new merge request and email to user3 about merge request unassignment' do + it 'sends email to user2 about assign of new merge request and email to user3 about merge request unassignment', :sidekiq_might_not_need_inline do deliveries = ActionMailer::Base.deliveries email = deliveries.last recipients = deliveries.last(2).flat_map(&:to) @@ -181,7 +181,7 @@ describe MergeRequests::UpdateService, :mailer do end end - it 'merges the MR' do + it 'merges the MR', :sidekiq_might_not_need_inline do expect(@merge_request).to be_valid expect(@merge_request.state).to eq('merged') expect(@merge_request.merge_error).to be_nil @@ -202,7 +202,7 @@ describe MergeRequests::UpdateService, :mailer do end end - it 'merges the MR' do + it 'merges the MR', :sidekiq_might_not_need_inline do expect(@merge_request).to be_valid expect(@merge_request.state).to eq('merged') end @@ -332,7 +332,7 @@ describe MergeRequests::UpdateService, :mailer do it_behaves_like 'system notes for milestones' - it 'sends notifications for subscribers of changed milestone' do + it 'sends notifications for subscribers of changed milestone', :sidekiq_might_not_need_inline do merge_request.milestone = create(:milestone, project: project) merge_request.save @@ -364,7 +364,7 @@ describe MergeRequests::UpdateService, :mailer do it_behaves_like 'system notes for milestones' - it 'sends notifications for subscribers of changed milestone' do + it 'sends notifications for subscribers of changed milestone', :sidekiq_might_not_need_inline do perform_enqueued_jobs do update_merge_request(milestone: create(:milestone, project: project)) end @@ -431,7 +431,7 @@ describe MergeRequests::UpdateService, :mailer do project.add_developer(subscriber) end - it 'sends notifications for subscribers of newly added labels' do + it 'sends notifications for subscribers of newly added labels', :sidekiq_might_not_need_inline do opts = { label_ids: [label.id] } perform_enqueued_jobs do |