diff options
| author | mo khan <mo.khan@gmail.com> | 2020-05-27 14:59:20 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-05-27 14:59:20 +0000 |
| commit | 5b4aca6e3c936bca2657d1ad1a8f336838fda4bb (patch) | |
| tree | 2a5ba8dfc9bdb61c58633373be122ae2f83df1e7 /spec/integration/python | |
| parent | bff873a938de126d2b79e799df325f3d5c31295b (diff) | |
| parent | 80fa34dd2bd72af88efcb85844302d04450a0e1e (diff) | |
Merge branch '212919-conan-integration-tests' into 'master'v3.10.0
Scan conan projects
See merge request gitlab-org/security-products/license-management!156
Diffstat (limited to 'spec/integration/python')
| -rw-r--r-- | spec/integration/python/pip_spec.rb | 6 | ||||
| -rw-r--r-- | spec/integration/python/pipenv_spec.rb | 12 |
2 files changed, 9 insertions, 9 deletions
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' } diff --git a/spec/integration/python/pipenv_spec.rb b/spec/integration/python/pipenv_spec.rb index b54ee99..ccc2585 100644 --- a/spec/integration/python/pipenv_spec.rb +++ b/spec/integration/python/pipenv_spec.rb @@ -24,7 +24,7 @@ RSpec.describe "pipenv" do report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:version]).not_to be_empty expect(report[:licenses]).not_to be_empty expect(report.dependency_names).to contain_exactly("six") @@ -69,7 +69,7 @@ RSpec.describe "pipenv" do report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:version]).not_to be_empty expect(report[:licenses]).not_to be_empty expect(report.dependency_names).to match_array([ @@ -129,7 +129,7 @@ RSpec.describe "pipenv" do report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:version]).not_to be_empty expect(report[:licenses]).not_to be_empty expect(report.dependency_names).to match_array(%w[ @@ -165,7 +165,7 @@ RSpec.describe "pipenv" do it 'produces a valid report' do report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:licenses]).not_to be_empty expect(report[:dependencies].count).to be(1) expect(report.find('six')).not_to be_nil @@ -185,7 +185,7 @@ RSpec.describe "pipenv" do context "when scanning a Python #{version} project" do let(:report) { runner.scan(env: { 'LM_PYTHON_VERSION' => version.to_s }) } - specify { expect(report).to match_schema(version: '2.0') } + specify { expect(report).to match_schema } it 'includes dependencies in the default group' do lockfile_hash['default'].keys.each do |key| @@ -217,7 +217,7 @@ RSpec.describe "pipenv" do 'PIP_INDEX_URL' => index_url }) - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report.dependency_names).to include('requests') end end |