diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 2de611b11..500d73a38 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -77,6 +77,12 @@ jobs:
runs-on: ubuntu-20.04
+ services:
+ mongodb:
+ image: mongo:7.0.6
+ ports:
+ - 27017:27017
+
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
@@ -92,17 +98,9 @@ jobs:
nvm install 16.19
nvm use stable
bundle install
- git clone -b cypress_v6 https://github.com/projectcypress/cqm-execution-service.git /tmp/cqm-execution-service
- yarn --cwd /tmp/cqm-execution-service install --only=production
- yarn --cwd /tmp/cqm-execution-service start &
git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
yarn --cwd /tmp/cqm-execution-service-56 install --only=production
yarn --cwd /tmp/cqm-execution-service-56 start &
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.18.tgz -O /tmp/mongodb.tgz
- tar -xvf /tmp/mongodb.tgz
- mkdir /tmp/data
- ${PWD}/mongodb-linux-x86_64-4.0.18/bin/mongod --setParameter cursorTimeoutMillis=3600000 --setParameter maxBSONDepth=500 --dbpath /tmp/data --bind_ip 127.0.0.1 &> /dev/null &
- cp ./.travis/mongoid.yml ./config/mongoid.yml
- name: Run cucumber
uses: nick-fields/retry@v2
with:
@@ -122,6 +120,12 @@ jobs:
runs-on: ubuntu-20.04
+ services:
+ mongodb:
+ image: mongo:7.0.6
+ ports:
+ - 27017:27017
+
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
@@ -137,17 +141,9 @@ jobs:
nvm install 16.19
nvm use stable
bundle install
- git clone -b cypress_v6 https://github.com/projectcypress/cqm-execution-service.git /tmp/cqm-execution-service
- yarn --cwd /tmp/cqm-execution-service install --only=production
- yarn --cwd /tmp/cqm-execution-service start &
git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
yarn --cwd /tmp/cqm-execution-service-56 install --only=production
yarn --cwd /tmp/cqm-execution-service-56 start &
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.18.tgz -O /tmp/mongodb.tgz
- tar -xvf /tmp/mongodb.tgz
- mkdir /tmp/data
- ${PWD}/mongodb-linux-x86_64-4.0.18/bin/mongod --setParameter cursorTimeoutMillis=3600000 --setParameter maxBSONDepth=500 --dbpath /tmp/data --bind_ip 127.0.0.1 &> /dev/null &
- cp ./.travis/mongoid.yml ./config/mongoid.yml
- name: Run cucumber
uses: nick-fields/retry@v2
with:
@@ -167,6 +163,12 @@ jobs:
runs-on: ubuntu-latest
+ services:
+ mongodb:
+ image: mongo:7.0.6
+ ports:
+ - 27017:27017
+
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
@@ -182,17 +184,9 @@ jobs:
nvm install 16.19
nvm use stable
bundle install
- git clone -b cypress_v6 https://github.com/projectcypress/cqm-execution-service.git /tmp/cqm-execution-service
- yarn --cwd /tmp/cqm-execution-service install --only=production
- yarn --cwd /tmp/cqm-execution-service start &
git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
yarn --cwd /tmp/cqm-execution-service-56 install --only=production
yarn --cwd /tmp/cqm-execution-service-56 start &
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.18.tgz -O /tmp/mongodb.tgz
- tar -xvf /tmp/mongodb.tgz
- mkdir /tmp/data
- ${PWD}/mongodb-linux-x86_64-4.0.18/bin/mongod --setParameter cursorTimeoutMillis=3600000 --setParameter maxBSONDepth=500 --dbpath /tmp/data --bind_ip 127.0.0.1 &> /dev/null &
- cp ./.travis/mongoid.yml ./config/mongoid.yml
- name: Run Rake test
run: |
RUBYOPT="-W0"
@@ -209,6 +203,12 @@ jobs:
runs-on: ubuntu-latest
+ services:
+ mongodb:
+ image: mongo:7.0.6
+ ports:
+ - 27017:27017
+
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
@@ -224,17 +224,9 @@ jobs:
nvm install 16.19
nvm use stable
bundle install
- git clone -b cypress_v6 https://github.com/projectcypress/cqm-execution-service.git /tmp/cqm-execution-service
- yarn --cwd /tmp/cqm-execution-service install --only=production
- yarn --cwd /tmp/cqm-execution-service start &
git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
yarn --cwd /tmp/cqm-execution-service-56 install --only=production
yarn --cwd /tmp/cqm-execution-service-56 start &
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.18.tgz -O /tmp/mongodb.tgz
- tar -xvf /tmp/mongodb.tgz
- mkdir /tmp/data
- ${PWD}/mongodb-linux-x86_64-4.0.18/bin/mongod --setParameter cursorTimeoutMillis=3600000 --setParameter maxBSONDepth=500 --dbpath /tmp/data --bind_ip 127.0.0.1 &> /dev/null &
- cp ./.travis/mongoid.yml ./config/mongoid.yml
- name: Run Rake test:jobs
run: |
RUBYOPT="-W0"
@@ -269,6 +261,12 @@ jobs:
runs-on: ubuntu-latest
+ services:
+ mongodb:
+ image: mongo:7.0.6
+ ports:
+ - 27017:27017
+
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
@@ -284,17 +282,9 @@ jobs:
nvm install 16.19
nvm use stable
bundle install
- git clone -b cypress_v6 https://github.com/projectcypress/cqm-execution-service.git /tmp/cqm-execution-service
- yarn --cwd /tmp/cqm-execution-service install --only=production
- yarn --cwd /tmp/cqm-execution-service start &
git clone -b cypress_v7 https://github.com/projecttacoma/cqm-execution-service.git /tmp/cqm-execution-service-56
yarn --cwd /tmp/cqm-execution-service-56 install --only=production
yarn --cwd /tmp/cqm-execution-service-56 start &
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.18.tgz -O /tmp/mongodb.tgz
- tar -xvf /tmp/mongodb.tgz
- mkdir /tmp/data
- ${PWD}/mongodb-linux-x86_64-4.0.18/bin/mongod --setParameter cursorTimeoutMillis=3600000 --setParameter maxBSONDepth=500 --dbpath /tmp/data --bind_ip 127.0.0.1 &> /dev/null &
- cp ./.travis/mongoid.yml ./config/mongoid.yml
- name: Run Rake test
run: |
RUBYOPT="-W0"
diff --git a/Gemfile b/Gemfile
index 5bf7b2351..6dbe637c6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,8 +7,8 @@ ruby '3.2.2'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.0'
-gem 'delayed_job_mongoid', '~> 2.3.0'
-gem 'mongoid', '~> 7.5.0'
+gem 'delayed_job_mongoid', '~> 3.0.0'
+gem 'mongoid', '~> 8.1.0'
# gem 'mongoid', '~> 4.0.2'
gem 'bson'
@@ -16,10 +16,10 @@ gem 'bson'
gem 'mustache'
gem 'os'
-gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models', tag: 'cypress_v7.0.0'
-gem 'cqm-parsers', '~> 4.1.0.2'
-gem 'cqm-reports', git: 'https://github.com/projecttacoma/cqm-reports', tag: 'cypress_v7.2.0'
-gem 'cqm-validators', '~> 4.0.4'
+gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models', branch: 'rails_7_mongoid_8_dsc'
+gem 'cqm-parsers', git: 'https://github.com/projecttacoma/cqm-parsers', branch: 'mongoid8'
+gem 'cqm-reports', git: 'https://github.com/projecttacoma/cqm-reports', branch: 'master'
+gem 'cqm-validators', '~> 4.0.5'
# # Use faker to generate addresses
gem 'faker', '> 1.5.0'
@@ -30,7 +30,8 @@ gem 'sass-rails', '~> 5.0.4'
gem 'bootstrap-sass', '~> 3.4.1'
gem 'font-awesome-sass', '~> 5.0.13'
gem 'jquery-rails', '~> 4.4.0'
-gem 'jquery-ui-rails', '~> 6.0.1'
+# TODO: remove or use gem
+gem 'jquery-ui-rails', git: 'https://github.com/jquery-ui-rails/jquery-ui-rails', tag: 'v7.0.0'
# Add pagination support
gem 'kaminari-mongoid'
diff --git a/Gemfile.lock b/Gemfile.lock
index 219daa3c9..ced08b4e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,24 +1,54 @@
+GIT
+ remote: https://github.com/jquery-ui-rails/jquery-ui-rails
+ revision: 413265e81f790f795239e07e7e25e01429b2f18d
+ tag: v7.0.0
+ specs:
+ jquery-ui-rails (7.0.0)
+ railties (>= 3.2.16)
+
GIT
remote: https://github.com/projecttacoma/cqm-models
- revision: 2c76e5f30e77fb71c7f55a260db64b7c1ace5e0b
- tag: cypress_v7.0.0
+ revision: 27575d388eec04910470c05405ea2629b184f0ec
+ branch: rails_7_mongoid_8_dsc
+ specs:
+ cqm-models (4.2.0)
+
+GIT
+ remote: https://github.com/projecttacoma/cqm-parsers
+ revision: 2c4642e363417ec1995ced80aa1cdaf19f982b47
+ branch: mongoid8
specs:
- cqm-models (4.0.2)
+ cqm-parsers (4.1.0.2)
+ activesupport (> 5.0)
+ builder (~> 3.1)
+ cqm-models (> 3.0.0)
+ erubis (~> 2.7.0)
+ highline (~> 1.7.0)
+ log4r (~> 1.1.10)
+ memoist (~> 0.9.1)
+ mongoid (> 6.0.5, < 9.0.0)
+ mongoid-tree (~> 2.2.0)
+ mustache
+ nokogiri (>= 1.16.2)
+ rubyzip (~> 1.3)
+ typhoeus
+ uuid (~> 2.3.7)
+ zip-zip (~> 0.3)
GIT
remote: https://github.com/projecttacoma/cqm-reports
- revision: 395796f43d1b162cfac6d4568c2b85680ecb3995
- tag: cypress_v7.2.0
+ revision: 983af8a2b099071eee6b0db40568afba74d975c4
+ branch: master
specs:
- cqm-reports (4.0.0)
- cqm-models (> 3.0)
- cqm-validators (> 3.0)
+ cqm-reports (4.1.0)
+ cqm-models (~> 4.0)
+ cqm-validators (~> 4.0)
erubis (~> 2.7)
log4r (~> 1.1)
memoist (~> 0.9)
mongoid-tree (> 2.0)
mustache
- nokogiri (>= 1.8.5, < 1.15.0)
+ nokogiri (>= 1.16.2)
uuid (~> 2.3)
zip-zip (~> 0.3)
@@ -33,72 +63,72 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actioncable (7.0.7.2)
- actionpack (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ actioncable (7.0.8.1)
+ actionpack (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (7.0.7.2)
- actionpack (= 7.0.7.2)
- activejob (= 7.0.7.2)
- activerecord (= 7.0.7.2)
- activestorage (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ actionmailbox (7.0.8.1)
+ actionpack (= 7.0.8.1)
+ activejob (= 7.0.8.1)
+ activerecord (= 7.0.8.1)
+ activestorage (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
- actionmailer (7.0.7.2)
- actionpack (= 7.0.7.2)
- actionview (= 7.0.7.2)
- activejob (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ actionmailer (7.0.8.1)
+ actionpack (= 7.0.8.1)
+ actionview (= 7.0.8.1)
+ activejob (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
- actionpack (7.0.7.2)
- actionview (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ actionpack (7.0.8.1)
+ actionview (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (7.0.7.2)
- actionpack (= 7.0.7.2)
- activerecord (= 7.0.7.2)
- activestorage (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ actiontext (7.0.8.1)
+ actionpack (= 7.0.8.1)
+ activerecord (= 7.0.8.1)
+ activestorage (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.0.7.2)
- activesupport (= 7.0.7.2)
+ actionview (7.0.8.1)
+ activesupport (= 7.0.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (7.0.7.2)
- activesupport (= 7.0.7.2)
+ activejob (7.0.8.1)
+ activesupport (= 7.0.8.1)
globalid (>= 0.3.6)
- activemodel (7.0.7.2)
- activesupport (= 7.0.7.2)
- activerecord (7.0.7.2)
- activemodel (= 7.0.7.2)
- activesupport (= 7.0.7.2)
- activestorage (7.0.7.2)
- actionpack (= 7.0.7.2)
- activejob (= 7.0.7.2)
- activerecord (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ activemodel (7.0.8.1)
+ activesupport (= 7.0.8.1)
+ activerecord (7.0.8.1)
+ activemodel (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
+ activestorage (7.0.8.1)
+ actionpack (= 7.0.8.1)
+ activejob (= 7.0.8.1)
+ activerecord (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
- activesupport (7.0.7.2)
+ activesupport (7.0.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
- addressable (2.8.5)
+ addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
ansi (1.5.0)
ast (2.4.2)
@@ -118,7 +148,7 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
- bcrypt (3.1.18)
+ bcrypt (3.1.20)
bindex (0.8.1)
bootsnap (1.15.0)
msgpack (~> 1.2)
@@ -154,9 +184,9 @@ GEM
marcel (~> 1.0.0)
mini_mime (>= 0.1.3)
ssrf_filter (~> 1.0)
- carrierwave-mongoid (1.3.0)
+ carrierwave-mongoid (1.4.0)
carrierwave (>= 0.8, < 3)
- mongoid (>= 3.0, < 8.0)
+ mongoid (>= 3.0, < 9.0)
mongoid-grid_fs (>= 1.3, < 3.0)
childprocess (4.1.0)
cliver (0.3.2)
@@ -174,25 +204,9 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
- concurrent-ruby (1.2.2)
- cqm-parsers (4.1.0.2)
- activesupport (> 5.0)
- builder (~> 3.1)
- cqm-models (> 3.0.0)
- erubis (~> 2.7.0)
- highline (~> 1.7.0)
- log4r (~> 1.1.10)
- memoist (~> 0.9.1)
- mongoid (> 6.0.5, < 8.0.0)
- mongoid-tree (~> 2.1.0)
- mustache
- nokogiri (>= 1.8.5, < 1.15.0)
- rubyzip (~> 1.3)
- typhoeus
- uuid (~> 2.3.7)
- zip-zip (~> 0.3)
- cqm-validators (4.0.4)
- nokogiri (>= 1.8.5, < 1.15.0)
+ concurrent-ruby (1.2.3)
+ cqm-validators (4.0.5)
+ nokogiri (>= 1.16.2)
crack (0.4.5)
rexml
crass (1.0.6)
@@ -233,24 +247,23 @@ GEM
database_cleaner-mongoid (2.0.1)
database_cleaner-core (~> 2.0.0)
mongoid
- date (3.3.3)
+ date (3.3.4)
declarative (0.0.20)
declarative-option (0.1.0)
delayed_job (4.1.11)
activesupport (>= 3.0, < 8.0)
- delayed_job_mongoid (2.3.1)
+ delayed_job_mongoid (3.0.0)
delayed_job (>= 3.0, < 5)
- mongoid (>= 3.0, < 8)
- mongoid-compatibility (>= 0.4.0)
+ mongoid (>= 5.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
- devise (4.8.1)
+ devise (4.9.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
- devise_invitable (2.0.7)
+ devise_invitable (2.0.9)
actionmailer (>= 5.0)
devise (>= 4.6)
diff-lcs (1.5.0)
@@ -274,8 +287,8 @@ GEM
ffi (1.16.3)
font-awesome-sass (5.0.13)
sassc (>= 1.11)
- globalid (1.1.0)
- activesupport (>= 5.0)
+ globalid (1.2.1)
+ activesupport (>= 6.1)
hashdiff (1.0.1)
highline (1.7.10)
http-cookie (1.0.5)
@@ -301,8 +314,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- jquery-ui-rails (6.0.1)
- railties (>= 3.2.16)
json (2.6.3)
kaminari-core (1.2.2)
kaminari-mongoid (1.0.2)
@@ -316,7 +327,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
local_time (2.0.1)
log4r (1.1.10)
- loofah (2.21.3)
+ loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
macaddr (1.7.2)
@@ -326,17 +337,17 @@ GEM
net-imap
net-pop
net-smtp
- marcel (1.0.2)
+ marcel (1.0.3)
matrix (0.4.2)
memoist (0.9.3)
method_source (1.0.0)
- mime-types (3.4.1)
+ mime-types (3.5.2)
mime-types-data (~> 3.2015)
- mime-types-data (3.2022.0105)
+ mime-types-data (3.2023.1205)
mini_magick (4.12.0)
mini_mime (1.1.5)
- mini_portile2 (2.8.4)
- minitest (5.20.0)
+ mini_portile2 (2.8.5)
+ minitest (5.22.2)
minitest-rails (7.0.0)
minitest (~> 5.10)
railties (~> 7.0.0)
@@ -347,39 +358,37 @@ GEM
ruby-progressbar
mocha (2.1.0)
ruby2_keywords (>= 0.0.5)
- mongo (2.18.2)
+ mongo (2.19.3)
bson (>= 4.14.1, < 5.0.0)
- mongoid (7.5.2)
- activemodel (>= 5.1, < 7.1, != 7.0.0)
- mongo (>= 2.10.5, < 3.0.0)
+ mongoid (8.1.4)
+ activemodel (>= 5.1, < 7.2, != 7.0.0)
+ concurrent-ruby (>= 1.0.5, < 2.0)
+ mongo (>= 2.18.0, < 3.0.0)
ruby2_keywords (~> 0.0.5)
- mongoid-compatibility (0.6.0)
- activesupport
- mongoid (>= 2.0)
- mongoid-grid_fs (2.4.0)
+ mongoid-grid_fs (2.5.0)
mime-types (>= 1.0, < 4.0)
- mongoid (>= 3.0, < 8.0)
- mongoid-tree (2.1.1)
- mongoid (>= 4.0, < 8)
+ mongoid (>= 3.0, < 9.0)
+ mongoid-tree (2.2.0)
+ mongoid (>= 4.0, < 9)
msgpack (1.6.0)
multi_json (1.15.0)
multi_test (1.1.0)
mustache (1.1.1)
nested_form (0.3.2)
- net-imap (0.3.7)
+ net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
- net-protocol (0.2.1)
+ net-protocol (0.2.2)
timeout
- net-smtp (0.3.3)
+ net-smtp (0.4.0.1)
net-protocol
netrc (0.11.0)
newrelic_rpm (8.15.0)
- nio4r (2.5.9)
- nokogiri (1.14.5)
- mini_portile2 (~> 2.8.0)
+ nio4r (2.7.0)
+ nokogiri (1.16.2)
+ mini_portile2 (~> 2.8.2)
racc (~> 1.4)
orm_adapter (0.5.0)
os (1.1.4)
@@ -400,24 +409,24 @@ GEM
pry-nav (1.0.0)
pry (>= 0.9.10, < 0.15)
public_suffix (5.0.4)
- racc (1.7.1)
- rack (2.2.8)
+ racc (1.7.3)
+ rack (2.2.8.1)
rack-test (2.1.0)
rack (>= 1.3)
- rails (7.0.7.2)
- actioncable (= 7.0.7.2)
- actionmailbox (= 7.0.7.2)
- actionmailer (= 7.0.7.2)
- actionpack (= 7.0.7.2)
- actiontext (= 7.0.7.2)
- actionview (= 7.0.7.2)
- activejob (= 7.0.7.2)
- activemodel (= 7.0.7.2)
- activerecord (= 7.0.7.2)
- activestorage (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ rails (7.0.8.1)
+ actioncable (= 7.0.8.1)
+ actionmailbox (= 7.0.8.1)
+ actionmailer (= 7.0.8.1)
+ actionpack (= 7.0.8.1)
+ actiontext (= 7.0.8.1)
+ actionview (= 7.0.8.1)
+ activejob (= 7.0.8.1)
+ activemodel (= 7.0.8.1)
+ activerecord (= 7.0.8.1)
+ activestorage (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
bundler (>= 1.15.0)
- railties (= 7.0.7.2)
+ railties (= 7.0.8.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ -438,16 +447,16 @@ GEM
json
require_all (~> 3.0)
ruby-progressbar
- railties (7.0.7.2)
- actionpack (= 7.0.7.2)
- activesupport (= 7.0.7.2)
+ railties (7.0.8.1)
+ actionpack (= 7.0.8.1)
+ activesupport (= 7.0.8.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
raindrops (0.20.0)
- rake (13.0.6)
+ rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
@@ -458,9 +467,9 @@ GEM
declarative-option (< 0.2.0)
uber (< 0.2.0)
require_all (3.0.0)
- responders (3.0.1)
- actionpack (>= 5.0)
- railties (>= 5.0)
+ responders (3.1.1)
+ actionpack (>= 5.2)
+ railties (>= 5.2)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
@@ -540,10 +549,10 @@ GEM
test_xml (0.1.8)
diffy (~> 3.0)
nokogiri (>= 1.3.2)
- thor (1.2.2)
+ thor (1.3.1)
thread_safe (0.3.6)
tilt (2.0.11)
- timeout (0.4.0)
+ timeout (0.4.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.6)
@@ -590,7 +599,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.6.11)
+ zeitwerk (2.6.13)
zip-zip (0.3)
rubyzip (>= 1.0.0)
@@ -614,13 +623,13 @@ DEPENDENCIES
carrierwave-mongoid
codecov
cqm-models!
- cqm-parsers (~> 4.1.0.2)
+ cqm-parsers!
cqm-reports!
- cqm-validators (~> 4.0.4)
+ cqm-validators (~> 4.0.5)
cucumber-rails
daemons
database_cleaner-mongoid
- delayed_job_mongoid (~> 2.3.0)
+ delayed_job_mongoid (~> 3.0.0)
devise
devise_invitable
factory_bot_rails
@@ -630,7 +639,7 @@ DEPENDENCIES
jbuilder (~> 2.11.0)
jquery-datatables-rails
jquery-rails (~> 4.4.0)
- jquery-ui-rails (~> 6.0.1)
+ jquery-ui-rails!
kaminari-mongoid
launchy
listen
@@ -639,7 +648,7 @@ DEPENDENCIES
minitest-rails
minitest-reporters
mocha
- mongoid (~> 7.5.0)
+ mongoid (~> 8.1.0)
multi_json
mustache
nested_form
diff --git a/app/models/c2_task.rb b/app/models/c2_task.rb
index 0642fbb64..14c7d75dd 100644
--- a/app/models/c2_task.rb
+++ b/app/models/c2_task.rb
@@ -34,7 +34,6 @@ def execute(file, user)
te
end
- # rubocop:disable Metrics/AbcSize
def good_results
# Set the Submission Program to MIPS_INDIV if there is a C3 test and the test is for an ep measure.
cat3_submission_program = if product_test&.product&.c3_test && product_test&.ep_measures?
@@ -44,13 +43,8 @@ def good_results
end
options = { provider: product_test.patients.first.providers.first, submission_program: cat3_submission_program,
start_time: start_date, end_time: end_date, ry2022_submission: product_test.bundle.major_version == '2021' }
- if product_test.bundle.major_version.to_i > 2021
- Qrda3.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
- else
- Qrda3R21.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
- end
+ Qrda3.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
end
- # rubocop:enable Metrics/AbcSize
def last_updated_with_sibling
sibling = product_test.tasks.c3_cat3_task
diff --git a/app/models/cat3_filter_task.rb b/app/models/cat3_filter_task.rb
index 5d40c98ca..54f4e4267 100644
--- a/app/models/cat3_filter_task.rb
+++ b/app/models/cat3_filter_task.rb
@@ -18,7 +18,6 @@ def execute(file, user)
te
end
- # rubocop:disable Metrics/AbcSize
def good_results
# Set the Submission Program to MIPS_INDIV if there is a C3 test and the test is for an ep measure.
cat3_submission_program = if product_test&.product&.c3_test
@@ -28,11 +27,6 @@ def good_results
end
options = { provider: product_test.patients.first.providers.first, submission_program: cat3_submission_program,
start_time: start_date, end_time: end_date, ry2022_submission: product_test.bundle.major_version == '2021' }
- if product_test.bundle.major_version.to_i > 2021
- Qrda3.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
- else
- Qrda3R21.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
- end
+ Qrda3.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
end
- # rubocop:enable Metrics/AbcSize
end
diff --git a/app/models/multi_measure_cat3_task.rb b/app/models/multi_measure_cat3_task.rb
index f1119c0de..ce57b94b1 100644
--- a/app/models/multi_measure_cat3_task.rb
+++ b/app/models/multi_measure_cat3_task.rb
@@ -21,10 +21,6 @@ def good_results
# Set the Submission Program to MIPS_INDIV
options = { provider: product_test.patients.first.providers.first, submission_program: 'MIPS_INDIV',
start_time: start_date, end_time: end_date, ry2022_submission: product_test.bundle.major_version == '2021' }
- if product_test.bundle.major_version.to_i > 2021
- Qrda3.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
- else
- Qrda3R21.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
- end
+ Qrda3.new(product_test.expected_results_with_all_supplemental_codes, product_test.measures, options).render
end
end
diff --git a/app/models/test_execution.rb b/app/models/test_execution.rb
index 77b8f0939..14e29215b 100644
--- a/app/models/test_execution.rb
+++ b/app/models/test_execution.rb
@@ -18,10 +18,16 @@ class TestExecution
field :sibling_execution_id, type: String
embeds_many :execution_errors
- has_one :artifact, autosave: true, dependent: :destroy
+ has_one :artifact, dependent: :destroy
belongs_to :user
belongs_to :task, touch: true
+ before_save :verify_artifact
+
+ def verify_artifact
+ artifact&.save
+ end
+
def build_document(file)
doc = Nokogiri::XML(file)
doc.root.add_namespace_definition('cda', 'urn:hl7-org:v3')
diff --git a/config/application.rb b/config/application.rb
index 2cc3e7e2e..011ef225c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,7 +29,7 @@
module Cypress
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 5.2
+ config.load_defaults 7.0
# Configuration for the application, engines, and railties goes here.
#
diff --git a/config/cypress.yml b/config/cypress.yml
index 615852879..93227f2f3 100644
--- a/config/cypress.yml
+++ b/config/cypress.yml
@@ -21,37 +21,16 @@ default_warning_message: 'This warning banner provides privacy and security noti
# In the case of none of them being valid it will default to the first one
# modified_population_labels are used to indicate when the population code required by the qrda version differs from the population code in QME
version_config:
- '~>2020.0':
- start_date_offset: 2
- modified_population_labels:
- IPP: 'IPOP'
- schematron: "2020.0.0"
- qrda_version: "r5_2"
- qrda_version_display_name: "STU 5.2"
- qrda3_version: "r2_1"
- qrda3_version_display_name: "STU 2.1"
- mapped_codes:
- default_negation_codes:
- 2.16.840.1.113883.3.526.3.1184:
- code: "854901"
- codeSystem: "2.16.840.1.113883.6.88"
- 2.16.840.1.113883.3.526.3.1174:
- code: "854901"
- codeSystem: "2.16.840.1.113883.6.88"
- CMSQRDA3SchematronValidator_warnings:
- CMSQRDA1HQRSchematronValidator_warnings:
- '~>2021.0':
+ '~>2022.0':
start_date_offset: 2
modified_population_labels:
IPP: 'IPOP'
- schematron: "2021.0.0"
- qrda_version: "r5_2"
- qrda_version_display_name: "STU 5.2"
+ schematron: "2022.0.0"
+ qrda_version: "r5_3"
+ qrda_version_display_name: "STU 5.3"
qrda3_version: "r2_1"
- qrda3_version_display_name: "STU 2.1"
- # mapped_codes pattern {Code in eCQM spec}:{Alternative code that maps to code in spec}
+ qrda3_version_display_name: "R1"
mapped_codes:
- "258232002": "254292007"
default_negation_codes:
2.16.840.1.113883.3.526.3.1184:
code: "854901"
@@ -61,11 +40,11 @@ version_config:
codeSystem: "2.16.840.1.113883.6.88"
CMSQRDA3SchematronValidator_warnings:
CMSQRDA1HQRSchematronValidator_warnings:
- '~>2022.0':
+ '~>2023.0':
start_date_offset: 2
modified_population_labels:
IPP: 'IPOP'
- schematron: "2022.0.0"
+ schematron: "2023.0.0"
qrda_version: "r5_3"
qrda_version_display_name: "STU 5.3"
qrda3_version: "r2_1"
@@ -80,7 +59,7 @@ version_config:
codeSystem: "2.16.840.1.113883.6.88"
CMSQRDA3SchematronValidator_warnings:
CMSQRDA1HQRSchematronValidator_warnings:
- '~>2023.0':
+ '~>2024.0':
start_date_offset: 2
modified_population_labels:
IPP: 'IPOP'
diff --git a/config/initializers/cqm_execution_service.rb b/config/initializers/cqm_execution_service.rb
index f3b8b70e9..af1344b65 100644
--- a/config/initializers/cqm_execution_service.rb
+++ b/config/initializers/cqm_execution_service.rb
@@ -1,4 +1,2 @@
-Rails.application.config.ces_55_host = ENV['CQM_EXECUTION55_SERVICE_HOST'] || 'localhost'
-Rails.application.config.ces_55_port = ENV['CQM_EXECUTION55_SERVICE_PORT'] || '8081'
Rails.application.config.ces_56_host = ENV['CQM_EXECUTION_SERVICE_HOST'] || 'localhost'
Rails.application.config.ces_56_port = ENV['CQM_EXECUTION_SERVICE_PORT'] || '8082'
diff --git a/features/admin/show.feature b/features/admin/show.feature
index b78bb5f57..e084c2384 100644
--- a/features/admin/show.feature
+++ b/features/admin/show.feature
@@ -39,8 +39,8 @@ Scenario: User is not an admin
Scenario: User can view bundles to download
And the user navigates to the bundle_downloads page
- Then the user should see text bundle-2020
- Then the user should see text bundle-2021
+ Then the user should see text bundle-2022
+ Then the user should see text bundle-2023
# Why are you crashing the demoserver
# Scenario: User can not download bundle without NLM account
diff --git a/features/step_definitions/measure_test.rb b/features/step_definitions/measure_test.rb
index 91a7029ab..b22a3fbaf 100644
--- a/features/step_definitions/measure_test.rb
+++ b/features/step_definitions/measure_test.rb
@@ -210,7 +210,7 @@
end
Then(/^the user should see a link to view the the uploaded xml$/) do
- page.find(:xpath, "//input[@value='View Uploaded XML with Errors']")
+ page.find(:xpath, "//button[text()='View Uploaded XML with Errors']")
end
Then(/^the user should see the uploaded xml$/) do
diff --git a/lib/cypress/api_measure_evaluator.rb b/lib/cypress/api_measure_evaluator.rb
index d4293e3d1..0ec221fd9 100644
--- a/lib/cypress/api_measure_evaluator.rb
+++ b/lib/cypress/api_measure_evaluator.rb
@@ -457,7 +457,6 @@ def parsed_api_object(unparsed_string)
JSON.parse(unparsed_string)
end
- # rubocop:disable Metrics/AbcSize
def calcuate_cat3(product_test_id, bundle_id)
pt = ProductTest.find(product_test_id)
patient_ids = []
@@ -479,13 +478,12 @@ def calcuate_cat3(product_test_id, bundle_id)
end
options = { provider: pt.patients.first.providers.first, submission_program: cat3_submission_program,
start_time: pt.start_date, end_time: pt.end_date, ry2022_submission: pt.bundle.major_version == '2021' }
- xml = pt.bundle.major_version.to_i > 2021 ? Qrda3.new(results, pt.measures, options).render : Qrda3R21.new(results, pt.measures, options).render
+ xml = Qrda3.new(results, pt.measures, options).render
Patient.find(patient_ids).each(&:destroy)
File.write("tmp/#{product_test_id}.xml", xml)
end
- # rubocop:enable Metrics/AbcSize
def do_calculation(product_test, patients, correlation_id)
measures = product_test.measures
diff --git a/lib/cypress/cql_bundle_importer.rb b/lib/cypress/cql_bundle_importer.rb
index ffa049974..1d396b681 100644
--- a/lib/cypress/cql_bundle_importer.rb
+++ b/lib/cypress/cql_bundle_importer.rb
@@ -104,28 +104,37 @@ def self.unpack_bundle(zip)
Bundle.new(JSON.parse(zip.read(SOURCE_ROOTS[:bundle]), max_nesting: 100).except('measures', 'patients'))
end
+ # rubocop:disable Metrics/MethodLength
def self.unpack_and_store_valuesets(zip, bundle)
current_row = nil
previous_row = nil
codes = []
+ concept_hash = {}
csv = CSV.parse(zip.read(SOURCE_ROOTS[:valuesets]), headers: true, col_sep: '|')
csv.each do |row|
current_row = row
previous_row = row if previous_row.nil?
if row['OID'] != previous_row['OID']
- CQM::ValueSet.new(oid: previous_row['OID'], display_name: previous_row['ValueSetName'], version: previous_row['ExpansionVersion'],
- concepts: codes, bundle:).save
+ vs = CQM::ValueSet.new(oid: previous_row['OID'], display_name: previous_row['ValueSetName'], version: previous_row['ExpansionVersion'],
+ bundle:)
+ concept_hash[previous_row['OID']] = { codes:, vs: }
previous_row = row
codes = []
end
- codes << CQM::Concept.new(code: row['Code'], code_system_oid: row['CodeSystemOID'], code_system_name: row['CodeSystemName'],
- code_system_version: row['CodeSystemVersion'],
- display_name: row['Descriptor'].encode('utf-8', invalid: :replace, undef: :replace))
+ codes << { code: row['Code'], code_system_oid: row['CodeSystemOID'], code_system_name: row['CodeSystemName'],
+ code_system_version: row['CodeSystemVersion'],
+ display_name: row['Descriptor'].encode('utf-8', invalid: :replace, undef: :replace) }
+ end
+ vs = CQM::ValueSet.new(oid: current_row['OID'], display_name: current_row['ValueSetName'], version: current_row['ExpansionVersion'],
+ bundle:)
+ concept_hash[current_row['OID']] = { codes:, vs: }
+ concept_hash.sort_by { |_k, v| v[:codes].size }.each do |_key, hash_value|
+ hash_value[:vs].concepts = hash_value[:codes]
+ hash_value[:vs].save
end
- CQM::ValueSet.new(oid: current_row['OID'], display_name: current_row['ValueSetName'], version: current_row['ExpansionVersion'],
- concepts: codes, bundle:).save
puts "\rLoading: Value Sets Complete "
end
+ # rubocop:enable Metrics/MethodLength
def self.unpack_and_store_measures(zip, bundle)
measure_info = JSON.parse(zip.read(SOURCE_ROOTS[:measures_info]))
diff --git a/lib/cypress/cqm_execution_calc.rb b/lib/cypress/cqm_execution_calc.rb
index b6880d46a..b1ffaaeb7 100644
--- a/lib/cypress/cqm_execution_calc.rb
+++ b/lib/cypress/cqm_execution_calc.rb
@@ -9,8 +9,7 @@ class CQMExecutionCalc
def initialize(patients, measures, correlation_id, options)
@patients = patients
- is_qdm55 = Bundle.only(:version).find(measures.first.bundle_id).major_version.to_i < 2022
- @connection_string = is_qdm55 ? self.class.create_55_connection_string : self.class.create_56_connection_string
+ @connection_string = self.class.create_56_connection_string
# This is a key -> value pair of patients mapped in the form "qdm-patient-id" => BSON::ObjectId("cqm-patient-id")
@cqm_patient_mapping = patients.to_h { |patient| [patient.id.to_s, patient.cqmPatient] }
@measures = measures
@@ -50,11 +49,6 @@ def request_for(measure, save: true)
patient_result_hash.values
end
- def self.create_55_connection_string
- config = Rails.application.config
- "http://#{config.ces_55_host}:#{config.ces_55_port}/calculate"
- end
-
def self.create_56_connection_string
config = Rails.application.config
"http://#{config.ces_56_host}:#{config.ces_56_port}/calculate"
diff --git a/lib/cypress/patient_zipper.rb b/lib/cypress/patient_zipper.rb
index 44aaf2151..39e868533 100644
--- a/lib/cypress/patient_zipper.rb
+++ b/lib/cypress/patient_zipper.rb
@@ -35,7 +35,6 @@ def initialize(measures, start_time, end_time)
@end_time = end_time
end
- # rubocop:disable Metrics/PerceivedComplexity
def export(patient)
cat1_program = if (patient.product_test&.product&.c3_test || patient.product_test&.product&.cvuplus) && patient.product_test&.eh_measures?
patient.product_test&.submission_program
@@ -49,13 +48,8 @@ def export(patient)
medicare_beneficiary_identifier: patient.medicare_beneficiary_identifier,
submission_program: cat1_program,
start_time:, end_time: }
- if patient.bundle.major_version.to_i > 2021
- Qrda1R5.new(patient, measures, options).render
- else
- Qrda1R52.new(patient, measures, options).render
- end
+ Qrda1R5.new(patient, measures, options).render
end
- # rubocop:enable Metrics/PerceivedComplexity
end
class PatientZipper
diff --git a/lib/tasks/cypress.rake b/lib/tasks/cypress.rake
index 034e73750..0b419d496 100644
--- a/lib/tasks/cypress.rake
+++ b/lib/tasks/cypress.rake
@@ -74,11 +74,7 @@ namespace :cypress do
# pull out codes by exporting and re-importing
if p.code_description_hash.empty?
@options = { start_time: Date.new(2012, 1, 1), end_time: Date.new(2012, 12, 31) }
- patient_xml = if p.bundle.major_version.to_i > 2021
- Qrda1R5.new(p, Measure.where(hqmf_id: Measure.first.hqmf_id), @options).render
- else
- Qrda1R52.new(p, Measure.where(hqmf_id: Measure.first.hqmf_id), @options).render
- end
+ patient_xml = Qrda1R5.new(p, Measure.where(hqmf_id: Measure.first.hqmf_id), @options).render
doc = Nokogiri::XML::Document.parse(patient_xml)
doc.root.add_namespace_definition('cda', 'urn:hl7-org:v3')
doc.root.add_namespace_definition('sdtc', 'urn:hl7-org:sdtc')
diff --git a/lib/validators/qrda_cat1_validator.rb b/lib/validators/qrda_cat1_validator.rb
index 84607f3ad..db693dc34 100644
--- a/lib/validators/qrda_cat1_validator.rb
+++ b/lib/validators/qrda_cat1_validator.rb
@@ -10,7 +10,7 @@ class QrdaCat1Validator < QrdaFileValidator
def initialize(bundle, is_c3_validation_task, test_has_c3, test_has_c1, measures = [])
@test_has_c3 = test_has_c3
@measures = measures
- qrda_validator = bundle.major_version.to_i > 2021 ? Cat1R53.instance : Cat1R52.instance
+ qrda_validator = Cat1R53.instance
format_validators = [CDA.instance, qrda_validator]
@validators = if is_c3_validation_task
[CqmValidators::DataValidator.new(measures.collect(&:_id))]
diff --git a/lib/validators/qrda_cat3_validator.rb b/lib/validators/qrda_cat3_validator.rb
index d3046a45d..c56ae6c35 100644
--- a/lib/validators/qrda_cat3_validator.rb
+++ b/lib/validators/qrda_cat3_validator.rb
@@ -13,7 +13,6 @@ def initialize(expected_results, is_c3_validation_task, test_has_c3, test_has_c2
@expected_results = expected_results
end
- # rubocop:disable Metrics/MethodLength
def validate(file, options = {})
@doc = get_document(file)
@options = options
@@ -31,19 +30,12 @@ def validate(file, options = {})
add_cqm_validation_error_as_execution_error(Cat3Measure.instance.validate(@doc, file_name: @options[:file_name]),
'CqmValidators::Cat3Measure',
:xml_validation)
- if @bundle.major_version.to_i > 2021
- add_cqm_validation_error_as_execution_error(Cat3R1.instance.validate(@doc, file_name: @options[:file_name]),
- 'CqmValidators::Cat3R1',
- :xml_validation)
- else
- add_cqm_validation_error_as_execution_error(Cat3R21.instance.validate(@doc, file_name: @options[:file_name]),
- 'CqmValidators::Cat3R21',
- :xml_validation)
- end
+ add_cqm_validation_error_as_execution_error(Cat3R1.instance.validate(@doc, file_name: @options[:file_name]),
+ 'CqmValidators::Cat3R1',
+ :xml_validation)
add_cqm_validation_error_as_execution_error(CDA.instance.validate(@doc, file_name: @options[:file_name]),
'CqmValidators::CDA',
:xml_validation)
end
- # rubocop:enable Metrics/MethodLength
end
end
diff --git a/test/controllers/admin/bundles_controller_test.rb b/test/controllers/admin/bundles_controller_test.rb
index 0b14a7877..b4a5b7eb2 100644
--- a/test/controllers/admin/bundles_controller_test.rb
+++ b/test/controllers/admin/bundles_controller_test.rb
@@ -45,7 +45,7 @@ class BundlesControllerTest < ActionController::TestCase
orig_patient_count = Patient.count
# Default Code Systems will be empty prior to loading bundle
assert Settings.current.default_code_systems.empty?
- upload = Rack::Test::UploadedFile.new(Rails.root.join('test', 'fixtures', 'bundles', 'minimal_bundle_qdm_5_5.zip'), 'application/zip')
+ upload = Rack::Test::UploadedFile.new(Rails.root.join('test', 'fixtures', 'bundles', 'minimal_bundle_qdm_5_6.zip'), 'application/zip')
perform_enqueued_jobs do
post :create, params: { file: upload }
end
@@ -66,7 +66,7 @@ class BundlesControllerTest < ActionController::TestCase
@vendor.preferred_code_systems['encounter'] = ['2.16.840.1.113883.6.12']
@vendor.save
assert_equal 1, Settings.current.default_code_systems['encounter'].size
- upload = Rack::Test::UploadedFile.new(Rails.root.join('test', 'fixtures', 'bundles', 'minimal_bundle_qdm_5_5.zip'), 'application/zip')
+ upload = Rack::Test::UploadedFile.new(Rails.root.join('test', 'fixtures', 'bundles', 'minimal_bundle_qdm_5_6.zip'), 'application/zip')
perform_enqueued_jobs do
post :create, params: { file: upload }
end
@@ -83,7 +83,7 @@ class BundlesControllerTest < ActionController::TestCase
test 'should deny access to import for non admin users ' do
for_each_logged_in_user([USER, OWNER, VENDOR]) do
- upload = Rack::Test::UploadedFile.new(Rails.root.join('test', 'fixtures', 'bundles', 'minimal_bundle_qdm_5_5.zip'), 'application/zip')
+ upload = Rack::Test::UploadedFile.new(Rails.root.join('test', 'fixtures', 'bundles', 'minimal_bundle_qdm_5_6.zip'), 'application/zip')
post :create, params: { file: upload }
assert_response 401
end
diff --git a/test/controllers/qrda_uploads_controller_test.rb b/test/controllers/qrda_uploads_controller_test.rb
index fdde386ac..f1a5d563d 100644
--- a/test/controllers/qrda_uploads_controller_test.rb
+++ b/test/controllers/qrda_uploads_controller_test.rb
@@ -41,7 +41,7 @@ class QrdaUploadsControllerTest < ActionController::TestCase
possible_qrda_uploaders.each do |qrda_uploader|
path_values = qrda_uploader['path'].split('/')
- filename = Rails.root.join('test', 'fixtures', 'qrda', 'cat_I', 'ep_qrda_test_wrong_templates.zip')
+ filename = Rails.root.join('test', 'fixtures', 'qrda', 'cat_I', 'sample_patient_bad_schema.zip')
zip_with_errors = fixture_file_upload(filename, 'application/zip')
post :create, params: { format: :json, file: zip_with_errors, year: path_values[2], qrda_type: path_values[3], organization: path_values[4] }
assert_response 201, 'response should be Created on test_execution creation'
@@ -55,7 +55,7 @@ class QrdaUploadsControllerTest < ActionController::TestCase
test 'should return a 404 for a validation that does not exist' do
for_each_logged_in_user([USER]) do
- filename = Rails.root.join('test', 'fixtures', 'qrda', 'cat_I', 'ep_qrda_test_wrong_templates.zip')
+ filename = Rails.root.join('test', 'fixtures', 'qrda', 'cat_I', 'sample_patient_bad_schema.zip')
zip_with_errors = fixture_file_upload(filename, 'application/zip')
post :create, params: { format: :json, file: zip_with_errors, year: '2222', qrda_type: 'qrdaI', organization: 'cms' }
assert_response 404, 'Not Found for validator that does not exist'
@@ -86,7 +86,7 @@ class QrdaUploadsControllerTest < ActionController::TestCase
possible_qrda_uploaders.each do |qrda_uploader|
path_values = qrda_uploader['path'].split('/')
- filename = Rails.root.join('test', 'fixtures', 'qrda', 'cat_I', 'ep_qrda_test_wrong_templates.zip')
+ filename = Rails.root.join('test', 'fixtures', 'qrda', 'cat_I', 'sample_patient_bad_schema.zip')
zip_with_errors = fixture_file_upload(filename, 'application/zip')
post :create, params: { format: :xml, file: zip_with_errors, year: path_values[2], qrda_type: path_values[3], organization: path_values[4] }
assert_response 201, 'response should be Created on test_execution creation'
diff --git a/test/fixtures/bundles/minimal_bundle_qdm_5_6.zip b/test/fixtures/bundles/minimal_bundle_qdm_5_6.zip
new file mode 100644
index 000000000..decc32f15
Binary files /dev/null and b/test/fixtures/bundles/minimal_bundle_qdm_5_6.zip differ
diff --git a/test/fixtures/bundles/minimal_bundle_qdm_5_6_with_calcs.zip b/test/fixtures/bundles/minimal_bundle_qdm_5_6_with_calcs.zip
new file mode 100644
index 000000000..3a34753ce
Binary files /dev/null and b/test/fixtures/bundles/minimal_bundle_qdm_5_6_with_calcs.zip differ
diff --git a/test/fixtures/qrda/cat_I/c1_checklist_correct_codes.zip b/test/fixtures/qrda/cat_I/c1_checklist_correct_codes.zip
index 03bca94ad..5cdf4d951 100644
Binary files a/test/fixtures/qrda/cat_I/c1_checklist_correct_codes.zip and b/test/fixtures/qrda/cat_I/c1_checklist_correct_codes.zip differ
diff --git a/test/fixtures/qrda/cat_I/c1_checklist_correct_codes_bad_form.zip b/test/fixtures/qrda/cat_I/c1_checklist_correct_codes_bad_form.zip
index 7d234c261..0beccd80e 100644
Binary files a/test/fixtures/qrda/cat_I/c1_checklist_correct_codes_bad_form.zip and b/test/fixtures/qrda/cat_I/c1_checklist_correct_codes_bad_form.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation.zip b/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation.zip
index d0631ce40..959a137a3 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation.zip and b/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation_aug.zip b/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation_aug.zip
index 5499bb83f..4aa7a12d2 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation_aug.zip and b/test/fixtures/qrda/cat_I/ep_qrda_bad_calculation_aug.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_future_encounter.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_future_encounter.zip
index 375679d40..4cc6a2f59 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_future_encounter.zip and b/test/fixtures/qrda/cat_I/ep_qrda_test_future_encounter.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_good.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_good.zip
index 5a70b318f..fb74ed269 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_good.zip and b/test/fixtures/qrda/cat_I/ep_qrda_test_good.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_good_aug.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_good_aug.zip
index 1c98885d7..a6b766504 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_good_aug.zip and b/test/fixtures/qrda/cat_I/ep_qrda_test_good_aug.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_good_quarter.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_good_quarter.zip
index cadaf8d31..65013a2d8 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_good_quarter.zip and b/test/fixtures/qrda/cat_I/ep_qrda_test_good_quarter.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_good_shift.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_good_shift.zip
index 2aa3b9276..0d3df8681 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_good_shift.zip and b/test/fixtures/qrda/cat_I/ep_qrda_test_good_shift.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_too_many_files.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_too_many_files.zip
index 177bbb65b..7dbb3506d 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_too_many_files.zip and b/test/fixtures/qrda/cat_I/ep_qrda_test_too_many_files.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_wrong_ecqm.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_wrong_ecqm.zip
index 48101ba21..387ca76ff 100644
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_wrong_ecqm.zip and b/test/fixtures/qrda/cat_I/ep_qrda_test_wrong_ecqm.zip differ
diff --git a/test/fixtures/qrda/cat_I/ep_qrda_test_wrong_templates.zip b/test/fixtures/qrda/cat_I/ep_qrda_test_wrong_templates.zip
deleted file mode 100644
index 5a1020060..000000000
Binary files a/test/fixtures/qrda/cat_I/ep_qrda_test_wrong_templates.zip and /dev/null differ
diff --git a/test/fixtures/qrda/cat_I/good_cat1_single_encounter.xml b/test/fixtures/qrda/cat_I/good_cat1_single_encounter.xml
index bd5dba0fd..be461d640 100644
--- a/test/fixtures/qrda/cat_I/good_cat1_single_encounter.xml
+++ b/test/fixtures/qrda/cat_I/good_cat1_single_encounter.xml
@@ -8,9 +8,9 @@
-
+
-
+
@@ -250,22 +250,17 @@
-
-
+
+
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -269,8 +263,6 @@
-
-
diff --git a/test/fixtures/qrda/cat_I/sample_patient_bad_schema.zip b/test/fixtures/qrda/cat_I/sample_patient_bad_schema.zip
new file mode 100644
index 000000000..cb4ed34c0
Binary files /dev/null and b/test/fixtures/qrda/cat_I/sample_patient_bad_schema.zip differ
diff --git a/test/fixtures/qrda/cat_I/sample_patient_error_in_encounter.xml b/test/fixtures/qrda/cat_I/sample_patient_error_in_encounter.xml
index d02c4ffc9..51d2388ba 100644
--- a/test/fixtures/qrda/cat_I/sample_patient_error_in_encounter.xml
+++ b/test/fixtures/qrda/cat_I/sample_patient_error_in_encounter.xml
@@ -9,9 +9,9 @@
-
+
-
+
@@ -244,23 +244,17 @@
-
-
+
+
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -274,8 +268,6 @@
-
-
diff --git a/test/fixtures/qrda/cat_I/sample_patient_good.xml b/test/fixtures/qrda/cat_I/sample_patient_good.xml
index e89fcbae8..76779e797 100644
--- a/test/fixtures/qrda/cat_I/sample_patient_good.xml
+++ b/test/fixtures/qrda/cat_I/sample_patient_good.xml
@@ -9,9 +9,9 @@
-
+
-
+
@@ -244,23 +244,17 @@
-
-
+
+
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -274,8 +268,6 @@
-
-
diff --git a/test/fixtures/qrda/cat_I/sample_patient_good_quarter.xml b/test/fixtures/qrda/cat_I/sample_patient_good_quarter.xml
index 85a182053..8010978c5 100644
--- a/test/fixtures/qrda/cat_I/sample_patient_good_quarter.xml
+++ b/test/fixtures/qrda/cat_I/sample_patient_good_quarter.xml
@@ -9,9 +9,9 @@
-
+
-
+
@@ -244,23 +244,17 @@
-
-
+
+
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -274,8 +268,6 @@
-
-
diff --git a/test/fixtures/qrda/cat_I/sample_patient_good_telehealth.xml b/test/fixtures/qrda/cat_I/sample_patient_good_telehealth.xml
index d02d5640d..8c54214e3 100644
--- a/test/fixtures/qrda/cat_I/sample_patient_good_telehealth.xml
+++ b/test/fixtures/qrda/cat_I/sample_patient_good_telehealth.xml
@@ -9,9 +9,9 @@
-
+
-
+
@@ -244,23 +244,17 @@
-
-
+
+
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -277,8 +271,6 @@
-
-
diff --git a/test/fixtures/qrda/cat_I/sample_patient_single_code.xml b/test/fixtures/qrda/cat_I/sample_patient_single_code.xml
index a496732f1..55d218006 100644
--- a/test/fixtures/qrda/cat_I/sample_patient_single_code.xml
+++ b/test/fixtures/qrda/cat_I/sample_patient_single_code.xml
@@ -9,9 +9,9 @@
-
+
-
+
@@ -244,8 +244,8 @@
-
-
+
+
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -323,8 +317,6 @@
-
-
diff --git a/test/fixtures/qrda/cat_I/sample_patient_too_much_data.xml b/test/fixtures/qrda/cat_I/sample_patient_too_much_data.xml
index 558637342..a8b104395 100644
--- a/test/fixtures/qrda/cat_I/sample_patient_too_much_data.xml
+++ b/test/fixtures/qrda/cat_I/sample_patient_too_much_data.xml
@@ -9,9 +9,9 @@
-
+
-
+
@@ -239,23 +239,17 @@
-
-
+
+
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -269,21 +263,13 @@
-
-
-
-
-
-
-
Encounter, Performed: Office Visit (Code List: 2.16.840.1.113883.3.464.1003.101.12.1001)
@@ -297,8 +283,6 @@
-
-
diff --git a/test/fixtures/qrda/cat_III/cms_test_qrda_cat3.xml b/test/fixtures/qrda/cat_III/cms_test_qrda_cat3.xml
index 6c25d1966..57c4bc911 100644
--- a/test/fixtures/qrda/cat_III/cms_test_qrda_cat3.xml
+++ b/test/fixtures/qrda/cat_III/cms_test_qrda_cat3.xml
@@ -8,9 +8,9 @@
-
+
-
+