Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vets-json-schema #16362

Merged
merged 6 commits into from
Apr 18, 2024
Merged

Update vets-json-schema #16362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2a36fc
Update vets-json-schema
TaiWilkin Apr 16, 2024
9374e1a
Merge branch 'master' into pensions-80659-schemaupdate
TaiWilkin Apr 16, 2024
0628f12
Fix test
TaiWilkin Apr 16, 2024
cb79acc
Merge branch 'master' into pensions-80659-schemaupdate
TaiWilkin Apr 17, 2024
20418fd
Merge branch 'master' into pensions-80659-schemaupdate
TaiWilkin Apr 17, 2024
3ef6e3f
Update test to reflect new schema id
TaiWilkin Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ GIT

GIT
remote: https://github.com/department-of-veterans-affairs/vets-json-schema
revision: 0832461353f871b688b0c231ecf9bdbfb1f9145a
revision: 7176cb057f11f66f16889005a1873a084bad188c
branch: master
specs:
vets_json_schema (22.0.3)
vets_json_schema (22.1.1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this right? I see 22.1.0 here: https://github.com/department-of-veterans-affairs/vets-json-schema/pull/878/files#diff-7ae45ad102eab3b6d7e7896acd08c427a9b25b346470d7bc6507b6481575d519

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, because vets-website has gotten updated to 22.1.0 since then (https://github.com/department-of-veterans-affairs/vets-website/blob/0ee8639c13d4da5c4520e70c2e79bb75236407c5/yarn.lock#L20599), so it seemed best to keep them in sync

multi_json (~> 1.0)
script_utils (= 0.0.4)

Expand Down
4 changes: 2 additions & 2 deletions modules/mobile/spec/request/pre_burial_need_request_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@
[{ 'title' => 'Validation error',
'detail' => "The property '#/application/veteran/militaryStatus' of " \
'type null did not match the following type: string in ' \
'schema 47e1937d-acd7-50a1-9cc6-fab567bd62cb',
'schema 72d7bc55-042d-5bfd-8001-2b7c815c8e06',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schema id for form 40-10007 was updated by 15bda2f, due to the update to the common state enum for Canadian provinces.

'code' => '109',
'status' => '422' },
{ 'title' => 'Validation error',
'detail' => "The property '#/application/veteran/militaryStatus' " \
'value nil did not match one of the following values: A' \
', I, D, S, R, E, O, V, X in schema ' \
'47e1937d-acd7-50a1-9cc6-fab567bd62cb',
'72d7bc55-042d-5bfd-8001-2b7c815c8e06',
'code' => '109',
'status' => '422' }] })
end
Expand Down
4 changes: 2 additions & 2 deletions spec/fixtures/pdf_fill/21P-527EZ/merge_fields.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@
"stepchild": "Off"
},
"previouslyMarried": 1,
"disabled": "Off",
"married": true,
"fullName": {
"first": "Emily",
Expand All @@ -258,7 +259,6 @@
"fullNameOverflow": "Emily Anne Doe",
"childDateOfBirthOverflow": "03-03-2000",
"childSocialSecurityNumberOverflow": "333224444",
"disabled": "Off",
"attendingCollege": "Off",
"childNotInHousehold": 1,
"childStatusOverflow": "Biological, previously married, does not live with you but contributes",
Expand All @@ -278,6 +278,7 @@
"stepchild": "Off"
},
"previouslyMarried": "Off",
"disabled": "Off",
"attendingCollege": 1,
"fullName": {
"first": "Bobby",
Expand All @@ -292,7 +293,6 @@
"fullNameOverflow": "Bobby Nolan Doe",
"childDateOfBirthOverflow": "09-22-2005",
"childSocialSecurityNumberOverflow": "333224444",
"disabled": "Off",
"childNotInHousehold": "Off",
"childStatusOverflow": "Adopted, 18-23 years old (in school)",
"monthlyPayment": {},
Expand Down
Loading