From 51612d3ef5be853289008694c40973b479e8547c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 4 Feb 2020 21:08:55 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/quality/test_level_spec.rb | 4 +- spec/models/project_spec.rb | 22 ++++++ .../merge_request_widget_entity_spec.rb | 88 ++++++++++++++++++++++ 3 files changed, 112 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/lib/quality/test_level_spec.rb b/spec/lib/quality/test_level_spec.rb index 13817bdcc72..621a426a18d 100644 --- a/spec/lib/quality/test_level_spec.rb +++ b/spec/lib/quality/test_level_spec.rb @@ -21,7 +21,7 @@ RSpec.describe Quality::TestLevel do context 'when level is unit' do it 'returns a pattern' do expect(subject.pattern(:unit)) - .to eq("spec/{bin,config,db,dependencies,factories,finders,frontend,graphql,haml_lint,helpers,initializers,javascripts,lib,models,policies,presenters,rack_servers,routing,rubocop,serializers,services,sidekiq,tasks,uploaders,validators,views,workers,elastic_integration}{,/**/}*_spec.rb") + .to eq("spec/{bin,config,db,dependencies,factories,finders,frontend,graphql,haml_lint,helpers,initializers,javascripts,lib,models,policies,presenters,rack_servers,replicators,routing,rubocop,serializers,services,sidekiq,tasks,uploaders,validators,views,workers,elastic_integration}{,/**/}*_spec.rb") end end @@ -82,7 +82,7 @@ RSpec.describe Quality::TestLevel do context 'when level is unit' do it 'returns a regexp' do expect(subject.regexp(:unit)) - .to eq(%r{spec/(bin|config|db|dependencies|factories|finders|frontend|graphql|haml_lint|helpers|initializers|javascripts|lib|models|policies|presenters|rack_servers|routing|rubocop|serializers|services|sidekiq|tasks|uploaders|validators|views|workers|elastic_integration)}) + .to eq(%r{spec/(bin|config|db|dependencies|factories|finders|frontend|graphql|haml_lint|helpers|initializers|javascripts|lib|models|policies|presenters|rack_servers|replicators|routing|rubocop|serializers|services|sidekiq|tasks|uploaders|validators|views|workers|elastic_integration)}) end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 7decc1bc911..635db5a73cb 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2095,6 +2095,28 @@ describe Project do end end + describe '#uses_default_ci_config?' do + let(:project) { build(:project)} + + it 'has a custom ci config path' do + project.ci_config_path = 'something_custom' + + expect(project.uses_default_ci_config?).to be_falsey + end + + it 'has a blank ci config path' do + project.ci_config_path = '' + + expect(project.uses_default_ci_config?).to be_truthy + end + + it 'does not have a custom ci config path' do + project.ci_config_path = nil + + expect(project.uses_default_ci_config?).to be_truthy + end + end + describe '#latest_successful_build_for_ref' do let(:project) { create(:project, :repository) } let(:pipeline) { create_pipeline(project) } diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb index 80f59ef90ca..f621cb650f9 100644 --- a/spec/serializers/merge_request_widget_entity_spec.rb +++ b/spec/serializers/merge_request_widget_entity_spec.rb @@ -53,6 +53,94 @@ describe MergeRequestWidgetEntity do .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}.diff") end + describe 'merge_request_add_ci_config_path' do + before do + project.add_role(user, role) + end + + context 'when there are pipelines' do + let(:role) { :developer } + + before do + create(:ci_empty_pipeline, project: project, sha: resource.all_commit_shas.first, ref: resource.source_branch) + end + + it 'no ci config path' do + expect(subject[:merge_request_add_ci_config_path]).to be_nil + end + end + + context 'when there are no pipelines' do + context 'when user has permissions' do + let(:role) { :developer } + + it 'has add ci config path' do + expect(subject[:merge_request_add_ci_config_path]) + .to eq("/#{resource.project.full_path}/-/new/#{resource.source_branch}?commit_message=Add+.gitlab-ci.yml&file_name=.gitlab-ci.yml") + end + + context 'when source project is missing' do + before do + resource.source_project = nil + end + + it 'returns a blank ci config path' do + expect(subject[:merge_request_add_ci_config_path]).to be_nil + end + end + + context 'when there are no commits' do + before do + allow(resource).to receive(:commits_count).and_return(0) + end + + it 'returns a blank ci config path' do + expect(subject[:merge_request_add_ci_config_path]).to be_nil + end + end + + context 'when ci_config_path is customized' do + it 'has no path if ci_config_path is not set to our default setting' do + project.ci_config_path = 'not_default' + + expect(subject[:merge_request_add_ci_config_path]).to be_nil + end + + it 'has a path if ci_config_path unset' do + expect(subject[:merge_request_add_ci_config_path]).not_to be_nil + end + + it 'has a path if ci_config_path is an empty string' do + project.ci_config_path = '' + + expect(subject[:merge_request_add_ci_config_path]).not_to be_nil + end + + it 'has a path if ci_config_path is set to our default file' do + project.ci_config_path = Gitlab::FileDetector::PATTERNS[:gitlab_ci] + + expect(subject[:merge_request_add_ci_config_path]).not_to be_nil + end + end + end + + context 'when user does not have permissions' do + let(:role) { :reporter } + + it 'has add ci config path' do + expect(subject[:merge_request_add_ci_config_path]).to be_nil + end + end + end + end + + it 'has human access' do + project.add_maintainer(user) + + expect(subject[:human_access]) + .to eq('Maintainer') + end + describe 'when source project is deleted' do let(:project) { create(:project, :repository) } let(:forked_project) { fork_project(project) } -- cgit v1.2.3