From 80fa34dd2bd72af88efcb85844302d04450a0e1e Mon Sep 17 00:00:00 2001 From: mo khan Date: Mon, 25 May 2020 11:01:03 -0600 Subject: Scan Conan projects * Scan the conan examples project * Split licenses by comma * Add integration test job for c projects * Add package_manager, version and path to v2.1 report * Detect collisions between names from different package managers * Add CHANGELOG entry * Update README to indicate Conan support * Print timestamps in install script --- spec/integration/python/pip_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/integration/python/pip_spec.rb') diff --git a/spec/integration/python/pip_spec.rb b/spec/integration/python/pip_spec.rb index 8e3ec3d..f47bbe6 100644 --- a/spec/integration/python/pip_spec.rb +++ b/spec/integration/python/pip_spec.rb @@ -9,7 +9,7 @@ RSpec.describe "pip" do report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:version]).to start_with('2') expect(report.dependency_names).to include("sentry-sdk") expect(report.licenses_for('sentry-sdk')).to match_array(["BSD-4-Clause"]) @@ -37,7 +37,7 @@ RSpec.describe "pip" do report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:version]).to start_with('2') expect(report[:licenses]).not_to be_empty expect(report[:dependencies]).not_to be_empty @@ -45,7 +45,7 @@ RSpec.describe "pip" do end [{ version: '2', commit: '04dce91b' }, { version: '3', commit: '48e250a1' }].each do |python| - ['1.0', '1.1', '2.0'].each do |report_version| + ['1.0', '1.1', '2.0', '2.1'].each do |report_version| context "when generating a `#{report_version}` report using Python `#{python[:version]}`" do let(:url) { "https://gitlab.com/gitlab-org/security-products/tests/#{language}-#{package_manager}.git" } let(:language) { 'python' } -- cgit v1.2.3