diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /spec/presenters/ci | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'spec/presenters/ci')
-rw-r--r-- | spec/presenters/ci/pipeline_presenter_spec.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/spec/presenters/ci/pipeline_presenter_spec.rb b/spec/presenters/ci/pipeline_presenter_spec.rb index 18f79bc930c..5cb9d340e06 100644 --- a/spec/presenters/ci/pipeline_presenter_spec.rb +++ b/spec/presenters/ci/pipeline_presenter_spec.rb @@ -5,17 +5,20 @@ require 'spec_helper' RSpec.describe Ci::PipelinePresenter do include Gitlab::Routing - let(:user) { create(:user) } + let_it_be(:user) { create(:user) } + let_it_be_with_reload(:project) { create(:project, :test_repo) } + let_it_be_with_reload(:pipeline) { create(:ci_pipeline, project: project) } let(:current_user) { user } - let(:project) { create(:project, :test_repo) } - let(:pipeline) { create(:ci_pipeline, project: project) } subject(:presenter) do described_class.new(pipeline) end - before do + before_all do project.add_developer(user) + end + + before do allow(presenter).to receive(:current_user) { current_user } end @@ -184,8 +187,8 @@ RSpec.describe Ci::PipelinePresenter do describe '#all_related_merge_request_text' do subject { presenter.all_related_merge_request_text } - let(:mr_1) { create(:merge_request) } - let(:mr_2) { create(:merge_request) } + let_it_be(:mr_1) { create(:merge_request) } + let_it_be(:mr_2) { create(:merge_request) } context 'with zero related merge requests (branch pipeline)' do it { is_expected.to eq('No related merge requests found.') } @@ -242,7 +245,7 @@ RSpec.describe Ci::PipelinePresenter do end context 'permissions' do - let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline, source_project: project) } + let_it_be_with_refind(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline, source_project: project) } let(:pipeline) { merge_request.all_pipelines.take } shared_examples 'private merge requests' do |