summaryrefslogtreecommitdiff
path: root/spec/integration/js
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-06-02 09:10:28 +0000
committerCan Eldem <celdem@gitlab.com>2020-06-02 09:10:28 +0000
commita49e935ee3e2e07d90da7c78b543a5592a3b1a4a (patch)
tree960dbaa58768be8e1e05dc098743d560ee3ec4c8 /spec/integration/js
parent0b976fcffe0a9b8e80587adb076bcdf279c9331c (diff)
parent16b452b82b08ecaeef1dde3c1cb6fd2ab0446947 (diff)
Merge branch '212919-pull-custom-conan-packages' into 'master'v3.11.0
Allow custom conan configuration See merge request gitlab-org/security-products/license-management!159
Diffstat (limited to 'spec/integration/js')
-rw-r--r--spec/integration/js/bower_spec.rb2
-rw-r--r--spec/integration/js/npm_spec.rb2
-rw-r--r--spec/integration/js/yarn_spec.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/integration/js/bower_spec.rb b/spec/integration/js/bower_spec.rb
index 5a4f72d..cc7cf9d 100644
--- a/spec/integration/js/bower_spec.rb
+++ b/spec/integration/js/bower_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe "bower" do
specify { expect(subject.licenses_for('stimulus.umd')).to match_array(['unknown']) }
end
- context "when scanning a bower project with a dependency from a custom npm registry" do
+ context "when scanning a bower project with a dependency from a custom npm registry", environment: 'offline' do
subject { runner.scan(env: { 'ADDITIONAL_CA_CERT_BUNDLE' => fixture_file_content('js/custom-npm.crt') }) }
before do
diff --git a/spec/integration/js/npm_spec.rb b/spec/integration/js/npm_spec.rb
index 13cbd15..abc6fc0 100644
--- a/spec/integration/js/npm_spec.rb
+++ b/spec/integration/js/npm_spec.rb
@@ -465,7 +465,7 @@ RSpec.describe "npm" do
end
end
- context "when scanning a project with dependencies sourced from a custom registry" do
+ context "when scanning a project with dependencies sourced from a custom registry", environment: 'offline' do
subject { runner.scan(env: { 'ADDITIONAL_CA_CERT_BUNDLE' => fixture_file_content('js/custom-npm.crt') }) }
before do
diff --git a/spec/integration/js/yarn_spec.rb b/spec/integration/js/yarn_spec.rb
index a5a9695..bacac47 100644
--- a/spec/integration/js/yarn_spec.rb
+++ b/spec/integration/js/yarn_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe "yarn" do
end
end
- context "when scanning a project with dependencies sourced from a custom registry" do
+ context "when scanning a project with dependencies sourced from a custom registry", environment: 'offline' do
subject { runner.scan(env: { 'ADDITIONAL_CA_CERT_BUNDLE' => fixture_file_content('js/custom-npm.crt') }) }
before do