From b99e7ab017f12a518ef9506e9199fc680cfee2e9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 1 Jun 2016 08:36:56 -0700 Subject: [PATCH] replace 'id' variables with 'spdx_lcase' to minimize confusion --- spec/license_spec.rb | 6 +++--- spec/spec_helper.rb | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 1515fdb..2917392 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -7,7 +7,7 @@ describe 'licenses' do licenses.each do |license| context "The #{license['title']} license" do - let(:id) { license['spdx-lcase'] } + let(:spdx_lcase) { license['spdx-lcase'] } let(:spdx_id) { license['spdx-id'] } it 'has an SPDX ID' do @@ -15,7 +15,7 @@ describe 'licenses' do end it 'has an ID that is downcased SPDX ID' do - expect(spdx_id.casecmp(id).zero?) + expect(spdx_id.casecmp(spdx_lcase).zero?) end it 'uses its SPDX name' do @@ -26,7 +26,7 @@ describe 'licenses' do context 'industry approval' do it 'should be approved by OSI or FSF or OD' do - expect(approved_licenses).to include(id), 'See https://git.io/vzCTV.' + expect(approved_licenses).to include(spdx_lcase), 'See https://git.io/vzCTV.' end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cf1460f..adec337 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -34,16 +34,12 @@ end def licenses SpecHelper.licenses ||= begin site.collections['licenses'].docs.map do |license| - id = File.basename(license.basename, '.txt') - license.to_liquid.merge('spdx-lcase' => id) + spdx_lcase = File.basename(license.basename, '.txt') + license.to_liquid.merge('spdx-lcase' => spdx_lcase) end end end -def license_ids - licenses.map { |l| l['id'] } -end - def site SpecHelper.site ||= begin site = Jekyll::Site.new(config)