Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/drupal/migrate_source_cs…
Browse files Browse the repository at this point in the history
…v-3.6.0
  • Loading branch information
edmund-dunn authored Dec 20, 2023
2 parents 5fb8cc8 + 8dd24b1 commit bf7cd95
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3407",
"va-gov/content-build": "^0.0.3408",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "7d0171563d22043d0af8195712a84dba",
"content-hash": "f04196255d00c59b9ff6ae98b9916493",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -25950,16 +25950,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3407",
"version": "v0.0.3408",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "32a22486a842d5b2f73fca475bc81fc67f175d0a"
"reference": "2f7853443043121d5a2cd0ac4dbf510b081f48de"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/32a22486a842d5b2f73fca475bc81fc67f175d0a",
"reference": "32a22486a842d5b2f73fca475bc81fc67f175d0a",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/2f7853443043121d5a2cd0ac4dbf510b081f48de",
"reference": "2f7853443043121d5a2cd0ac4dbf510b081f48de",
"shasum": ""
},
"type": "node-project",
Expand All @@ -25986,9 +25986,9 @@
"description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
"support": {
"issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3407"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3408"
},
"time": "2023-12-13T21:29:35+00:00"
"time": "2023-12-18T18:02:57+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ resourceFields:
enhancer:
id: ''
field_last_saved_by_an_editor:
disabled: true
disabled: false
fieldName: field_last_saved_by_an_editor
publicName: field_last_saved_by_an_editor
enhancer:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ resourceFields:
enhancer:
id: ''
field_last_saved_by_an_editor:
disabled: true
disabled: false
fieldName: field_last_saved_by_an_editor
publicName: field_last_saved_by_an_editor
enhancer:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ resourceFields:
enhancer:
id: ''
field_last_saved_by_an_editor:
disabled: true
disabled: false
fieldName: field_last_saved_by_an_editor
publicName: field_last_saved_by_an_editor
enhancer:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ resourceFields:
enhancer:
id: ''
field_last_saved_by_an_editor:
disabled: true
disabled: false
fieldName: field_last_saved_by_an_editor
publicName: field_last_saved_by_an_editor
enhancer:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ resourceFields:
enhancer:
id: ''
field_last_saved_by_an_editor:
disabled: true
disabled: false
fieldName: field_last_saved_by_an_editor
publicName: field_last_saved_by_an_editor
enhancer:
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/API/JsonApiRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public function routeProvider() {
['/jsonapi/node/event'],
['/jsonapi/node/event_listing'],
['/jsonapi/node/news_story'],
['/jsonapi/node/person_profile'],
['/jsonapi/node/story_listing'],
];
}
Expand Down Expand Up @@ -48,7 +49,6 @@ public function testJsonApiResponseExcludesFields($route) {
'menu_link',
'content_translation_source',
'content_translation_outdate',
'field_last_saved_by_an_editor',
];

$user = $this->createUser();
Expand Down

0 comments on commit bf7cd95

Please sign in to comment.