From c8012557a4b5e9efd560e6d58fcbef50f29a1d46 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 18 Jan 2016 15:32:17 -0500 Subject: [PATCH] move FSF fix to the fsf_approved_licenses helper --- spec/license_spec.rb | 6 ------ spec/spec_helper.rb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 881a74e..6bf43b0 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -19,12 +19,6 @@ licenses.each do |license| end context "industry approval" do - - # FSF approved the Clear BSD, but doesn't use its SPDX ID or Name - if license["id"] == "bsd-3-clause-clear" - let(:id) { "clearbsd" } - end - it "should be approved by OSI or FSF or OD" do expect(approved_licenses).to include(id), "See https://git.io/vzCTV." end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e7865ed..4834964 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -88,6 +88,12 @@ def fsf_approved_licenses name = a.text.strip licenses[id] = name end + + # FSF approved the Clear BSD, but doesn't use its SPDX ID or Name + if licenses.keys.include? "clearbsd" + licenses["bsd-3-clause-clear"] = licenses["clearbsd"] + end + licenses end end