diff options
| author | Tetiana Chupryna <tchupryna@gitlab.com> | 2020-07-27 20:01:39 +0300 |
|---|---|---|
| committer | Tetiana Chupryna <tchupryna@gitlab.com> | 2020-08-21 13:09:13 +0300 |
| commit | b272c287f2709c8a2dce0c2311842c3ddb260999 (patch) | |
| tree | e3fb315fd060be1520686a3449e0b7f2aac58923 /spec | |
| parent | 4acbcb86caea35b176f379675ea0ccc4b76d0897 (diff) | |
Fix failed tests
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/integration/python/pip_spec.rb | 30 | ||||
| -rw-r--r-- | spec/unit/license/management/report/v2_spec.rb | 1 |
2 files changed, 5 insertions, 26 deletions
diff --git a/spec/integration/python/pip_spec.rb b/spec/integration/python/pip_spec.rb index cead027..3d6b82f 100644 --- a/spec/integration/python/pip_spec.rb +++ b/spec/integration/python/pip_spec.rb @@ -47,39 +47,19 @@ RSpec.describe "pip" do end context 'with BSD licenses dependencies' do - let(:requirements) { %w(webencodings idna click EasyProcess).join("\n") } - - it 'finds proper versions of BSD license' do - runner.add_file('requirements.txt', requirements) - - report = runner.scan - - expect(report.licenses_for('webencodings')).to eq(['BSD']) - end - - it 'finds proper versions of BSD license' do - runner.add_file('requirements.txt', requirements) - - report = runner.scan - - expect(report.licenses_for('idna')).to eq(['BSD-like']) - end + let(:requirements) { %w[webencodings idna click EasyProcess].join("\n") } it 'finds proper versions of BSD license' do runner.add_file('requirements.txt', requirements) report = runner.scan + expect(report.licenses_for('webencodings')).to eq(['bsd']) + expect(report.licenses_for('idna')).to eq(['bsd-like']) + expect(report.licenses_for('EasyProcess')).to eq(['bsd']) + expect(report.licenses_for('PyVirtualDisplay')).to eq(['bsd']) expect(report.licenses_for('click')).to eq(['BSD-3-Clause']) end - - it 'finds proper versions of BSD license' do - runner.add_file('requirements.txt', requirements) - - report = runner.scan - - expect(report.licenses_for('EasyProcess')).to eq(['BSD']) - end end [{ version: '2', commit: '04dce91b' }, { version: '3', commit: '48e250a1' }].each do |python| diff --git a/spec/unit/license/management/report/v2_spec.rb b/spec/unit/license/management/report/v2_spec.rb index 1bcdb16..a7c0d18 100644 --- a/spec/unit/license/management/report/v2_spec.rb +++ b/spec/unit/license/management/report/v2_spec.rb @@ -7,7 +7,6 @@ RSpec.describe License::Management::Report::V2 do 'AGPL-3.0' => 'AGPL-3.0', 'Apache 2.0' => 'Apache-2.0', 'Artistic-2.0' => 'Artistic-2.0', - 'BSD' => 'BSD-4-Clause', 'CC0 1.0 Universal' => 'CC0-1.0', 'CDDL-1.0' => 'CDDL-1.0', 'CDDL-1.1' => 'CDDL-1.1', |
