Skip to content
This repository was archived by the owner on Nov 24, 2022. It is now read-only.

Remove format from allowed attributes in schemas #374

Merged
merged 4 commits into from
Aug 17, 2016

Conversation

tijmenb
Copy link
Contributor

@tijmenb tijmenb commented Aug 16, 2016

Currently we allow two types of schemas: one with format and one with document_type and schema_name. We've done the work to remove usage of format so we can disable the format schema.

This doesn't completely remove the oneOf clause from the schemas because that is more involved (the tests rely heavily on this behaviour). This is the minimum we can do now to disallow format in publisher schemas. Follow up will remove the oneOf thing.

Part of https://trello.com/c/mHIbkMDs

These are the attributes to use now format is deprecated.
Currently we allow two types of schemas: one with `format` and one with
`document_type` and `schema_name`. We've done the work to remove usage
of `format` so we can disable the first format.

This doesn't completely remove the `oneOf` clause from the schemas
because that is more involved (the tests rely heavily on this
behaviour). This is the minimum we can do now to disallow `format` in
publisher schemas. Follow up will remove the `oneOf` thing.
The `format` schema got removed. This updates the tests.
@tijmenb tijmenb force-pushed the remove-format-from-oneof branch from c7be56a to ec01982 Compare August 16, 2016 16:19
@boffbowsh boffbowsh merged commit d17f2f1 into master Aug 17, 2016
@boffbowsh boffbowsh deleted the remove-format-from-oneof branch August 17, 2016 07:51
ikennaokpala added a commit to alphagov/smart-answers that referenced this pull request Aug 17, 2016
Sequel to this PR (alphagov/govuk-content-schemas#374).
I have made changes to the smart-answers FlowContentItem test. Updating it to conform
to the recently updated son schema.

Basically replacing format with schema name and introduction  document_type.

After this change. I have run the existing smart answer tests (regression, unit and flow) and all passed.

No changes were recorded to the regression tests artefacts.
ikennaokpala added a commit to alphagov/smart-answers that referenced this pull request Aug 17, 2016
Sequel to this PR (alphagov/govuk-content-schemas#374).
I have made changes to the smart-answers FlowContentItem test.
Updating it to conform to the recently updated JSON schema.

Basically replacing format with schema name and introduction  document_type.

After this change. I have run the existing smart answer tests (regression, unit and flow) and all passed.

No changes were recorded to the regression tests artefacts.
ikennaokpala added a commit to alphagov/smart-answers that referenced this pull request Aug 17, 2016
Sequel to this PR (alphagov/govuk-content-schemas#374).
I have made changes to the smart-answers FlowContentItem test.
Updating it to conform to the recently updated JSON schema.

Basically replacing format with schema name and introduction  document_type.

After this change. I have run the existing smart answer tests (regression, unit and flow) and all passed.

No changes were recorded to the regression tests artefacts.
leenagupte added a commit to alphagov/calculators that referenced this pull request Aug 17, 2016
The content schemas were modified in PR: alphagov/govuk-content-schemas#374

The content published by the calculators app has to conform to the updated
schema.
andrewgarner added a commit to alphagov/specialist-frontend that referenced this pull request Aug 18, 2016
'format' has been replaced by 'document_type' and 'schema_name'.

See alphagov/govuk-content-schemas#374
@tijmenb tijmenb mentioned this pull request Aug 31, 2016
tijmenb added a commit that referenced this pull request Aug 31, 2016
This is a follow-up to
#374. It removes
the now-unnecessary nesting of the schema in a `oneOf`.
tijmenb added a commit that referenced this pull request Sep 1, 2016
This is a follow-up to
#374. It removes
the now-unnecessary nesting of the schema in a `oneOf`.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants