diff options
| author | Sam Bigelow <sbigelow@gitlab.com> | 2019-01-09 23:08:52 -0500 |
|---|---|---|
| committer | Sam Bigelow <sbigelow@gitlab.com> | 2019-01-22 12:57:01 -0500 |
| commit | c607b358241712af0d6b442b8e7a277cb6ba8a38 (patch) | |
| tree | 0ac6dd259044b49e317724a542dbf05376070537 /spec/controllers | |
| parent | 1b3affafab0f28c690ce93cc98ac6bd09cbda59f (diff) | |
| download | gitlab-ce-25569-changing-wording-to-delete-when-referring-to-removing-a-branch.tar.gz | |
Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branch
This is to match `git branch -D <branchname>`
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/branches_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index 02b3d5269a6..52a20fa8d07 100644 --- a/spec/controllers/projects/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -331,7 +331,7 @@ describe Projects::BranchesController do let(:branch) { "feature" } it 'returns JSON response with message' do - expect(json_response).to eql("message" => 'Branch was removed') + expect(json_response).to eql("message" => 'Branch was deleted') end it { expect(response).to have_gitlab_http_status(200) } @@ -341,7 +341,7 @@ describe Projects::BranchesController do let(:branch) { "improve/awesome" } it 'returns JSON response with message' do - expect(json_response).to eql('message' => 'Branch was removed') + expect(json_response).to eql('message' => 'Branch was deleted') end it { expect(response).to have_gitlab_http_status(200) } @@ -351,7 +351,7 @@ describe Projects::BranchesController do let(:branch) { 'improve%2Fawesome' } it 'returns JSON response with message' do - expect(json_response).to eql('message' => 'Branch was removed') + expect(json_response).to eql('message' => 'Branch was deleted') end it { expect(response).to have_gitlab_http_status(200) } |