diff options
| author | mo khan <mo.khan@gmail.com> | 2020-02-28 15:27:12 -0700 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-02-28 15:27:12 -0700 |
| commit | 0f07af5b661077312192b75d1ff1a5b8f6a123aa (patch) | |
| tree | 94a6b204019a919637d616b113367f485f08770c /spec | |
| parent | ec5d95953b614de3124bd733dfc739da1383130e (diff) | |
Convert to gitlab-license-scanning
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper.rb | 2 | ||||
| -rw-r--r-- | spec/unit/report/v2_spec.rb (renamed from spec/unit/license/management/report/v2_spec.rb) | 3 | ||||
| -rw-r--r-- | spec/unit/repository_spec.rb (renamed from spec/unit/license/management/repository_spec.rb) | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 15c9dad..1e48a8f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,4 @@ -require 'license/management' +require 'gitlab/license/scanning' require 'json' require 'securerandom' require 'json-schema' diff --git a/spec/unit/license/management/report/v2_spec.rb b/spec/unit/report/v2_spec.rb index 4da973c..7bbbc3d 100644 --- a/spec/unit/license/management/report/v2_spec.rb +++ b/spec/unit/report/v2_spec.rb @@ -1,11 +1,10 @@ -RSpec.describe License::Management::Report::V2 do +RSpec.describe GitLab::License::Scanning::Report::V2 do describe "#to_h" do { 'AGPL-1.0' => 'AGPL-1.0', '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', diff --git a/spec/unit/license/management/repository_spec.rb b/spec/unit/repository_spec.rb index 6ebc09e..fa00297 100644 --- a/spec/unit/license/management/repository_spec.rb +++ b/spec/unit/repository_spec.rb @@ -1,11 +1,11 @@ -RSpec.describe License::Management::Repository do +RSpec.describe GitLab::License::Scanning::Repository do describe "#item_for" do - let(:spdx_licenses) { JSON.parse(IO.read('spdx-licenses.json'))['licenses'] } + let(:spdx_licenses) { Spandx::Catalogue.latest } context "when mapping a license that refers to opensource.org" do it 'parses the SPDX id from the url' do spdx_licenses.each do |license| - spdx_id = license['licenseId'] + spdx_id = license.id url = "https://opensource.org/licenses/#{spdx_id}" license = LicenseFinder::License.new(short_name: url, matcher: LicenseFinder::License::NoneMatcher.new, url: url) expect(subject.item_for(license)['id']).to eql(spdx_id) @@ -16,7 +16,7 @@ RSpec.describe License::Management::Repository do context "when mapping a license that refers to nuget.org" do it 'parses the SPDX id from the url' do spdx_licenses.each do |license| - spdx_id = license['licenseId'] + spdx_id = license.id url = "https://licenses.nuget.org/#{spdx_id}" license = LicenseFinder::License.new(short_name: url, matcher: LicenseFinder::License::NoneMatcher.new, url: url) expect(subject.item_for(license)['id']).to eql(spdx_id) |
