summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-05-28 09:04:00 +0000
committerCan Eldem <celdem@gitlab.com>2020-05-28 09:04:00 +0000
commit0b976fcffe0a9b8e80587adb076bcdf279c9331c (patch)
tree5b33f9242f67164bb221797ca3d331412bf8ed4d
parent5b4aca6e3c936bca2657d1ad1a8f336838fda4bb (diff)
parentaec641a6175997b1779c7e41513f9c893dcd4afb (diff)
Merge branch '212919-conan-tests' into 'master'
Add tests for Conan projects. See merge request gitlab-org/security-products/license-management!158
-rw-r--r--.gitlab/test.yml4
-rw-r--r--spec/fixtures/expected/c/conan/v1.0.json23
-rw-r--r--spec/fixtures/expected/c/conan/v1.1.json30
-rw-r--r--spec/fixtures/expected/c/conan/v2.0.json24
-rw-r--r--spec/fixtures/expected/c/conan/v2.1.json21
-rw-r--r--spec/integration/c/conan_spec.rb2
6 files changed, 104 insertions, 0 deletions
diff --git a/.gitlab/test.yml b/.gitlab/test.yml
index 4d1f77e..2399911 100644
--- a/.gitlab/test.yml
+++ b/.gitlab/test.yml
@@ -96,6 +96,10 @@ integration-ruby:
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+functional-c-conan:
+ extends: .functional
+ trigger: gitlab-org/security-products/tests/c-conan
+
functional-csharp-nuget-dotnetcore:
extends: .functional
trigger: gitlab-org/security-products/tests/csharp-nuget-dotnetcore
diff --git a/spec/fixtures/expected/c/conan/v1.0.json b/spec/fixtures/expected/c/conan/v1.0.json
new file mode 100644
index 0000000..20d3c37
--- /dev/null
+++ b/spec/fixtures/expected/c/conan/v1.0.json
@@ -0,0 +1,23 @@
+{
+ "licenses": [
+ {
+ "count": 1,
+ "name": "New BSD"
+ }
+ ],
+ "dependencies": [
+ {
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "zstd",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ }
+ ]
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/c/conan/v1.1.json b/spec/fixtures/expected/c/conan/v1.1.json
new file mode 100644
index 0000000..fe746ed
--- /dev/null
+++ b/spec/fixtures/expected/c/conan/v1.1.json
@@ -0,0 +1,30 @@
+{
+ "version": "1.1",
+ "licenses": [
+ {
+ "count": 1,
+ "name": "New BSD"
+ }
+ ],
+ "dependencies": [
+ {
+ "licenses": [
+ {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ }
+ ],
+ "license": {
+ "name": "New BSD",
+ "url": "http://opensource.org/licenses/BSD-3-Clause"
+ },
+ "dependency": {
+ "name": "zstd",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ }
+ ]
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/c/conan/v2.0.json b/spec/fixtures/expected/c/conan/v2.0.json
new file mode 100644
index 0000000..862a083
--- /dev/null
+++ b/spec/fixtures/expected/c/conan/v2.0.json
@@ -0,0 +1,24 @@
+{
+ "version": "2.0",
+ "licenses": [
+ {
+ "id": "BSD-3-Clause",
+ "name": "BSD 3-Clause \"New\" or \"Revised\" License",
+ "url": "https://opensource.org/licenses/BSD-3-Clause",
+ "count": 1
+ }
+ ],
+ "dependencies": [
+ {
+ "name": "zstd",
+ "url": "",
+ "description": "",
+ "paths": [
+ "."
+ ],
+ "licenses": [
+ "BSD-3-Clause"
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/c/conan/v2.1.json b/spec/fixtures/expected/c/conan/v2.1.json
new file mode 100644
index 0000000..cc01320
--- /dev/null
+++ b/spec/fixtures/expected/c/conan/v2.1.json
@@ -0,0 +1,21 @@
+{
+ "version": "2.1",
+ "licenses": [
+ {
+ "id": "BSD-3-Clause",
+ "name": "BSD 3-Clause \"New\" or \"Revised\" License",
+ "url": "https://opensource.org/licenses/BSD-3-Clause"
+ }
+ ],
+ "dependencies": [
+ {
+ "name": "zstd",
+ "version": "1.4.4",
+ "package_manager": "conan",
+ "path": "conanfile.txt",
+ "licenses": [
+ "BSD-3-Clause"
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/spec/integration/c/conan_spec.rb b/spec/integration/c/conan_spec.rb
index b8375e0..3c2ac45 100644
--- a/spec/integration/c/conan_spec.rb
+++ b/spec/integration/c/conan_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
RSpec.describe "conan" do
+ include_examples "each report version", "c", "conan"
+
context "when scanning a C++ project" do
subject { runner.scan(env: env) }