diff options
| author | mo khan <mo.khan@gmail.com> | 2020-10-07 19:49:35 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-10-07 19:49:35 +0000 |
| commit | 1e2005682f1cd5f0fee3ee21235bd2a349d529a4 (patch) | |
| tree | 5b5af5f973e81019f52aa8bb876351014c9955c2 /spec/integration | |
| parent | cb0681e7b20537d8aeb5785ad09934cd9fe103f8 (diff) | |
| parent | 8e4aaaf041950ae90916397cd08ab0f36f80c622 (diff) | |
Merge branch '215933-new-repo' into 'main'v3.28.0
Relocate project
See merge request gitlab-org/security-products/analyzers/license-finder!3
Diffstat (limited to 'spec/integration')
| -rw-r--r-- | spec/integration/c/conan_spec.rb | 7 | ||||
| -rw-r--r-- | spec/integration/java/maven_spec.rb | 2 |
2 files changed, 5 insertions, 4 deletions
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')) |
