diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/services/branches | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/services/branches')
-rw-r--r-- | spec/services/branches/create_service_spec.rb | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/spec/services/branches/create_service_spec.rb b/spec/services/branches/create_service_spec.rb index 26cc1a0665e..19a32aafa38 100644 --- a/spec/services/branches/create_service_spec.rb +++ b/spec/services/branches/create_service_spec.rb @@ -56,17 +56,6 @@ RSpec.describe Branches::CreateService, :use_clean_rails_redis_caching do end end - context 'when an ambiguous branch name is provided' do - let(:branches) { { 'ambiguous/test' => 'master', 'ambiguous' => 'master' } } - - it 'returns an error that branch could not be created' do - err_msg = 'Failed to create branch \'ambiguous\': 13:reference is ambiguous.' - - expect(subject[:status]).to eq(:error) - expect(subject[:message]).to match_array([err_msg]) - end - end - context 'when PreReceiveError exception' do let(:branches) { { 'error' => 'master' } } @@ -184,18 +173,6 @@ RSpec.describe Branches::CreateService, :use_clean_rails_redis_caching do end end - context 'when an ambiguous branch name is provided' do - it 'returns an error that branch could not be created' do - err_msg = 'Failed to create branch \'feature\': 13:reference is ambiguous.' - - service.execute('feature/widget', 'master') - result = service.execute('feature', 'master') - - expect(result[:status]).to eq(:error) - expect(result[:message]).to eq(err_msg) - end - end - it 'logs and returns an error if there is a PreReceiveError exception' do error_message = 'pre receive error' raw_message = "GitLab: #{error_message}" |