Commit 4b540d2b authored by Pirate Praveen's avatar Pirate Praveen

Fix test failures with licensee 8.9

parent 46b2933c
...@@ -895,7 +895,7 @@ describe Repository do ...@@ -895,7 +895,7 @@ describe Repository do
end end
it 'returns nil when the content is not recognizable' do 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') message: 'Add LICENSE', branch_name: 'master')
expect(repository.license_key).to be_nil expect(repository.license_key).to be_nil
...@@ -939,7 +939,7 @@ describe Repository do ...@@ -939,7 +939,7 @@ describe Repository do
end end
it 'returns nil when the content is not recognizable' do 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') message: 'Add LICENSE', branch_name: 'master')
expect(repository.license).to be_nil expect(repository.license).to be_nil
......
...@@ -65,7 +65,7 @@ describe API::Templates do ...@@ -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['description']).to include('A short and simple permissive license with conditions')
expect(json_response['conditions']).to eq(%w[include-copyright]) 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['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') expect(json_response['content']).to include('MIT License')
end end
end end
......
...@@ -57,7 +57,7 @@ describe API::V3::Templates do ...@@ -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['description']).to include('A short and simple permissive license with conditions')
expect(json_response['conditions']).to eq(%w[include-copyright]) 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['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') expect(json_response['content']).to include('MIT License')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment