diff options
| author | mo khan <mo.khan@gmail.com> | 2020-05-25 11:01:03 -0600 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-05-26 19:33:44 -0600 |
| commit | 80fa34dd2bd72af88efcb85844302d04450a0e1e (patch) | |
| tree | 2a5ba8dfc9bdb61c58633373be122ae2f83df1e7 /spec/integration/java | |
| parent | bff873a938de126d2b79e799df325f3d5c31295b (diff) | |
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
Diffstat (limited to 'spec/integration/java')
| -rw-r--r-- | spec/integration/java/gradle_spec.rb | 14 | ||||
| -rw-r--r-- | spec/integration/java/maven_spec.rb | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb index d2ddaf1..25336c1 100644 --- a/spec/integration/java/gradle_spec.rb +++ b/spec/integration/java/gradle_spec.rb @@ -19,7 +19,7 @@ plugins { runner.add_file('build.gradle', content) report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:licenses]).to be_empty expect(report[:dependencies]).to be_empty end @@ -34,7 +34,7 @@ plugins { end it 'is able to detect licenses' do - expect(result).to match_schema(version: '2.0') + expect(result).to match_schema expect(result[:licenses]).not_to be_empty [ @@ -61,7 +61,7 @@ plugins { runner.mount(dir: fixture_file('java/gradle/offline-environment/')) end - specify { expect(subject).to match_schema(version: '2.0') } + specify { expect(subject).to match_schema } specify do expect(subject.dependency_names).to match_array([ @@ -102,7 +102,7 @@ plugins { runner.add_file('build.gradle', fixture_file_content("java/11/build.gradle")) end - specify { expect(report).to match_schema(version: '2.0') } + specify { expect(report).to match_schema } specify { expect { report }.to change { Dir.glob("#{runner.project_path}/build/reports/profile/profile-*.html").count }.from(0).to(1) } specify { expect(report.dependency_names).to match_array(['postgresql']) } specify { expect(report.licenses_for('postgresql')).to match_array(['BSD-2-Clause']) } @@ -117,7 +117,7 @@ plugins { it 'returns an empty report because the plugin we use does not work in this version of the gradle API' do report = runner.scan(env: { 'LM_JAVA_VERSION' => '8' }) - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:dependencies]).to be_empty expect(report[:licenses]).to be_empty end @@ -133,7 +133,7 @@ plugins { runner.add_file('settings.gradle.kts', 'rootProject.name = "example"') end - specify { expect(report).to match_schema(version: '2.0') } + specify { expect(report).to match_schema } specify { expect(report.dependency_names).to match_array(['postgresql']) } specify { expect(report.licenses_for('postgresql')).to match_array(['BSD-2-Clause']) } end @@ -153,7 +153,7 @@ plugins { runner.add_file('settings.gradle', 'rootProject.name = "example"') end - specify { expect(report).to match_schema(version: '2.0') } + specify { expect(report).to match_schema } specify { expect(report.dependency_names).to match_array(['postgresql']) } specify { expect(report.licenses_for('postgresql')).to match_array(['BSD-2-Clause']) } end diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb index d45c99d..fa57752 100644 --- a/spec/integration/java/maven_spec.rb +++ b/spec/integration/java/maven_spec.rb @@ -12,7 +12,7 @@ RSpec.describe "maven" do 'CI_PROJECT_ID' => '6130122' }) - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report.dependency_names).to match_array(['example']) expect(report.licenses_for('example')).to match_array(['MIT']) end @@ -26,7 +26,7 @@ RSpec.describe "maven" do 'MAVEN_CLI_OPTS' => "--settings my_settings.xml" }) - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:dependencies]).to match_array([{ name: 'example', url: '', description: '', paths: ['.'], licenses: ['MIT'] }]) end end @@ -45,7 +45,7 @@ RSpec.describe "maven" do 'SETUP_CMD' => 'bash custom.sh' }) - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema end end @@ -57,7 +57,7 @@ RSpec.describe "maven" do it 'detects dependences from each module' do report = runner.scan - expect(report).to match_schema(version: '2.0') + expect(report).to match_schema expect(report[:dependencies]).not_to be_empty [ @@ -96,7 +96,7 @@ RSpec.describe "maven" do end end - specify { expect(report).to match_schema(version: '2.0') } + 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']) } end |
