Merge branch '10128-go-modules' into 'master'v3.5.0

Improve license detection in go modules projects

See merge request gitlab-org/security-products/license-management!129

2 files changed, 3 insertions, 4 deletions

diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb
index 7a510ac..1b566bb 100644
--- a/spec/integration/java/gradle_spec.rb
+++ b/spec/integration/java/gradle_spec.rb
@@ -34,7 +34,6 @@ plugins {
     end
 
     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
 
@@ -45,7 +44,7 @@ plugins {
         { 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])
+        expect(result.licenses_for(dependency[:name])).to match_array(dependency[:licenses])
       end
     end
   end
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index 176cb6e..92444e8 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -72,10 +72,10 @@ RSpec.describe "maven" do
         { name: "netty-all", licenses: ["Apache-2.0"] },
         { name: "stax2-api", licenses: ["BSD-4-Clause"] }
       ].each do |dependency|
-        expect(find_in(report, dependency[:name])[:licenses]).to match_array(dependency[:licenses])
+        expect(report.licenses_for(dependency[:name])).to match_array(dependency[:licenses])
       end
 
-      expect(report[:dependencies].map { |x| x[:name] }).not_to include('junit')
+      expect(report.dependency_names).not_to include('junit')
     end
   end
 end