summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/fixtures/schema/v1.0.json2
-rw-r--r--spec/fixtures/schema/v1.1.json2
-rw-r--r--spec/fixtures/schema/v2.0.json2
-rw-r--r--spec/fixtures/schema/v2.1.json2
-rw-r--r--spec/integration/c/conan_spec.rb7
-rw-r--r--spec/integration/java/maven_spec.rb2
6 files changed, 9 insertions, 8 deletions
diff --git a/spec/fixtures/schema/v1.0.json b/spec/fixtures/schema/v1.0.json
index 61d6e2e..395f111 100644
--- a/spec/fixtures/schema/v1.0.json
+++ b/spec/fixtures/schema/v1.0.json
@@ -1,5 +1,5 @@
{
- "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v1.0.json",
+ "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v1.0.json",
"type": "object",
"required": [
"licenses",
diff --git a/spec/fixtures/schema/v1.1.json b/spec/fixtures/schema/v1.1.json
index 99314e7..713e0fb 100644
--- a/spec/fixtures/schema/v1.1.json
+++ b/spec/fixtures/schema/v1.1.json
@@ -1,5 +1,5 @@
{
- "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v1.1.json",
+ "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v1.1.json",
"type": "object",
"required": [
"version",
diff --git a/spec/fixtures/schema/v2.0.json b/spec/fixtures/schema/v2.0.json
index d5903ad..efdd070 100644
--- a/spec/fixtures/schema/v2.0.json
+++ b/spec/fixtures/schema/v2.0.json
@@ -1,5 +1,5 @@
{
- "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v2.0.json",
+ "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v2.0.json",
"type": "object",
"required": [
"version",
diff --git a/spec/fixtures/schema/v2.1.json b/spec/fixtures/schema/v2.1.json
index b1eb44f..0226eb8 100644
--- a/spec/fixtures/schema/v2.1.json
+++ b/spec/fixtures/schema/v2.1.json
@@ -1,5 +1,5 @@
{
- "$id": "https://gitlab.com/gitlab-org/security-products/license-management/blob/master/spec/fixtures/schema/v2.1.json",
+ "$id": "https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/blob/master/spec/fixtures/schema/v2.1.json",
"type": "object",
"required": [
"version",
diff --git a/spec/integration/c/conan_spec.rb b/spec/integration/c/conan_spec.rb
index 4b60dc4..693b83a 100644
--- a/spec/integration/c/conan_spec.rb
+++ b/spec/integration/c/conan_spec.rb
@@ -72,8 +72,8 @@ RSpec.describe "conan" do
context "when pulling packages from a custom conan remote" do
let(:package_name) { "#{project_namespace.tr('/', '+')}+#{project_name}/stable" }
- let(:project_namespace) { ENV.fetch('CI_PROJECT_NAMESPACE', 'gitlab-org/security-products') }
- let(:project_name) { ENV.fetch('CI_PROJECT_NAME', 'license-management') }
+ let(:project_namespace) { ENV.fetch('CI_PROJECT_NAMESPACE', 'gitlab-org/security-products/analyzers') }
+ let(:project_name) { ENV.fetch('CI_PROJECT_NAME', 'license-finder') }
let(:api_url) { ENV.fetch('CI_API_V4_URL', 'https://gitlab.com/api/v4') }
before do
@@ -92,7 +92,8 @@ RSpec.describe "conan" do
end
end
- specify do
+ # https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/3/diffs#note_424952493
+ pending do
expect(subject).to match_schema
expect(subject.dependency_names).to match_array(['example'])
expect(subject.licenses_for('example')).to match_array(['MIT'])
diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb
index ca26d28..95a6cb0 100644
--- a/spec/integration/java/maven_spec.rb
+++ b/spec/integration/java/maven_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe "maven" do
include_examples "each report version", "java", "maven-multimodules"
context "when the maven dependencies come from the same projects public maven repository" do
- let(:env) { { 'CI_PROJECT_ID' => '6130122' } }
+ let(:env) { { 'CI_PROJECT_ID' => '18446184' } }
before do
runner.mount(dir: fixture_file('java/maven/gitlab-repo'))