diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 18:06:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 18:06:49 +0000 |
commit | ab7cf450ba19cf80b9534f25dc707b33845e3014 (patch) | |
tree | bbfa6aba83c48aea68d79c4179ce576b6eec326d /spec/controllers/projects/branches_controller_spec.rb | |
parent | 4204cf308596e0e26f578a6e2da88f49c0f4aad9 (diff) | |
download | gitlab-ce-ab7cf450ba19cf80b9534f25dc707b33845e3014.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/branches_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/branches_controller_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index affe0e0f970..4f8ab6a5def 100644 --- a/spec/controllers/projects/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -178,7 +178,7 @@ describe Projects::BranchesController do it 'redirects to newly created branch' do result = { status: :success, branch: double(name: branch) } - expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result) + expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result) expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) post :create, @@ -200,7 +200,7 @@ describe Projects::BranchesController do it 'redirects to autodeploy setup page' do result = { status: :success, branch: double(name: branch) } - expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result) + expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result) expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) post :create, @@ -221,7 +221,7 @@ describe Projects::BranchesController do create(:cluster, :provided_by_gcp, projects: [project]) - expect_any_instance_of(CreateBranchService).to receive(:execute).and_return(result) + expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result) expect(SystemNoteService).to receive(:new_issue_branch).and_return(true) post :create, @@ -459,7 +459,7 @@ describe Projects::BranchesController do end it 'starts worker to delete merged branches' do - expect_any_instance_of(DeleteMergedBranchesService).to receive(:async_execute) + expect_any_instance_of(::Branches::DeleteMergedService).to receive(:async_execute) destroy_all_merged end |