summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-09-16 11:53:59 -0600
committermo khan <mo.khan@gmail.com>2020-09-16 11:53:59 -0600
commit7a6199f2ea4adc239d5bf791e07dd5d93c9744c6 (patch)
treebbc988df6fde6708acaf8febd1691586592505a8
parentd18222aef690c7b99d4aed29d254ea952ddd144a (diff)
test: build docker images before tests
-rw-r--r--spec/gemnasium_maven_spec.rb6
-rw-r--r--spec/spec_helper.rb1
-rw-r--r--spec/spotbugs_spec.rb8
-rw-r--r--spec/support/docker_helper.rb11
m---------src/gemnasium-maven0
5 files changed, 17 insertions, 9 deletions
diff --git a/spec/gemnasium_maven_spec.rb b/spec/gemnasium_maven_spec.rb
index d84050a..85f7cae 100644
--- a/spec/gemnasium_maven_spec.rb
+++ b/spec/gemnasium_maven_spec.rb
@@ -2,11 +2,9 @@ require 'openssl'
RSpec.describe 'gemnasium-maven' do
['8', '13', '11', '14'].each do |java_version|
- context "when scanning a java #{java_version} project with packages from a custom source" do
+ context "when scanning a java #{java_version} project with a custom X509 CA certificate" do
subject do
- docker.build(tag: docker_image)
- return {} unless docker.run(image: docker_image, project_path: project_path, env: env)
-
+ docker.run(image: docker_image, project_path: project_path, env: env)
DependencyScanningReport.new(project_path: project_path)
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c7b393b..19f2cdb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,6 +15,7 @@
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
$LOAD_PATH.unshift(Pathname.pwd.join('lib'))
require 'e2e'
+require 'support/docker_helper'
require 'support/fixture_file_helper'
RSpec.configure do |config|
diff --git a/spec/spotbugs_spec.rb b/spec/spotbugs_spec.rb
index 589533c..6f493d9 100644
--- a/spec/spotbugs_spec.rb
+++ b/spec/spotbugs_spec.rb
@@ -1,12 +1,10 @@
-RSpec.describe "spotbugs" do
+RSpec.describe 'spotbugs' do
subject do
- docker.build(tag: docker_image)
- docker.run(image: docker_image, project_path: project.path)
+ docker.run(image: "#{self.class.description}:latest", project_path: project.path)
JSON.parse(project.path.join('gl-sast-report.json').read)
end
- let(:docker) { Docker.new(pwd: Pathname.pwd.join('src/spotbugs')) }
- let(:docker_image) { 'spotbugs:latest' }
+ let(:docker) { Docker.new(pwd: Pathname.pwd.join("src/#{self.class.description}")) }
let(:project) { Project.new }
around(:each) do |example|
diff --git a/spec/support/docker_helper.rb b/spec/support/docker_helper.rb
new file mode 100644
index 0000000..76c9195
--- /dev/null
+++ b/spec/support/docker_helper.rb
@@ -0,0 +1,11 @@
+RSpec.configure do |config|
+ config.before(:suite) do
+ Pathname.pwd.join('src').each_child do |file|
+ next unless file.directory?
+
+ docker = Docker.new(pwd: file)
+ docker_image = "#{file.basename.to_s}:latest"
+ docker.build(tag: docker_image)
+ end
+ end
+end
diff --git a/src/gemnasium-maven b/src/gemnasium-maven
-Subproject b37787fae756ddfb9bfa49b9b4d97c08109f930
+Subproject 3953ecf8c2b2f65a0f8fd740b2f66719cfd0be4