summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-01-27 21:46:04 -0700
committermo khan <mo.khan@gmail.com>2020-01-27 21:46:04 -0700
commit20037368404696bc2f0acf4442b8fa3294cdde52 (patch)
treedca94fe8d8b7dcaf8d2041678fe9480812f8f5e1
parent5cc936c93350ec854606661915a96a59f7b1bc49 (diff)
Skip json parsing and read text file
-rwxr-xr-xbin/cibuild1
-rw-r--r--spec/spec_helper.rb5
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/cibuild b/bin/cibuild
index 5f569dd..ac0ce20 100755
--- a/bin/cibuild
+++ b/bin/cibuild
@@ -15,5 +15,6 @@ export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
ruby -v
gem install bundler --conservative -v '~> 2.0'
+git submodule update --init
bin/test
bin/lint
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 710156a..096e7a3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,7 +12,7 @@ RSpec.configure do |config|
config.example_status_persistence_file_path = '.rspec_status'
config.include(Module.new do
def fixture_file(file)
- File.join(Dir.pwd, 'spec', 'fixtures', file)
+ File.join(File.dirname(__FILE__), 'fixtures', file)
end
def fixture_file_content(file)
@@ -20,8 +20,7 @@ RSpec.configure do |config|
end
def license_file(id)
- json = JSON.parse(fixture_file_content("spdx/jsonld/#{id}.jsonld"))
- json['licenseText']
+ fixture_file_content("spdx/text/#{id}.txt")
end
end)