diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 03:07:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 03:07:46 +0000 |
commit | b24ae1cbc66e5b0f622393bcf2c59711750161ea (patch) | |
tree | de9514fdda81f7d8293612687026a87826b0d9dd /spec | |
parent | 775816e676aae53509d7b6f364945f2720636f72 (diff) | |
download | gitlab-ce-b24ae1cbc66e5b0f622393bcf2c59711750161ea.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 13 | ||||
-rw-r--r-- | spec/models/repository_spec.rb | 7 | ||||
-rw-r--r-- | spec/workers/deployments/finished_worker_spec.rb | 12 |
3 files changed, 7 insertions, 25 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 3b7d8adb8e5..2476cf43678 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1289,19 +1289,6 @@ describe Projects::MergeRequestsController do get_ci_environments_status(environment_target: 'merge_commit') end - context 'when the deployment_merge_requests_widget feature flag is disabled' do - it 'uses the deployments retrieved using CI builds' do - stub_feature_flags(deployment_merge_requests_widget: false) - - expect(EnvironmentStatus) - .to receive(:after_merge_request) - .with(merge_request, user) - .and_call_original - - get_ci_environments_status(environment_target: 'merge_commit') - end - end - def get_ci_environments_status(extra_params = {}) params = { namespace_id: merge_request.project.namespace.to_param, diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 661cbd14427..38f3777c902 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1331,6 +1331,13 @@ describe Repository do repository.root_ref end + it 'returns nil if the repository does not exist' do + repository = create(:project).repository + + expect(repository).not_to be_exists + expect(repository.root_ref).to be_nil + end + it_behaves_like 'asymmetric cached method', :root_ref end diff --git a/spec/workers/deployments/finished_worker_spec.rb b/spec/workers/deployments/finished_worker_spec.rb index f0e3439fdfa..2961ff599c3 100644 --- a/spec/workers/deployments/finished_worker_spec.rb +++ b/spec/workers/deployments/finished_worker_spec.rb @@ -49,17 +49,5 @@ describe Deployments::FinishedWorker do expect(ProjectServiceWorker).not_to have_received(:perform_async) end - - context 'when the tracking of merge requests is disabled' do - it 'does not track the deployed merge requests' do - stub_feature_flags(deployment_merge_requests: false) - - deployment = create(:deployment) - - expect(Deployments::LinkMergeRequestsService).not_to receive(:new) - - worker.perform(deployment.id) - end - end end end |