From 2399724614f3c4dcf3059038d997193830de93ee Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Jan 2020 03:08:37 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../ci/auto_merge_merge_requests_examples.rb | 40 ---------------------- .../auto_merge_merge_requests_shared_examples.rb | 40 ++++++++++++++++++++++ .../shared_examples/ci/pipeline_email_examples.rb | 20 ----------- .../ci/pipeline_email_shared_examples.rb | 20 +++++++++++ .../shared_examples/ci/stage_shared_examples.rb | 2 +- 5 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 spec/support/shared_examples/ci/auto_merge_merge_requests_examples.rb create mode 100644 spec/support/shared_examples/ci/auto_merge_merge_requests_shared_examples.rb delete mode 100644 spec/support/shared_examples/ci/pipeline_email_examples.rb create mode 100644 spec/support/shared_examples/ci/pipeline_email_shared_examples.rb (limited to 'spec/support/shared_examples/ci') diff --git a/spec/support/shared_examples/ci/auto_merge_merge_requests_examples.rb b/spec/support/shared_examples/ci/auto_merge_merge_requests_examples.rb deleted file mode 100644 index c11448ffe0f..00000000000 --- a/spec/support/shared_examples/ci/auto_merge_merge_requests_examples.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true - -shared_examples 'aborted merge requests for MWPS' do - let(:aborted_message) do - /aborted the automatic merge because target branch was updated/ - end - - it 'aborts auto_merge' do - expect(merge_request.auto_merge_enabled?).to be_falsey - expect(merge_request.notes.last.note).to match(aborted_message) - end - - it 'removes merge_user' do - expect(merge_request.merge_user).to be_nil - end - - it 'does not add todos for merge user' do - expect(user.todos.for_target(merge_request)).to be_empty - end - - it 'adds todos for merge author' do - expect(author.todos.for_target(merge_request)).to be_present.and be_all(&:pending?) - end -end - -shared_examples 'maintained merge requests for MWPS' do - it 'does not cancel auto merge' do - expect(merge_request.auto_merge_enabled?).to be_truthy - expect(merge_request.notes).to be_empty - end - - it 'does not change merge_user' do - expect(merge_request.merge_user).to eq(user) - end - - it 'does not add todos' do - expect(author.todos.for_target(merge_request)).to be_empty - expect(user.todos.for_target(merge_request)).to be_empty - end -end diff --git a/spec/support/shared_examples/ci/auto_merge_merge_requests_shared_examples.rb b/spec/support/shared_examples/ci/auto_merge_merge_requests_shared_examples.rb new file mode 100644 index 00000000000..9024845c325 --- /dev/null +++ b/spec/support/shared_examples/ci/auto_merge_merge_requests_shared_examples.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +RSpec.shared_examples 'aborted merge requests for MWPS' do + let(:aborted_message) do + /aborted the automatic merge because target branch was updated/ + end + + it 'aborts auto_merge' do + expect(merge_request.auto_merge_enabled?).to be_falsey + expect(merge_request.notes.last.note).to match(aborted_message) + end + + it 'removes merge_user' do + expect(merge_request.merge_user).to be_nil + end + + it 'does not add todos for merge user' do + expect(user.todos.for_target(merge_request)).to be_empty + end + + it 'adds todos for merge author' do + expect(author.todos.for_target(merge_request)).to be_present.and be_all(&:pending?) + end +end + +RSpec.shared_examples 'maintained merge requests for MWPS' do + it 'does not cancel auto merge' do + expect(merge_request.auto_merge_enabled?).to be_truthy + expect(merge_request.notes).to be_empty + end + + it 'does not change merge_user' do + expect(merge_request.merge_user).to eq(user) + end + + it 'does not add todos' do + expect(author.todos.for_target(merge_request)).to be_empty + expect(user.todos.for_target(merge_request)).to be_empty + end +end diff --git a/spec/support/shared_examples/ci/pipeline_email_examples.rb b/spec/support/shared_examples/ci/pipeline_email_examples.rb deleted file mode 100644 index f72d8af3c65..00000000000 --- a/spec/support/shared_examples/ci/pipeline_email_examples.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -shared_examples_for 'correct pipeline information for pipelines for merge requests' do - context 'when pipeline for merge request' do - let(:pipeline) { merge_request.all_pipelines.first } - - let(:merge_request) do - create(:merge_request, :with_detached_merge_request_pipeline, - source_project: project, - target_project: project) - end - - it 'renders a source ref of the pipeline' do - render - - expect(rendered).to have_content pipeline.source_ref - expect(rendered).not_to have_content pipeline.ref - end - end -end diff --git a/spec/support/shared_examples/ci/pipeline_email_shared_examples.rb b/spec/support/shared_examples/ci/pipeline_email_shared_examples.rb new file mode 100644 index 00000000000..01e453d8fd9 --- /dev/null +++ b/spec/support/shared_examples/ci/pipeline_email_shared_examples.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +RSpec.shared_examples 'correct pipeline information for pipelines for merge requests' do + context 'when pipeline for merge request' do + let(:pipeline) { merge_request.all_pipelines.first } + + let(:merge_request) do + create(:merge_request, :with_detached_merge_request_pipeline, + source_project: project, + target_project: project) + end + + it 'renders a source ref of the pipeline' do + render + + expect(rendered).to have_content pipeline.source_ref + expect(rendered).not_to have_content pipeline.ref + end + end +end diff --git a/spec/support/shared_examples/ci/stage_shared_examples.rb b/spec/support/shared_examples/ci/stage_shared_examples.rb index 925974ed11e..a2849e00d27 100644 --- a/spec/support/shared_examples/ci/stage_shared_examples.rb +++ b/spec/support/shared_examples/ci/stage_shared_examples.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'manual playable stage' do |stage_type| +RSpec.shared_examples 'manual playable stage' do |stage_type| let(:stage) { build(stage_type, status: status) } describe '#manual_playable?' do -- cgit v1.2.3