diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/repository_spec.rb | 11 | ||||
| -rw-r--r-- | spec/requests/api/tags_spec.rb | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 397bb5a8028..5cdf644a0e1 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -859,12 +859,15 @@ describe Repository, models: true do describe '#add_tag' do it 'adds a tag' do + user = build_stubbed(:user) expect(repository).to receive(:before_push_tag) + expect(repository.rugged.tags).to receive(:create). + with('8.5', 'master', + hash_including(message: 'foo', + tagger: hash_including(name: user.name, email: user.email))). + and_call_original - expect_any_instance_of(Gitlab::Shell).to receive(:add_tag). - with(repository.path_with_namespace, '8.5', 'master', 'foo') - - repository.add_tag('8.5', 'master', 'foo') + repository.add_tag(user, '8.5', 'master', 'foo') end end diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb index edcb2bedbf7..12e170b232f 100644 --- a/spec/requests/api/tags_spec.rb +++ b/spec/requests/api/tags_spec.rb @@ -147,7 +147,7 @@ describe API::API, api: true do tag_name: 'v8.0.0', ref: 'master' expect(response.status).to eq(400) - expect(json_response['message']).to eq('Tag already exists') + expect(json_response['message']).to eq('Tag v8.0.0 already exists') end it 'should return 400 if ref name is invalid' do @@ -155,7 +155,7 @@ describe API::API, api: true do tag_name: 'mytag', ref: 'foo' expect(response.status).to eq(400) - expect(json_response['message']).to eq('Invalid reference name') + expect(json_response['message']).to eq('Target foo is invalid') end end |