diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 15:06:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 15:06:43 +0000 |
commit | eac0da9a47f0c7b8b970833d7d5b96cfee057bf7 (patch) | |
tree | 7b7865053435c6dcb4e2d945fcf45e309331c91b /spec/controllers/projects/merge_requests_controller_spec.rb | |
parent | b860c6ba2607541e3b5bdf0fc2daaa9ed41a8726 (diff) | |
download | gitlab-ce-eac0da9a47f0c7b8b970833d7d5b96cfee057bf7.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index bcdff060350..4519cd014a1 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1280,6 +1280,28 @@ describe Projects::MergeRequestsController do end end + it 'uses the explicitly linked deployments' do + expect(EnvironmentStatus) + .to receive(:for_deployed_merge_request) + .with(merge_request, user) + .and_call_original + + 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, |