diff options
| author | mo khan <mo.khan@gmail.com> | 2020-05-28 12:44:01 -0600 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-05-29 00:57:47 -0600 |
| commit | a8d9eac2cbe0c7863fc43d04d4a5be1c239be681 (patch) | |
| tree | a4a431995d918b63e33d3dc5f1ad83fba00041a4 /spec/integration/java | |
| parent | 0b976fcffe0a9b8e80587adb076bcdf279c9331c (diff) | |
Allow custom conan configuration
* Use git fetch with a depth of 1
* Control Conan environment via environment variables
* Allow specifying a custom CONAN_LOGIN_USERNAME and CONAN_PASSWORD
* Specify a default CONAN_CACERT_PATH to point the system cert file
* Tie CONAN_LOGGING_LEVEL to LOG_LEVEL
* Tag and skip offline environment tests because it was shutdown
* Add CHANGELOG entry
Diffstat (limited to 'spec/integration/java')
| -rw-r--r-- | spec/integration/java/gradle_spec.rb | 2 | ||||
| -rw-r--r-- | spec/integration/java/maven_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb index 25336c1..0e71038 100644 --- a/spec/integration/java/gradle_spec.rb +++ b/spec/integration/java/gradle_spec.rb @@ -49,7 +49,7 @@ plugins { end end - context 'when scanning a project that needs to connect to multiple TLS endpoints with different custom certificate chains' do + context 'when scanning a project that needs to connect to multiple TLS endpoints with different custom certificate chains', environment: 'offline' do subject do runner.scan(env: { 'ADDITIONAL_CA_CERT_BUNDLE' => fixture_file_content('java/gradle/offline-environment/bundle.crt'), diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb index fa57752..85637b2 100644 --- a/spec/integration/java/maven_spec.rb +++ b/spec/integration/java/maven_spec.rb @@ -80,7 +80,7 @@ RSpec.describe "maven" do end end - context "when connecting to a custom package registry with a self signed certificate" do + context "when connecting to a custom package registry with a self signed certificate", environment: 'offline' do let(:bundle) { fixture_file_content('java/maven.crt') } let(:report) { runner.scan(env: { 'ADDITIONAL_CA_CERT_BUNDLE' => bundle, 'LOG_LEVEL' => 'debug' }) } |
