license_finder 1.1.1-java → 1.2-java

data/spec/lib/license_finder/reports/markdown_report_spec.rb

@@ -7,7 +7,7 @@ module LicenseFinder
         Dependency.new(
           'name' => 'gem_a',
           'version' => '1.0',
-          'license' => License.find_by_name('other')
+          'licenses' => [License.find_by_name('other')].to_set
         )
       end
 
@@ -15,7 +15,7 @@ module LicenseFinder
         dependency = Dependency.create(
           'name' => 'gem_b',
           'version' => '2.3',
-          'license' => License.find_by_name('BSD')
+          'licenses' => [License.find_by_name('BSD')].to_set
         )
         dependency.approve!
         dependency
@@ -25,28 +25,28 @@ module LicenseFinder
 
       it 'should have the correct header' do
         LicenseFinder.config.project_name = "new_project_name"
-        should match "# new_project_name"
+        is_expected.to match "# new_project_name"
       end
 
       it 'should list the total, and unapproved counts' do
-        should match "2 total"
-        should match /1 \*unapproved\*/
+        is_expected.to match "2 total"
+        is_expected.to match /1 \*unapproved\*/
       end
 
       it "should list the unapproved dependency" do
-        should match "href='#gem_a'"
+        is_expected.to match "href='#gem_a'"
       end
 
       it "should display a summary" do
-        should match "## Summary"
-        should match /\s+\* 1 other/
-        should match /\s+\* 1 BSD/
+        is_expected.to match "## Summary"
+        is_expected.to match /\s+\* 1 other/
+        is_expected.to match /\s+\* 1 BSD/
       end
 
       it "should list both gems" do
-        should match "## Items"
-        should match "### gem_a v1.0"
-        should match "### gem_b v2.3"
+        is_expected.to match "## Items"
+        is_expected.to match "### gem_a v1.0"
+        is_expected.to match "### gem_b v2.3"
       end
     end
   end

data/spec/lib/license_finder/reports/reporter_spec.rb

@@ -6,26 +6,26 @@ module LicenseFinder
       subject { Reporter.write_reports }
 
       before do
-        Dependency.stub(:acknowledged) { [double(:dep)] }
+        allow(Dependency).to receive(:acknowledged) { [double(:dep)] }
 
-        MarkdownReport.stub(:of) { 'markdown report' }
-        DetailedTextReport.stub(:of) { 'detailed csv report' }
-        TextReport.stub(:of) { 'csv report' }
-        HtmlReport.stub(:of) { 'html report' }
+        allow(MarkdownReport).to receive(:of) { 'markdown report' }
+        allow(DetailedTextReport).to receive(:of) { 'detailed csv report' }
+        allow(TextReport).to receive(:of) { 'csv report' }
+        allow(HtmlReport).to receive(:of) { 'html report' }
       end
 
       it "writes an html file" do
         subject
-        LicenseFinder.config.artifacts.text_file.read.should == "csv report\n"
-        LicenseFinder.config.artifacts.detailed_text_file.read.should == "detailed csv report\n"
-        LicenseFinder.config.artifacts.markdown_file.read.should == "markdown report\n"
-        LicenseFinder.config.artifacts.html_file.read.should == "html report\n"
+        expect(LicenseFinder.config.artifacts.text_file.read).to eq("csv report\n")
+        expect(LicenseFinder.config.artifacts.detailed_text_file.read).to eq("detailed csv report\n")
+        expect(LicenseFinder.config.artifacts.markdown_file.read).to eq("markdown report\n")
+        expect(LicenseFinder.config.artifacts.html_file.read).to eq("html report\n")
       end
 
       it "deletes old dependencies.txt file" do
         fake_file =  double(:fake_file, :exist? => true)
-        LicenseFinder.config.artifacts.stub(:legacy_text_file) { fake_file }
-        fake_file.should_receive(:delete)
+        allow(LicenseFinder.config.artifacts).to receive(:legacy_text_file) { fake_file }
+        expect(fake_file).to receive(:delete)
         subject
       end
     end

data/spec/lib/license_finder/reports/text_report_spec.rb

@@ -7,7 +7,7 @@ module LicenseFinder
         Dependency.new(
           'name' => 'gem_a',
           'version' => '1.0',
-          'license' => License.find_by_name('MIT')
+          'licenses' => [License.find_by_name('MIT')].to_set
         )
       end
 
@@ -15,14 +15,14 @@ module LicenseFinder
         Dependency.new(
           'name' => 'gem_b',
           'version' => '1.0',
-          'license' => License.find_by_name('MIT')
+          'licenses' => [License.find_by_name('MIT')].to_set
         )
       end
 
       subject { TextReport.new([dep2, dep1]).to_s }
 
       it 'should generate a text report with the name, version and license of each dependency, sorted by name' do
-        should == "gem_a, 1.0, MIT\ngem_b, 1.0, MIT"
+        is_expected.to eq("gem_a, 1.0, MIT\ngem_b, 1.0, MIT")
       end
     end
   end

data/spec/lib/license_finder/tables/dependency_spec.rb

@@ -4,7 +4,7 @@ module LicenseFinder
   describe Dependency do
     describe '.unapproved' do
       before do
-        License.find_by_name('MIT').stub(:whitelisted? =>  true)
+        allow(License.find_by_name('MIT')).to receive_messages(:whitelisted? =>  true)
         allow(LicenseFinder.config).to receive(:ignore_dependencies) { ['this ignored dependency', 'that ignored dependency'] }
       end
 
@@ -15,28 +15,28 @@ module LicenseFinder
         that_ignored = Dependency.create(name: "that ignored dependency", version: '0.0.1')
         approved.approve!
         whitelisted = Dependency.create(name: "approved dependency", version: '0.0.1')
-        whitelisted.license = License.find_by_name('MIT')
+        whitelisted.licenses = [License.find_by_name('MIT')].to_set
         whitelisted.save
 
         unapproved = Dependency.unapproved
-        unapproved.count.should == 1
-        unapproved.should_not be_any(&:approved?)
+        expect(unapproved.count).to eq(1)
+        expect(unapproved).not_to be_any(&:approved?)
       end
     end
 
     describe ".named" do
       it "creates a new dependency" do
         dep = described_class.named("never_seen")
-        dep.name.should == "never_seen"
-        dep.should_not be_new
+        expect(dep.name).to eq("never_seen")
+        expect(dep).not_to be_new
       end
 
       it "returns an existing dependency" do
         described_class.named("referenced_again")
         dep = described_class.named("referenced_again")
-        dep.name.should == "referenced_again"
-        dep.should_not be_new
-        Dependency.count(name: "referenced_again").should == 1
+        expect(dep.name).to eq("referenced_again")
+        expect(dep).not_to be_new
+        expect(Dependency.count(name: "referenced_again")).to eq(1)
       end
     end
 
@@ -54,15 +54,15 @@ module LicenseFinder
       it "should update the database to show the dependency is approved" do
         dependency = Dependency.named("foo")
         dependency.approve!
-        dependency.reload.should be_approved
+        expect(dependency.reload).to be_approved
       end
 
       it "should record the approver and notes" do
         dependency = Dependency.named("foo")
         dependency.approve!("Julian", "We really need this")
         approval = dependency.reload.manual_approval
-        approval.approver.should eq "Julian"
-        approval.notes.should eq "We really need this"
+        expect(approval.approver).to eq "Julian"
+        expect(approval.notes).to eq "We really need this"
       end
     end
 
@@ -71,18 +71,25 @@ module LicenseFinder
       let(:approved_manually) { Dependency.create(name: 'some gem').approve!.reload }
 
       it "is true if its license is whitelisted" do
-        not_approved_manually.stub_chain(:license, whitelisted?: true)
-        not_approved_manually.should be_approved
+        fake_license = double(:license, whitelisted?: true)
+        allow(not_approved_manually).to receive(:licenses).and_return [fake_license].to_set
+        expect(not_approved_manually).to be_approved
+      end
+
+      it "is true if one of its licenses is whitelisted" do
+        fake_licenses = [double(:license, whitelisted?: false), double(:license, whitelisted?: true)].to_set
+        allow(not_approved_manually).to receive(:licenses).and_return fake_licenses
+        expect(not_approved_manually).to be_approved
       end
 
       it "is true if it has been approved" do
-        approved_manually.stub_chain(:license, whitelisted?: false)
-        approved_manually.should be_approved
+        allow(approved_manually).to receive_message_chain(:license, whitelisted?: false)
+        expect(approved_manually).to be_approved
       end
 
       it "is false otherwise" do
-        not_approved_manually.stub_chain(:license, whitelisted?: false)
-        not_approved_manually.should_not be_approved
+        allow(not_approved_manually).to receive_message_chain(:license, whitelisted?: false)
+        expect(not_approved_manually).not_to be_approved
       end
     end
 
@@ -90,14 +97,14 @@ module LicenseFinder
       let(:dependency) { Dependency.create(name: 'foogem') }
 
       it "sets manual license to true" do
-        dependency.should_not be_license_assigned_manually
+        expect(dependency).not_to be_license_assigned_manually
         dependency.set_license_manually! License.find_by_name("Updated")
-        dependency.should be_license_assigned_manually
+        expect(dependency).to be_license_assigned_manually
       end
 
       it "modifies the license" do
         dependency.set_license_manually! License.find_by_name("Updated")
-        dependency.reload.license.name.should == 'Updated'
+        expect(dependency.reload.licenses.first.name).to eq('Updated')
       end
     end
 
@@ -106,14 +113,14 @@ module LicenseFinder
 
       it "saves the bundler groups" do
         dependency.bundler_group_names = %w[1 2 3]
-        dependency.bundler_groups.map(&:name).should =~ %w[1 2 3]
+        expect(dependency.bundler_groups.map(&:name)).to match_array(%w[1 2 3])
       end
 
       it "removed outdated groups and adds new groups" do
         dependency.add_bundler_group BundlerGroup.named('old')
         dependency.add_bundler_group BundlerGroup.named('maintained')
         dependency.bundler_group_names = %w[new maintained]
-        dependency.bundler_groups.map(&:name).should =~ %w[new maintained]
+        expect(dependency.bundler_groups.map(&:name)).to match_array(%w[new maintained])
       end
     end
 
@@ -122,55 +129,66 @@ module LicenseFinder
 
       it "saves the children" do
         dependency.children_names = %w[1 2 3]
-        dependency.children.map(&:name).should =~ %w[1 2 3]
+        expect(dependency.children.map(&:name)).to match_array(%w[1 2 3])
       end
 
       it "removes outdated children and adds new children" do
         dependency.add_child Dependency.named('old')
         dependency.add_child Dependency.named('maintained')
         dependency.children_names = %w[new maintained]
-        dependency.children.map(&:name).should =~ %w[new maintained]
+        expect(dependency.children.map(&:name)).to match_array(%w[new maintained])
       end
     end
 
-    describe "#apply_better_license" do
+    describe "#set_licenses" do
       let(:dependency) { Dependency.named('some gem') }
 
       it "keeps a manually assigned license" do
         dependency.set_license_manually! License.find_by_name("manual")
-        dependency.apply_better_license License.find_by_name("new")
-        dependency.license.name.should == "manual"
+        dependency.set_licenses [License.find_by_name("new")].to_set
+        expect(dependency.licenses.first.name).to eq "manual"
       end
 
       it "saves a new license" do
-        dependency.apply_better_license License.find_by_name("new license")
-        dependency.license.name.should == "new license"
+        dependency.set_licenses [License.find_by_name("new license")].to_set
+        expect(dependency.licenses.first.name).to eq "new license"
       end
 
       it "updates the license's name" do
-        dependency.license = License.find_by_name("old")
+        dependency.licenses = [License.find_by_name("old")].to_set
 
-        dependency.apply_better_license License.find_by_name("new license")
-        dependency.license.name.should == "new license"
+        dependency.set_licenses [License.find_by_name("new license")].to_set
+        expect(dependency.licenses.first.name).to eq "new license"
       end
 
       it "won't update the database if the license isn't changing" do
         # See note in PackageSaver#save
-        dependency.license = License.find_by_name("same")
-        dependency.should be_modified
+        dependency.licenses = [License.find_by_name("same")].to_set
+        expect(dependency).to be_modified
+        dependency.save
+        expect(dependency).not_to be_modified
+
+        dependency.set_licenses [License.find_by_name("same")].to_set
+        expect(dependency).not_to be_modified
+      end
+
+      it "updates the database if an additional license is added" do
+        # See note in PackageSaver#save
+        dependency.licenses = [License.find_by_name("first")].to_set
+        expect(dependency).to be_modified
         dependency.save
-        dependency.should_not be_modified
+        expect(dependency).not_to be_modified
 
-        dependency.apply_better_license License.find_by_name("same")
-        dependency.should_not be_modified
+        dependency.set_licenses [License.find_by_name("first"), License.find_by_name("second")].to_set
+        expect(dependency).to be_modified
       end
 
       it "does not change the approval" do
-        dependency.license = License.find_by_name("old")
+        dependency.licenses = [License.find_by_name("old")].to_set
         dependency.approve!
 
-        dependency.apply_better_license License.find_by_name("new license")
-        dependency.should be_approved
+        dependency.set_licenses [License.find_by_name("new license")].to_set
+        expect(dependency).to be_approved
       end
     end
   end

data/spec/lib/license_finder/yml_to_sql_spec.rb

@@ -27,25 +27,25 @@ module LicenseFinder
     describe ".needs_conversion?" do
       it "is true if the yml still exists" do
         yaml_file = double(:yaml_file, :exist? => true)
-        LicenseFinder.config.artifacts.stub(legacy_yaml_file: yaml_file)
+        allow(LicenseFinder.config.artifacts).to receive_messages(legacy_yaml_file: yaml_file)
 
-        described_class.needs_conversion?.should be_truthy
+        expect(described_class.needs_conversion?).to be_truthy
       end
 
       it "is false otherwise" do
         yaml_file = double(:yaml_file, :exist? => false)
-        LicenseFinder.config.artifacts.stub(legacy_yaml_file: yaml_file)
+        allow(LicenseFinder.config.artifacts).to receive_messages(legacy_yaml_file: yaml_file)
 
-        described_class.needs_conversion?.should be_falsey
+        expect(described_class.needs_conversion?).to be_falsey
       end
     end
 
     describe ".remove_yml" do
       it "removes the yml file" do
         yaml_file = double(:yaml_file)
-        LicenseFinder.config.artifacts.stub(legacy_yaml_file: yaml_file)
+        allow(LicenseFinder.config.artifacts).to receive_messages(legacy_yaml_file: yaml_file)
 
-        yaml_file.should_receive(:delete)
+        expect(yaml_file).to receive(:delete)
         described_class.remove_yml
       end
     end
@@ -62,7 +62,7 @@ module LicenseFinder
           described_class.convert_all([legacy_attributes])
 
           saved_dep = described_class::Sql::Dependency.first
-          saved_dep.should_not be_added_manually
+          expect(saved_dep).not_to be_added_manually
         end
       end
 
@@ -73,36 +73,36 @@ module LicenseFinder
           described_class.convert_all([legacy_attributes])
 
           saved_dep = described_class::Sql::Dependency.first
-          saved_dep.should be_added_manually
+          expect(saved_dep).to be_added_manually
         end
       end
 
       it "persists all of the dependency's attributes" do
         described_class.convert_all([legacy_attributes])
 
-        described_class::Sql::Dependency.count.should == 1
+        expect(described_class::Sql::Dependency.count).to eq(1)
         saved_dep = described_class::Sql::Dependency.first
-        saved_dep.name.should == "spec_name"
-        saved_dep.version.should == "2.1.3"
-        saved_dep.summary.should == "some summary"
-        saved_dep.description.should == "some description"
-        saved_dep.homepage.should == "www.homepage.com"
-        saved_dep.manual_approval.should be
+        expect(saved_dep.name).to eq("spec_name")
+        expect(saved_dep.version).to eq("2.1.3")
+        expect(saved_dep.summary).to eq("some summary")
+        expect(saved_dep.description).to eq("some description")
+        expect(saved_dep.homepage).to eq("www.homepage.com")
+        expect(saved_dep.manual_approval).to be
       end
 
       it "associates the license to the dependency" do
         described_class.convert_all([legacy_attributes])
 
         saved_dep = described_class::Sql::Dependency.first
-        saved_dep.license_name.should == "GPLv2"
+        expect(saved_dep.license_names).to eq("GPLv2")
       end
 
       it "associates bundler groups" do
         described_class.convert_all([legacy_attributes])
 
         saved_dep = described_class::Sql::Dependency.first
-        saved_dep.bundler_groups.count.should == 1
-        saved_dep.bundler_groups.first.name.should == 'test'
+        expect(saved_dep.bundler_groups.count).to eq(1)
+        expect(saved_dep.bundler_groups.first.name).to eq('test')
       end
 
       it "associates children" do
@@ -113,10 +113,10 @@ module LicenseFinder
         }
         described_class.convert_all([legacy_attributes, child_attrs])
 
-        described_class::Sql::Dependency.count.should == 2
+        expect(described_class::Sql::Dependency.count).to eq(2)
         saved_dep = described_class::Sql::Dependency.first(name: 'spec_name')
-        saved_dep.children.count.should == 1
-        saved_dep.children.first.name.should == 'child1_name'
+        expect(saved_dep.children.count).to eq(1)
+        expect(saved_dep.children.first.name).to eq('child1_name')
       end
     end
   end

data/spec/lib/license_finder_spec.rb

@@ -5,7 +5,7 @@ describe LicenseFinder do
     it "should load the configuration exactly once" do
       LicenseFinder.instance_variable_set(:@config, nil)
 
-      LicenseFinder::Configuration.should_receive(:ensure_default).once.and_return(double(:config))
+      expect(LicenseFinder::Configuration).to receive(:ensure_default).once.and_return(double(:config))
 
       LicenseFinder.config
       LicenseFinder.config

data/spec/spec_helper.rb

@@ -28,16 +28,3 @@ RSpec.configure do |config|
     end
   end
 end
-
-module LicenseFinder
-  shared_examples "it conforms to interface required by PackageSaver" do
-    it { expect { subject.name }.to_not raise_error }
-    it { expect { subject.version }.to_not raise_error }
-    it { expect { subject.summary }.to_not raise_error }
-    it { expect { subject.description }.to_not raise_error }
-    it { expect { subject.homepage }.to_not raise_error }
-    it { expect { subject.groups }.to_not raise_error }
-    it { expect { subject.children }.to_not raise_error }
-    it { expect { subject.license }.to_not raise_error }
-  end
-end