Merge pull request #670 from usagov/stage

Sprint 57: release to PROD
usagov · Apr 23, 2024 · 7d2d3c9 · 7d2d3c9
2 parents 50e8513 + 684e813
commit 7d2d3c9
Show file tree

Hide file tree

Showing 56 changed files with 7,478 additions and 6,115 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
           command: |
             source ./scripts/pipeline/exports.sh ${CIRCLE_BRANCH}
             source ./scripts/pipeline/cloud-gov-login.sh
-            cf run-task ${project}-drupal-${CIRCLE_BRANCH} --command "ENV=${CIRCLE_BRANCH} scripts/upkeep" --name "${project}-${CIRCLE_BRANCH}-upkeep"  -k "2G" -m 512M
+            cf run-task ${project}-drupal-${CIRCLE_BRANCH} --command "ENV=${CIRCLE_BRANCH} scripts/upkeep" --name "${project}-${CIRCLE_BRANCH}-upkeep"  -k "2G" -m 1024M
   build-theme:
     docker:
       - image: node:20-slim

diff --git a/config/sync/core.entity_form_display.node.state_territory.default.yml b/config/sync/core.entity_form_display.node.state_territory.default.yml
@@ -38,6 +38,7 @@ dependencies:
     - field.field.node.state_territory.field_registration_link
     - field.field.node.state_territory.field_registration_type
     - field.field.node.state_territory.field_state_abbreviation
+    - field.field.node.state_territory.field_updated_date
     - node.type.state_territory
     - workflows.workflow.publishing_content
   module:
@@ -497,6 +498,12 @@ content:
       size: 2
       placeholder: ''
     third_party_settings: {  }
+  field_updated_date:
+    type: datetime_default
+    weight: 26
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 10

diff --git a/config/sync/core.entity_view_display.node.state_territory.default.yml b/config/sync/core.entity_view_display.node.state_territory.default.yml
@@ -38,6 +38,7 @@ dependencies:
     - field.field.node.state_territory.field_registration_link
     - field.field.node.state_territory.field_registration_type
     - field.field.node.state_territory.field_state_abbreviation
+    - field.field.node.state_territory.field_updated_date
     - node.type.state_territory
   module:
     - datetime
@@ -370,6 +371,15 @@ content:
     third_party_settings: {  }
     weight: 5
     region: content
+  field_updated_date:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: medium
+    third_party_settings: {  }
+    weight: 38
+    region: content
   links:
     settings: {  }
     third_party_settings: {  }

diff --git a/config/sync/core.entity_view_display.node.state_territory.full.yml b/config/sync/core.entity_view_display.node.state_territory.full.yml
@@ -39,6 +39,7 @@ dependencies:
     - field.field.node.state_territory.field_registration_link
     - field.field.node.state_territory.field_registration_type
     - field.field.node.state_territory.field_state_abbreviation
+    - field.field.node.state_territory.field_updated_date
     - node.type.state_territory
   module:
     - datetime
@@ -297,6 +298,15 @@ content:
     third_party_settings: {  }
     weight: 19
     region: content
+  field_updated_date:
+    type: datetime_default
+    label: hidden
+    settings:
+      timezone_override: ''
+      format_type: revision_date
+    third_party_settings: {  }
+    weight: 23
+    region: content
 hidden:
   body: true
   field_address_location_inst: true

diff --git a/config/sync/core.entity_view_display.node.state_territory.teaser.yml b/config/sync/core.entity_view_display.node.state_territory.teaser.yml
@@ -39,6 +39,7 @@ dependencies:
     - field.field.node.state_territory.field_registration_link
     - field.field.node.state_territory.field_registration_type
     - field.field.node.state_territory.field_state_abbreviation
+    - field.field.node.state_territory.field_updated_date
     - node.type.state_territory
   module:
     - user
@@ -93,5 +94,6 @@ hidden:
   field_registration_link: true
   field_registration_type: true
   field_state_abbreviation: true
+  field_updated_date: true
   langcode: true
   published_at: true
diff --git a/config/sync/field.field.node.state_territory.field_updated_date.yml b/config/sync/field.field.node.state_territory.field_updated_date.yml
@@ -0,0 +1,21 @@
+uuid: 85b824f2-2203-4a16-8908-96d0a66a7e39
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_updated_date
+    - node.type.state_territory
+  module:
+    - datetime
+id: node.state_territory.field_updated_date
+field_name: field_updated_date
+entity_type: node
+bundle: state_territory
+label: 'Updated Date'
+description: ''
+required: true
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: datetime
diff --git a/config/sync/field.storage.node.field_updated_date.yml b/config/sync/field.storage.node.field_updated_date.yml
@@ -0,0 +1,20 @@
+uuid: 8d4ad090-0bc5-4045-b19d-ff7446a775b8
+langcode: en
+status: true
+dependencies:
+  module:
+    - datetime
+    - node
+id: node.field_updated_date
+field_name: field_updated_date
+entity_type: node
+type: datetime
+settings:
+  datetime_type: date
+module: datetime
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/sync/language.entity.am.yml b/config/sync/language.entity.am.yml
@@ -2,6 +2,7 @@ uuid: e2b1707a-dfa8-41af-b86c-c2d0a2116449
 langcode: am
 status: true
 dependencies: {  }
+third_party_settings: {  }
 id: am
 label: Amharic
 direction: ltr

diff --git a/config/sync/language.entity.hmn.yml b/config/sync/language.entity.hmn.yml
@@ -2,6 +2,7 @@ uuid: 6f595da0-2695-4fe9-8e45-68181f6fed62
 langcode: hmn
 status: true
 dependencies: {  }
+third_party_settings: {  }
 id: hmn
 label: Hmong
 direction: ltr

diff --git a/scripts/upkeep b/scripts/upkeep
@@ -118,10 +118,3 @@ aws s3 sync . s3://${bucket} --delete --no-verify-ssl 2>/dev/null
 aws s3 website s3://${bucket} --index-document index.html --error-document /404/index.html  --no-verify-ssl 2>/dev/null
 echo "Copy to '${bucket_name}'...completed!"
 echo ""
-
-# export objects=($(aws s3 ls s3://${bucket} --recursive --no-verify-ssl 2>/dev/null | awk '{print $(NF)}' | sed -z -e 's/\n/ /g'))
-
-# for object in "${objects[@]}"; do
-#   echo $object
-#   aws s3api put-object-acl --bucket s3://${bucket} --key $object --grant-full-control id=c0eaf99010b9e4b073052b3a9b242980a2badf4e1db4044f53f49950609bf6cf --grant-read uri=http://acs.amazonaws.com/groups/global/AllUsers --no-verify-ssl 2>/dev/null
-# done
diff --git a/testing/cypress/e2e/frontEndTests/email-signup.cy.js b/testing/cypress/e2e/frontEndTests/email-signup.cy.js
@@ -4,9 +4,9 @@ describe('check email sign up function', () => {
   it('check that test is present once typed', () => {
     cy.visit('/')
 
-    cy.get('[data-test="email-signup"]').type('test@test.com')
+    cy.get('[data-test="emailSignup"]').type('test@test.com')
 
-    cy.get('[data-test="email-signup"]').should('have.value', 'test@test.com')
+    cy.get('[data-test="emailSignup"]').should('have.value', 'test@test.com')
 
   })
 })

diff --git a/testing/cypress/e2e/frontEndTests/footer-contact.cy.js b/testing/cypress/e2e/frontEndTests/footer-contact.cy.js
@@ -5,7 +5,7 @@ describe('Check Homepage for Vote.gov', () =>{
   it('Test Footer Contact on Home Page', () => {
     // check that the footer contact section is present on home page
     cy.visit('/')
-    cy.get('[data-test="footer-contact"]').should('be.visible')
+    cy.get('[data-test="footerContact"]').should('be.visible')
   })
 
 })
diff --git a/testing/cypress/e2e/frontEndTests/government-banner.cy.js b/testing/cypress/e2e/frontEndTests/government-banner.cy.js
@@ -7,10 +7,10 @@ describe('check govt banner', () => {
 
   it('verify that drop down works', () => {
     cy.visit('/')
-    cy.get('[data-test="header-logo"]').should('be.visible')
-    cy.get('[data-test="header-button"]').click().get('[data-test="header-banner"]').should('be.visible')
+    cy.get('[data-test="headerLogo"]').should('be.visible')
+    cy.get('[data-test="headerButton"]').click().get('[data-test="headerBanner"]').should('be.visible')
     // check to see if button hides banner as well
-    cy.get('[data-test="header-button"]').click().get('[data-test="header-banner"]').should('not.be.visible')
+    cy.get('[data-test="headerButton"]').click().get('[data-test="headerBanner"]').should('not.be.visible')
   })
 
   it('verify class is present', () =>{

diff --git a/testing/cypress/e2e/frontEndTests/language-selector.cy.js b/testing/cypress/e2e/frontEndTests/language-selector.cy.js
@@ -10,7 +10,7 @@ describe('Test language selector', () => {
     cy.visit({
       url: page.route,
     })
-      cy.get('[data-test="language-button"]').click().get('[data-test="language-switcher"]').should('be.visible').then(selection => {
+      cy.get('[data-test="languageButton"]').click().get('[data-test="languageSwitcher"]').should('be.visible').then(selection => {
         cy.get(selection).get('[ data-test="langItem"]').each(li => {
             cy.get(li).find('a').each(link => {
               cy.request({

diff --git a/testing/cypress/e2e/frontEndTests/menu.cy.js b/testing/cypress/e2e/frontEndTests/menu.cy.js
@@ -21,7 +21,7 @@ describe('Check main menu', () => {
       cy.get(li[1]).click()
       cy.get('[data-test="subMenu"]').should('be.visible')
     })
-    cy.get('[data-test="search-box"]').should('be.visible')
+    cy.get('[data-test="searchBox"]').should('be.visible')
     // close menu
     cy.get('[data-test="closeBtn"]').click()
     cy.get('[data-test="mobileNav"]').should('not.be.visible')

diff --git a/testing/cypress/e2e/frontEndTests/search-bar.cy.js b/testing/cypress/e2e/frontEndTests/search-bar.cy.js
@@ -4,8 +4,8 @@ describe('Check Search Bar Function', () => {
   it('Check Search directs to right page', () => {
     cy.visit('/')
 
-    cy.get('[data-test="search-box"]').type('Kansas')
-    cy.get('[data-test="search-btn"]').click()
+    cy.get('[data-test="searchBox"]').type('Kansas')
+    cy.get('[data-test="searchBtn"]').click()
 
     cy.url().should('contain', 'search.vote.gov')
   })

diff --git a/testing/cypress/e2e/frontEndTests/state-pages.cy.js b/testing/cypress/e2e/frontEndTests/state-pages.cy.js
@@ -5,23 +5,23 @@
 describe('test state pages', () => {
   it('test - online', () => {
     cy.visit('/register/ak')
-    cy.get('[data-test="registration-info"]').should('be.visible').and('contain', 'Online registration deadline:')
+    cy.get('[data-test="registrationInfo"]').should('be.visible').and('contain', 'Online registration deadline:')
   })
 
   it('test - in person', () => {
     cy.visit('/register/as')
-    cy.get('[data-test="registration-info"]').should('be.visible').and('contain', 'In person registration deadline:')
+    cy.get('[data-test="registrationInfo"]').should('be.visible').and('contain', 'In person registration deadline:')
   })
 
   it('test - mail in', () => {
     cy.visit('/register/ar')
-    cy.get('[data-test="registration-info"]').should('be.visible').and('contain', 'Register by mail deadline:')
-    cy.get('[data-test="nvrf-form"]').should('be.visible')
+    cy.get('[data-test="registrationInfo"]').should('be.visible').and('contain', 'Register by mail deadline:')
+    cy.get('[data-test="nvrfForm"]').should('be.visible')
   })
 
   it('test - not needed', () => {
     cy.visit('/register/nd')
-    cy.get('[data-test="registration-info"]').should('not.exist')
+    cy.get('[data-test="registrationInfo"]').should('not.exist')
   })
 
 })
diff --git a/testing/cypress/e2e/frontEndTests/state-registration.cy.js b/testing/cypress/e2e/frontEndTests/state-registration.cy.js
@@ -8,18 +8,18 @@ describe('Validate state selection options', () => {
   it('Verify that type search is working', () => {
     // * Check that 'South' renders expected states
     cy.get('[data-test="stateInput"]').type('South')
-    cy.get('[data-test="state-list"]').should('contain', 'South Carolina', 'South Dakota')
+    cy.get('[data-test="stateList"]').should('contain', 'South Carolina', 'South Dakota')
     cy.reload()
     // * Check that 'Virgin' renders expected states
     cy.get('[data-test="stateInput"]').type('Virgin')
-    cy.get('[data-test="state-list"]').should('contain', 'U.S. Virgin Island', 'Virginia', 'West Virginia')
+    cy.get('[data-test="stateList"]').should('contain', 'U.S. Virgin Island', 'Virginia', 'West Virginia')
     cy.reload()
     // * Check that 'Carolina' renders expected states
     cy.get('[data-test="stateInput"]').type('Carolina')
-    cy.get('[data-test="state-list"]').should('contain', 'South Carolina', 'North Carolina')
+    cy.get('[data-test="stateList"]').should('contain', 'South Carolina', 'North Carolina')
     cy.reload()
     // * Check that 'mar' renders expected states
     cy.get('[data-test="stateInput"]').type('mar')
-    cy.get('[data-test="state-list"]').should('contain', 'Maryland', 'Northern Mariana Islands')
+    cy.get('[data-test="stateList"]').should('contain', 'Maryland', 'Northern Mariana Islands')
   })
 })
diff --git a/testing/cypress/fixtures/homepage-accordion.cy.js b/testing/cypress/fixtures/homepage-accordion.cy.js
@@ -4,8 +4,8 @@ describe('check accordion function', () => {
   it('verify that text is present when clicked', () => {
     cy.visit('/')
 
-    cy.get('[data-test="accordion-button"]').each(accordion => (
-      cy.get(accordion).click().get('[data-test="accordion-content"]').should('be.visible')
+    cy.get('[data-test="accordionButton"]').each(accordion => (
+      cy.get(accordion).click().get('[data-test="accordionContent"]').should('be.visible')
     ))
   })
 })

diff --git a/testing/package-lock.json b/testing/package-lock.json
diff --git a/testing/package.json b/testing/package.json
@@ -4,8 +4,8 @@
   "description": "## Requirements",
   "main": "index.js",
   "devDependencies": {
-    "axe-core": "^4.8.4",
-    "cypress": "^13.6.6",
+    "axe-core": "^4.9.0",
+    "cypress": "^13.7.2",
     "cypress-axe": "^1.5.0",
     "cypress-mochawesome-reporter": "^3.8.2"
   },

diff --git a/web/themes/custom/vote_gov/templates/layout/html.html.twig b/web/themes/custom/vote_gov/templates/layout/html.html.twig
@@ -57,7 +57,7 @@
 {% if not logged_in %}
 <!-- Google Tag Manager (noscript) -->
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-TDRBDKS"
-                  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+                  sandbox height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <!-- End Google Tag Manager (noscript) -->
 {% endif %}
 {#

diff --git a/web/themes/custom/votegov/fonts/navajo-font/stylesheet.css b/web/themes/custom/votegov/fonts/navajo-font/stylesheet.css
@@ -47,7 +47,7 @@
 *.usa-prose>h3,
 *.usa-prose>h4,
 *.usa-prose>h5,
-*.usa-select[data-test="state-selection"],
+*.usa-select[data-test="stateSelection"],
 *[type="button"] {
   font-family: 'times_new_roman_navajoregular';
 }