Merge branch 'offline-tests' into 'master'v3.19.2

Combine default/custom x509 certificates in TLS validation

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

4 files changed, 67 insertions, 15 deletions

diff --git a/spec/fixtures/expected/js/bower/v1.0.json b/spec/fixtures/expected/js/bower/v1.0.json
index f71e6b5..9f1ea46 100644
--- a/spec/fixtures/expected/js/bower/v1.0.json
+++ b/spec/fixtures/expected/js/bower/v1.0.json
@@ -5,16 +5,16 @@
       "name": "MIT"
     },
     {
-      "count": 1,
-      "name": "ISC"
+      "count": 2,
+      "name": "unknown"
     },
     {
       "count": 1,
-      "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0"
+      "name": "ISC"
     },
     {
       "count": 1,
-      "name": "unknown"
+      "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0"
     }
   ],
   "dependencies": [
@@ -34,6 +34,19 @@
     },
     {
       "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "debug",
+        "url": "https://github.com/wixo/debug",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "license": {
         "name": "MIT",
         "url": "http://opensource.org/licenses/mit-license"
       },
diff --git a/spec/fixtures/expected/js/bower/v1.1.json b/spec/fixtures/expected/js/bower/v1.1.json
index 9abb729..9058bb5 100644
--- a/spec/fixtures/expected/js/bower/v1.1.json
+++ b/spec/fixtures/expected/js/bower/v1.1.json
@@ -6,16 +6,16 @@
       "name": "MIT"
     },
     {
-      "count": 1,
-      "name": "ISC"
+      "count": 2,
+      "name": "unknown"
     },
     {
       "count": 1,
-      "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0"
+      "name": "ISC"
     },
     {
       "count": 1,
-      "name": "unknown"
+      "name": "Simplified BSD, New BSD, MIT, ISC, Apache 2.0"
     }
   ],
   "dependencies": [
@@ -58,6 +58,25 @@
     {
       "licenses": [
         {
+          "name": "unknown",
+          "url": ""
+        }
+      ],
+      "license": {
+        "name": "unknown"
+      },
+      "dependency": {
+        "name": "debug",
+        "url": "https://github.com/wixo/debug",
+        "description": "",
+        "pathes": [
+          "."
+        ]
+      }
+    },
+    {
+      "licenses": [
+        {
           "name": "MIT",
           "url": "http://opensource.org/licenses/mit-license"
         }
diff --git a/spec/fixtures/expected/js/bower/v2.0.json b/spec/fixtures/expected/js/bower/v2.0.json
index 8d62873..050178c 100644
--- a/spec/fixtures/expected/js/bower/v2.0.json
+++ b/spec/fixtures/expected/js/bower/v2.0.json
@@ -14,6 +14,12 @@
       "count": 2
     },
     {
+      "id": "unknown",
+      "name": "unknown",
+      "url": "",
+      "count": 2
+    },
+    {
       "id": "Apache-2.0",
       "name": "Apache License 2.0",
       "url": "https://opensource.org/licenses/Apache-2.0",
@@ -30,12 +36,6 @@
       "name": "BSD 3-Clause \"New\" or \"Revised\" License",
       "url": "https://opensource.org/licenses/BSD-3-Clause",
       "count": 1
-    },
-    {
-      "id": "unknown",
-      "name": "unknown",
-      "url": "",
-      "count": 1
     }
   ],
   "dependencies": [
@@ -55,6 +55,17 @@
       ]
     },
     {
+      "name": "debug",
+      "url": "https://github.com/wixo/debug",
+      "description": "",
+      "paths": [
+        "."
+      ],
+      "licenses": [
+        "unknown"
+      ]
+    },
+    {
       "name": "ev-emitter",
       "url": "https://github.com/metafizzy/ev-emitter",
       "description": "lil' event emitter",
diff --git a/spec/fixtures/expected/js/bower/v2.1.json b/spec/fixtures/expected/js/bower/v2.1.json
index ab5fe6d..78a4a05 100644
--- a/spec/fixtures/expected/js/bower/v2.1.json
+++ b/spec/fixtures/expected/js/bower/v2.1.json
@@ -47,6 +47,15 @@
       ]
     },
     {
+      "name": "debug",
+      "version": "*",
+      "package_manager": "bower",
+      "path": "bower.json",
+      "licenses": [
+        "unknown"
+      ]
+    },
+    {
       "name": "ev-emitter",
       "version": "1.1.1",
       "package_manager": "bower",
@@ -128,4 +137,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file