Apply reviewer feedback

1 files changed, 19 insertions, 20 deletions

diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index 6516cf6..fc52c72 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -23,29 +23,28 @@ plugins {
     end
   end
 
-  def find_in(report, name)
-    report[:dependencies].find do |dependency|
-      dependency[:name] == name
-    end
-  end
+  context 'when scanning a gradle project that does not include the `com.github.hierynomus.license` plugin' do
+    let(:project_url) { 'https://gitlab.com/one-touch-pipeline/otp.git' }
+    let(:result) { runner.scan }
 
-  it 'scans https://gitlab.com/one-touch-pipeline/otp.git' do
-    runner.clone('https://gitlab.com/one-touch-pipeline/otp.git')
-    report = runner.scan
+    before do
+      runner.clone(project_url)
+    end
 
-    expect(report).not_to be_empty
-    expect(report).to match_schema(version: '2.0')
-    expect(report[:licenses].count).not_to be_zero
-    expect(report[:dependencies].count).not_to be_zero
+    it 'is able to detect licenses' do
+      expect(result).not_to be_empty
+      expect(result).to match_schema(version: '2.0')
+      expect(result[:licenses]).not_to be_empty
 
-    [
-      { name: 'ant', licenses: ['Apache-2.0'] },
-      { name: 'activation', licenses: ['CDDL-1.0'] },
-      { name: 'xml-apis', licenses: ['Apache-2.0', 'SAX-PD', 'W3C-20150513'] },
-      { name: 'sitemesh', licenses: ['Apache-1.1'] },
-      { name: 'hibernate-jpa-2.1-api', licenses: ['BSD-3-Clause', 'EPL-1.0'] },
-    ].each do |item|
-      expect(find_in(report, item[:name])[:licenses]).to match_array(item[:licenses])
+      [
+        { name: 'ant', licenses: ['Apache-2.0'] },
+        { name: 'activation', licenses: ['CDDL-1.0'] },
+        { name: 'xml-apis', licenses: ['Apache-2.0', 'SAX-PD', 'W3C-20150513'] },
+        { name: 'sitemesh', licenses: ['Apache-1.1'] },
+        { name: 'hibernate-jpa-2.1-api', licenses: ['BSD-3-Clause', 'EPL-1.0'] },
+      ].each do |dependency|
+        expect(find_in(result, dependency[:name])[:licenses]).to match_array(dependency[:licenses])
+      end
     end
   end
 end