diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-21 11:56:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-21 11:56:36 +0000 |
| commit | a9a31ce31d47510ef2133f3389b8a1c0bbee3c35 (patch) | |
| tree | b83463d5fb4cbcbcb141f07de13bfa913d708d72 /spec | |
| parent | aa2a97b545243f528f60fe74ed1c0374b920f97f (diff) | |
| parent | 4b540d2b625684bb23bfe7f8d51a76d4d60e8760 (diff) | |
| download | gitlab-ce-a9a31ce31d47510ef2133f3389b8a1c0bbee3c35.tar.gz | |
Merge branch 'update-licensee' into 'master'
Update licensee 8.7.0 -> 8.9
Closes #18077
See merge request gitlab-org/gitlab-ce!17719
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/repository_spec.rb | 4 | ||||
| -rw-r--r-- | spec/requests/api/templates_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/v3/templates_spec.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 5bc972bca14..e506c932d58 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -895,7 +895,7 @@ describe Repository do end it 'returns nil when the content is not recognizable' do - repository.create_file(user, 'LICENSE', 'Copyright!', + repository.create_file(user, 'LICENSE', 'Gitlab B.V.', message: 'Add LICENSE', branch_name: 'master') expect(repository.license_key).to be_nil @@ -939,7 +939,7 @@ describe Repository do end it 'returns nil when the content is not recognizable' do - repository.create_file(user, 'LICENSE', 'Copyright!', + repository.create_file(user, 'LICENSE', 'Gitlab B.V.', message: 'Add LICENSE', branch_name: 'master') expect(repository.license).to be_nil diff --git a/spec/requests/api/templates_spec.rb b/spec/requests/api/templates_spec.rb index de1619f33c1..6bb53fdc98d 100644 --- a/spec/requests/api/templates_spec.rb +++ b/spec/requests/api/templates_spec.rb @@ -65,7 +65,7 @@ describe API::Templates do expect(json_response['description']).to include('A short and simple permissive license with conditions') expect(json_response['conditions']).to eq(%w[include-copyright]) expect(json_response['permissions']).to eq(%w[commercial-use modifications distribution private-use]) - expect(json_response['limitations']).to eq(%w[no-liability]) + expect(json_response['limitations']).to eq(%w[liability warranty]) expect(json_response['content']).to include('MIT License') end end diff --git a/spec/requests/api/v3/templates_spec.rb b/spec/requests/api/v3/templates_spec.rb index 38a8994eb79..1a637f3cf96 100644 --- a/spec/requests/api/v3/templates_spec.rb +++ b/spec/requests/api/v3/templates_spec.rb @@ -57,7 +57,7 @@ describe API::V3::Templates do expect(json_response['description']).to include('A short and simple permissive license with conditions') expect(json_response['conditions']).to eq(%w[include-copyright]) expect(json_response['permissions']).to eq(%w[commercial-use modifications distribution private-use]) - expect(json_response['limitations']).to eq(%w[no-liability]) + expect(json_response['limitations']).to eq(%w[liability warranty]) expect(json_response['content']).to include('MIT License') end end |