summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-09-10 19:31:53 +0000
committermo khan <mo.khan@gmail.com>2020-09-10 19:31:53 +0000
commitaa44fb0d5ca05da6780869fb187985a4600cb969 (patch)
tree850ca482ea48dca003c7c4d582376ec5618d5520 /spec/integration
parentd4da2eff19bd210d18b0dbb80aa305c6a955a644 (diff)
parentf4edc9a8e9c0a94056ecb80ec6333dfa42857a14 (diff)
Merge branch 'fix-go-patch-install-dir' into 'master'v3.25.4
Use golang_version as install directory for Go See merge request gitlab-org/security-products/license-management!217
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/go/modules_spec.rb2
-rw-r--r--spec/integration/ruby/bundler_spec.rb13
2 files changed, 1 insertions, 14 deletions
diff --git a/spec/integration/go/modules_spec.rb b/spec/integration/go/modules_spec.rb
index 6486096..2048bdb 100644
--- a/spec/integration/go/modules_spec.rb
+++ b/spec/integration/go/modules_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe "modules" do
include_examples "each report version", "go", "modules"
- ['1.11', '1.12', '1.13', '1.14', '1.15'].each do |version|
+ ['1.11', '1.12', '1.13', '1.14', '1.15', '1.15.1'].each do |version|
context "when scanning a go.mod and go.sum files with v#{version}" do
before do
runner.add_file('main.go', fixture_file_content('go/main.go'))
diff --git a/spec/integration/ruby/bundler_spec.rb b/spec/integration/ruby/bundler_spec.rb
index 1c0e472..5d18b12 100644
--- a/spec/integration/ruby/bundler_spec.rb
+++ b/spec/integration/ruby/bundler_spec.rb
@@ -93,19 +93,6 @@ RSpec.describe "bundler" do
end
end
- context "when scanning the `gitlab-runner` project" do
- before do
- runner.clone('https://gitlab.com/gitlab-org/gitlab-runner.git')
- end
-
- specify do
- expect(subject).to match_schema
- expect(subject[:licenses]).not_to be_empty
- expect(subject[:dependencies]).not_to be_empty
- expect(subject.dependency_names).to include('gitlab.com/gitlab-org/gitlab-terminal')
- end
- end
-
context "when fetching dependencies from a custom registry" do
before do
add_host('rubygems.test', '127.0.0.1')