Merge pull request #806 from usagov/stage

Sprint 62 release to PROD

config/sync/field.field.media.image.field_media_image.yml

@@ -33,7 +33,7 @@ settings:
   max_resolution: ''
   min_resolution: ''
   alt_field: true
-  alt_field_required: true
+  alt_field_required: false
   title_field: false
   title_field_required: false
   default_image:

config/sync/field.storage.paragraph.field_background_color.yml

@@ -17,6 +17,9 @@ settings:
     -
       value: dark
       label: Dark
+    -
+      value: homepage
+      label: Homepage
   allowed_values_function: ''
 module: options
 locked: false

config/sync/language.entity.am.yml

@@ -2,7 +2,6 @@ uuid: e2b1707a-dfa8-41af-b86c-c2d0a2116449
 langcode: am
 status: true
 dependencies: {  }
-third_party_settings: {  }
 id: am
 label: Amharic
 direction: ltr

config/sync/language/pt/language.entity.pt.yml

@@ -0,0 +1 @@
+label: Português

config/sync/metatag.metatag_defaults.global.yml

@@ -20,15 +20,15 @@ tags:
   icon_32x32: /themes/custom/votegov/img/favicon/favicon-32x32.ico
   icon_96x96: /themes/custom/votegov/img/favicon/favicon-96x96.ico
   og_description: '[current-page:metatag:description]'
-  og_image: /themes/custom/vote_gov/img/ballot-box-OG.png
+  og_image: /themes/custom/votegov/img/votegov-social.jpg
   og_site_name: '[site:name]'
   og_title: '[current-page:metatag:title]'
   og_type: website
   og_url: '[site:url]'
   shortcut_icon: /themes/custom/votegov/img/favicon/favicon.ico
   title: 'Register to vote | [site:name]'
   twitter_cards_description: '[current-page:metatag:description]'
-  twitter_cards_image: /themes/custom/vote_gov/img/ballot-box-OG.png
+  twitter_cards_image: /themes/custom/votegov/img/votegov-social.jpg
   twitter_cards_site: '@votegov'
   twitter_cards_title: '[current-page:metatag:title]'
   twitter_cards_type: summary_large_image

testing/cypress/e2e/frontEndTests/menu.cy.js

@@ -13,7 +13,7 @@ describe('Check main menu', () => {
   })
 
   it('main menu - mobile', () => {
-    // set viewport to mobile 
+    // set viewport to mobile
     cy.viewport('iphone-6')
     cy.get('[data-test="mobileBtn"]').click()
     cy.get('[data-test="mobileNav"]').should('be.visible')
@@ -23,8 +23,8 @@ describe('Check main menu', () => {
     })
     cy.get('[data-test="searchBox"]').should('be.visible')
     // close menu
-    cy.get('[data-test="closeBtn"]').click({force: true})
+    cy.get('[data-test="mainCloseBtn"]').click()
     cy.get('[data-test="mobileNav"]').should('not.be.visible')
 
   })
-})
+})

testing/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "devDependencies": {
     "axe-core": "^4.9.1",
-    "cypress": "^13.11.0",
+    "cypress": "^13.12.0",
     "cypress-axe": "^1.5.0",
     "cypress-mochawesome-reporter": "^3.8.2"
   },
@@ -37,6 +37,6 @@
   },
   "homepage": "https://github.com/usagov/vote-gov-drupal#readme",
   "dependencies": {
-    "cypress-real-events": "^1.12.0"
+    "cypress-real-events": "^1.13.0"
   }
 }

web/modules/custom/vote_utility/inc/view_alter.inc

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Defines custom view alter hooks.
+ */
+
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Implements hook_taxonomy_term_view_alter().
+ */
+function vote_utility_taxonomy_term_view_alter(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
+  if ($entity->bundle() == 'basics_modules' && $display->getMode() == 'default') {
+    // Disable cache for basics_modules using default display mode.
+    $build['#cache']['max-age'] = 0;
+  }
+}

web/modules/custom/vote_utility/vote_utility.module

@@ -8,3 +8,4 @@
 require_once dirname(__FILE__) . '/inc/block_content_revisions.inc';
 require_once dirname(__FILE__) . '/inc/token.inc';
 require_once dirname(__FILE__) . '/inc/form_alter.inc';
+require_once dirname(__FILE__) . '/inc/view_alter.inc';