Skip to content

Commit 4464d99

Browse files
karlnadenkarlnaden
authored
Requirements conversion (#49)
* update req file names * regenerated requirement files with updated tools * add req suite config and stu1 requirements * update not tested and coverage * requirements infrastructure update * requirements clean, suite requirement sets * group-level coverage cleanup * cleanup 305-306 * cleanup 207-209 * cleanup output check requirements * status check requirements cleanup * add back v2 requirements * requirements ci * enable requirements UI * add breadcrumbs * remove old coverage file
1 parent a31ce28 commit 4464d99

35 files changed

Lines changed: 2125 additions & 1629 deletions

‎.env.development‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
22
REDIS_URL=redis://localhost:6379/0
33
FHIR_REFERENCE_SERVER=http://localhost:8080/reference-server/r4
44
HOST_HEADER=localhost:8080
5-
INFERNO_HOST=http://localhost:4567
5+
INFERNO_HOST=http://localhost:4567
6+
ENABLE_REQUIREMENTS=true

‎.env.production‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ REDIS_URL=redis://redis:6379/0
22
FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
33
FHIR_REFERENCE_SERVER=http://host.docker.internal:8080/reference-server/r4
44
HOST_HEADER=host.docker.internal:8080
5-
INFERNO_HOST=http://localhost
5+
INFERNO_HOST=http://localhost
6+
ENABLE_REQUIREMENTS=true

‎.env.test‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
FHIR_RESOURCE_VALIDATOR_URL=https://example.com/validatorapi
22
ASYNC_JOBS=false
3+
ENABLE_REQUIREMENTS=true

‎.github/workflows/ruby.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,22 @@ jobs:
3737
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
3838
- name: Run tests
3939
run: bundle exec rake
40+
41+
requirements:
42+
needs: build
43+
runs-on: ubuntu-latest
44+
strategy:
45+
matrix:
46+
ruby-version: ['3.3.6']
47+
steps:
48+
- uses: actions/checkout@v2
49+
- name: Set up Ruby
50+
uses: ruby/setup-ruby@v1
51+
with:
52+
ruby-version: ${{ matrix.ruby-version }}
53+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
54+
- name: Check Export
55+
run: bundle exec inferno requirements check
56+
- name: Check Coverage
57+
run: bundle exec inferno requirements check_coverage
58+

‎Gemfile.lock‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ PATH
44
bulk_data_test_kit (0.12.2)
55
bloomer (~> 1.0.0)
66
colorize (~> 0.8.1)
7-
inferno_core (>= 0.6.8)
7+
inferno_core (>= 0.6.16)
88
json-jwt (~> 1.15.3)
99
mime-types (~> 3.4.0)
1010
ndjson (~> 1.0.0)
1111
rubyzip (~> 2.3.2)
12-
smart_app_launch_test_kit (~> 0.6.3)
12+
smart_app_launch_test_kit (~> 0.6.4)
1313
tls_test_kit (>= 0.3.0)
1414

1515
GEM
@@ -43,6 +43,7 @@ GEM
4343
crack (1.0.0)
4444
bigdecimal
4545
rexml
46+
csv (3.3.5)
4647
database_cleaner (1.99.0)
4748
database_cleaner-sequel (1.99.0)
4849
database_cleaner (~> 1.99.0)
@@ -151,11 +152,12 @@ GEM
151152
mutex_m
152153
i18n (1.14.7)
153154
concurrent-ruby (~> 1.0)
154-
inferno_core (0.6.9)
155+
inferno_core (0.6.16)
155156
activesupport (~> 6.1.7.5)
156157
base62-rb (= 0.3.1)
157158
blueprinter (= 0.25.2)
158159
concurrent-ruby (= 1.3.4)
160+
csv (~> 3.3.5)
159161
dotenv (~> 2.7)
160162
dry-configurable (= 1.0.0)
161163
dry-container (= 0.10.0)
@@ -168,12 +170,14 @@ GEM
168170
fhir_models (>= 4.2.2)
169171
hanami-controller (= 2.0.0)
170172
hanami-router (= 2.0.0)
173+
mutex_m (~> 0.3.0)
171174
oj (= 3.11.0)
172175
pastel (~> 0.8.0)
173176
pry
174177
pry-byebug
175178
puma (~> 5.6.7)
176179
rake (~> 13.0)
180+
roo (~> 2.10.1)
177181
sequel (~> 5.42.0)
178182
sidekiq (~> 7.2.4)
179183
sqlite3 (~> 1.4)
@@ -283,8 +287,8 @@ GEM
283287
connection_pool (>= 2.3.0)
284288
rack (>= 2.2.4)
285289
redis-client (>= 0.19.0)
286-
smart_app_launch_test_kit (0.6.3)
287-
inferno_core (>= 0.6.3)
290+
smart_app_launch_test_kit (0.6.4)
291+
inferno_core (>= 0.6.15)
288292
json-jwt (~> 1.15.3)
289293
jwt (~> 2.6)
290294
tls_test_kit (~> 0.3.0)

‎Rakefile‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,3 @@ namespace :db do
1515
Inferno::Utils::Migration.new.run
1616
end
1717
end
18-
19-
namespace :requirements do
20-
desc 'Generate requirements coverage CSV'
21-
task :generate_coverage do
22-
require 'inferno'
23-
Inferno::Application.start(:suites)
24-
25-
require_relative 'lib/inferno_requirements_tools/tasks/requirements_coverage'
26-
InfernoRequirementsTools::Tasks::RequirementsCoverage.new.run
27-
end
28-
end
29-
30-
namespace :requirements do
31-
desc 'Check if requirements coverage CSV is up-to-date'
32-
task :check_coverage do
33-
require 'inferno'
34-
Inferno::Application.start(:suites)
35-
36-
require_relative 'lib/inferno_requirements_tools/tasks/requirements_coverage'
37-
InfernoRequirementsTools::Tasks::RequirementsCoverage.new.run_check
38-
end
39-
end
40-
41-
namespace :requirements do
42-
desc 'Collect requirements and planned not tested requirements into CSVs'
43-
task :collect, [:input_directory] => [] do |t, args|
44-
45-
require_relative 'lib/inferno_requirements_tools/tasks/collect_requirements'
46-
InfernoRequirementsTools::Tasks::CollectRequirements.new.run(args.input_directory)
47-
end
48-
end
49-
50-
namespace :requirements do
51-
desc 'Check if requirements and planned not tested CSVs are up-to-date'
52-
task :check_collection, [:input_directory] => [] do |t, args|
53-
54-
require_relative 'lib/inferno_requirements_tools/tasks/collect_requirements'
55-
InfernoRequirementsTools::Tasks::CollectRequirements.new.run_check(args.input_directory)
56-
end
57-
end

‎bulk_data_test_kit.gemspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ Gem::Specification.new do |spec|
1313
spec.license = 'Apache-2.0'
1414
spec.add_runtime_dependency 'bloomer', '~> 1.0.0'
1515
spec.add_runtime_dependency 'colorize', '~> 0.8.1'
16-
spec.add_runtime_dependency 'inferno_core', '>= 0.6.8'
16+
spec.add_runtime_dependency 'inferno_core', '>= 0.6.16'
1717
spec.add_runtime_dependency 'json-jwt', '~> 1.15.3'
1818
spec.add_runtime_dependency 'mime-types', '~> 3.4.0'
1919
spec.add_runtime_dependency 'ndjson', '~> 1.0.0'
2020
spec.add_runtime_dependency 'rubyzip', '~> 2.3.2'
21-
spec.add_runtime_dependency 'smart_app_launch_test_kit', '~> 0.6.3'
21+
spec.add_runtime_dependency 'smart_app_launch_test_kit', '~> 0.6.4'
2222
spec.add_runtime_dependency 'tls_test_kit', '>= 0.3.0'
2323
spec.add_development_dependency 'database_cleaner-sequel', '~> 1.8'
2424
spec.add_development_dependency 'factory_bot', '~> 6.1'

‎lib/bulk_data_test_kit.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22
require_relative 'bulk_data_test_kit/metadata.rb'
3-
require_relative 'inferno_requirements_tools/ext/inferno_core/runnable'
43
require_relative 'bulk_data_test_kit/v1.0.1/bulk_data_test_suite'
54
require_relative 'bulk_data_test_kit/v2.0.0/bulk_data_test_suite'
65
require_relative 'bulk_data_test_kit/v2.0.0_client/bulk_data_client_test_suite'

‎lib/bulk_data_test_kit/requirements/bulk-data-test-kit_out_of_scope_requirements.csv‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)