1 files changed, 22 insertions, 21 deletions

diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index b112fd2..671243e 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -3,11 +3,15 @@
 require 'spec_helper'
 
 RSpec.describe "maven" do
+  subject { runner.scan(env: env) }
+
+  let(:env) { {} }
+
   include_examples "each report version", "java", "maven"
   include_examples "each report version", "java", "maven-multimodules"
 
   context "when the maven dependencies come from the same projects public maven repository" do
-    subject { runner.scan(env: { 'CI_PROJECT_ID' => '6130122' }) }
+    let(:env) { { 'CI_PROJECT_ID' => '6130122' } }
 
     before do
       runner.mount(dir: fixture_file('java/maven/gitlab-repo'))
@@ -22,11 +26,11 @@ RSpec.describe "maven" do
   end
 
   context "when packages are sourced from an external package registry" do
-    subject do
-      runner.scan(env: {
+    let(:env) do
+      {
         'CI_PROJECT_ID' => 'invalid',
         'MAVEN_CLI_OPTS' => "--settings settings.xml"
-      })
+      }
     end
 
     before do
@@ -42,7 +46,9 @@ RSpec.describe "maven" do
   end
 
   describe "When using the `SETUP_CMD`" do
-    it 'executes the custom script' do
+    let(:env) { { 'SETUP_CMD' => 'bash custom.sh' } }
+
+    before do
       runner.add_file('custom.sh') do
         <<~SCRIPT
         #!/bin/bash -l
@@ -50,18 +56,12 @@ RSpec.describe "maven" do
         echo 'hello'
         SCRIPT
       end
-
-      report = runner.scan(env: {
-        'SETUP_CMD' => 'bash custom.sh'
-      })
-
-      expect(report).to match_schema
     end
+
+    specify { expect(subject).to match_schema }
   end
 
   describe "When scanning a project with multiple modules" do
-    subject { runner.scan }
-
     before do
       runner.mount(dir: fixture_file('java/maven/multimodule'))
     end
@@ -91,7 +91,7 @@ RSpec.describe "maven" do
   end
 
   context "when connecting to a custom package registry with a self signed certificate" do
-    let(:report) { runner.scan(env: { 'ADDITIONAL_CA_CERT_BUNDLE' => x509_certificate.read }) }
+    let(:env) { { 'ADDITIONAL_CA_CERT_BUNDLE' => x509_certificate.read } }
 
     before do
       runner.add_file('pom.xml') do
@@ -105,9 +105,11 @@ RSpec.describe "maven" do
       end
     end
 
-    specify { expect(report).to match_schema }
-    specify { expect(report.dependency_names).to match_array(['jackson-core']) }
-    specify { expect(report.licenses_for('jackson-core')).to match_array(['Apache-2.0']) }
+    specify do
+      expect(subject).to match_schema
+      expect(subject.dependency_names).to match_array(['jackson-core'])
+      expect(subject.licenses_for('jackson-core')).to match_array(['Apache-2.0'])
+    end
   end
 
   [
@@ -116,7 +118,6 @@ RSpec.describe "maven" do
   ].each do |item|
     item[:maven].each do |maven_version|
       context "when using Java v#{item[:java]} with maven v#{maven_version}" do
-        let(:report) { runner.scan(env: env) }
         let(:env) do
           {
             'LM_JAVA_VERSION' => item[:java],
@@ -132,9 +133,9 @@ RSpec.describe "maven" do
         end
 
         specify do
-          expect(report).to match_schema
-          expect(report.dependency_names).to match_array(['netty-all'])
-          expect(report.licenses_for('netty-all')).to match_array(['Apache-2.0'])
+          expect(subject).to match_schema
+          expect(subject.dependency_names).to match_array(['netty-all'])
+          expect(subject.licenses_for('netty-all')).to match_array(['Apache-2.0'])
         end
       end
     end