summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-02-28 15:59:55 -0700
committermo khan <mo.khan@gmail.com>2020-02-28 15:59:55 -0700
commit083016a91a7b52cec6e72b8cd09aa688a79eb57e (patch)
tree67642e1e63d581b8560437b97e21d9a0b9157056
parent81a9a020c4ec4fff4382cd6c2bbbf1767a35d674 (diff)
Attempt to get integration testsHEADmaster
-rwxr-xr-xbin/test-local4
-rw-r--r--spec/support/matchers.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/test-local b/bin/test-local
index e7e7325..d13c390 100755
--- a/bin/test-local
+++ b/bin/test-local
@@ -5,4 +5,6 @@ set -e
cd "$(dirname "$0")/.."
PROJECT_PATH="$1"
-bash -l ./run.sh analyze "$PROJECT_PATH"
+cd "$PROJECT_PATH"
+asdf install
+bundle exec ./exe/gitlab-license-scanning report --prepare --format=json --save=gl-license-management-report.json
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index 595cd17..3e4532e 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -1,6 +1,6 @@
RSpec::Matchers.define :match_schema do |version: '2.0'|
def schema_for(version)
- License::Management.root.join("spec/fixtures/schema/v#{version}.json").to_s
+ GitLab::License::Scanning.root.join("spec/fixtures/schema/v#{version}.json").to_s
end
match do |actual|
!actual.nil? && (@errors = JSON::Validator.fully_validate(schema_for(version), actual)).empty?