From a54789bcfe9e05ab42dfb6e03457279384e343fe Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Mon, 17 Aug 2020 16:23:28 -0600
Subject: Update license_finder to 6.8.1

* Update CHANGELOG
* Add default retry for all jobs
* Ensure all deb packages are built
---
 spec/integration/java/gradle_spec.rb | 12 +++++++-----
 spec/integration/java/maven_spec.rb  | 14 ++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'spec/integration/java')

diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index c2137b3..25d7e26 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe "gradle" do
@@ -113,17 +115,17 @@ plugins {
   end
 
   context 'when using Java 8 with version 1.* of gradle' do
+    subject { runner.scan(env: { 'LM_JAVA_VERSION' => '8' }) }
+
     before do
       runner.mount(dir: fixture_file("java/gradle/java-8"))
       runner.add_file('.tool-versions', "gradle 1.9")
     end
 
     it 'returns an empty report because the plugin we use does not work in this version of the gradle API' do
-      report = runner.scan(env: { 'LM_JAVA_VERSION' => '8' })
-
-      expect(report).to match_schema
-      expect(report[:dependencies]).to be_empty
-      expect(report[:licenses]).to be_empty
+      expect(subject).to match_schema
+      expect(subject[:dependencies]).to be_empty
+      expect(subject[:licenses]).to be_empty
     end
   end
 
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index aa2d1ff..c9a7026 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe "maven" do
@@ -58,15 +60,15 @@ RSpec.describe "maven" do
   end
 
   describe "When scanning a project with multiple modules" do
+    subject { runner.scan }
+
     before do
       runner.mount(dir: fixture_file('java/maven/multimodule'))
     end
 
     it 'detects dependences from each module' do
-      report = runner.scan
-
-      expect(report).to match_schema
-      expect(report[:dependencies]).not_to be_empty
+      expect(subject).to match_schema
+      expect(subject[:dependencies]).not_to be_empty
 
       [
         { name: "asm", licenses: ["BSD-4-Clause"] },
@@ -81,10 +83,10 @@ RSpec.describe "maven" do
         { name: "netty-all", licenses: ["Apache-2.0"] },
         { name: "stax2-api", licenses: ["BSD-4-Clause"] }
       ].each do |dependency|
-        expect(report.licenses_for(dependency[:name])).to match_array(dependency[:licenses])
+        expect(subject.licenses_for(dependency[:name])).to match_array(dependency[:licenses])
       end
 
-      expect(report.dependency_names).not_to include('junit')
+      expect(subject.dependency_names).not_to include('junit')
     end
   end
 
-- 
cgit v1.2.3