Merge pull request #113 from ethanteague/VAGOV-1362-et

VAGOV-1362: Updating behat tests and config to match spec tool.

Author: andyhawks

config/sync/block_content.type.promo.yml

@@ -5,4 +5,4 @@ dependencies: {  }
 id: promo
 label: Promo
 revision: 1
-description: 'Promote a link with an image, title, and description.   '
+description: 'Promote a link with an image, title, and description.'

config/sync/field.field.block_content.alert.field_alert_content.yml

@@ -14,7 +14,7 @@ field_name: field_alert_content
 entity_type: block_content
 bundle: alert
 label: 'Crisis Alert Answer'
-description: "Remember that this content is for people in crisis: be simple and straighforward. \r\n<ul><li>Give a single clear next step\r\n<li>Highlight the <strong>most important information</strong> in bold\r\n<li>Link to an additional page if there's more information to share</li><ul>"
+description: "Remember that this content is for people in crisis: be simple and straighforward.<br /><ul><li>Give a single clear next step</li><li>Highlight the <strong>most important information</strong> in bold</li><li>Link to an additional page if there's more information to share</li><ul>"
 required: true
 translatable: false
 default_value: {  }

config/sync/field.field.node.landing_page.field_administration.yml

@@ -11,7 +11,7 @@ field_name: field_administration
 entity_type: node
 bundle: landing_page
 label: Administration
-description: 'To which administration or office does this Hub belong? '
+description: 'To which administration or office does this Hub belong?'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.node.landing_page.field_description.yml

@@ -10,7 +10,7 @@ field_name: field_description
 entity_type: node
 bundle: landing_page
 label: Description
-description: "Describe the content concisely, ideally between 120 and 158 characters. This text will appear on content listings on the site, and will describe the content in search engines, and when this content is shared on social media.\r\n"
+description: "Describe the content concisely, ideally between 120 and 158 characters. This text will appear on content listings on the site, and will describe the content in search engines, and when this content is shared on social media."
 required: true
 translatable: true
 default_value: {  }

config/sync/field.field.node.landing_page.field_intro_text.yml

@@ -10,7 +10,7 @@ field_name: field_intro_text
 entity_type: node
 bundle: landing_page
 label: 'Intro text'
-description: "This text appears directly beneath the page title, but may also appear as a summary of the content in other places, such as search results and social media posts.\r\n"
+description: "This text appears directly beneath the page title, but may also appear as a summary of the content in other places, such as search results and social media posts."
 required: true
 translatable: true
 default_value: {  }

config/sync/field.field.node.page.field_featured_content.yml

@@ -14,7 +14,7 @@ field_name: field_featured_content
 entity_type: node
 bundle: page
 label: 'Featured content'
-description: 'Highlight the most important content on your page here, in the form of a Q&A or some text edited in a WYWSIWYG editor. '
+description: 'Highlight the most important content on your page here, in the form of a Q&A or some text edited in a WYWSIWYG editor.'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.paragraph.link_teaser.field_link_summary.yml

@@ -10,7 +10,7 @@ field_name: field_link_summary
 entity_type: paragraph
 bundle: link_teaser
 label: 'Link summary'
-description: 'A short description of the link, less than 500 characters. '
+description: 'A short description of the link, less than 500 characters.'
 required: false
 translatable: false
 default_value: {  }

config/sync/field.field.paragraph.react_widget.field_custom_react_root.yml

@@ -10,7 +10,7 @@ field_name: field_custom_react_root
 entity_type: paragraph
 bundle: react_widget
 label: 'Custom React Root'
-description: 'If true adds a div with the id "react-root" to this page. '
+description: 'If true adds a div with the id "react-root" to this page.'
 required: false
 translatable: false
 default_value:

config/sync/field.field.taxonomy_term.administration.field_description.yml

@@ -10,7 +10,7 @@ field_name: field_description
 entity_type: taxonomy_term
 bundle: administration
 label: Description
-description: "Describe the content concisely, ideally between 120 and 158 characters. This text will appear on content listings on the site, and will describe the content in search engines, and when this content is shared on social media.\r\n"
+description: "Describe the content concisely, ideally between 120 and 158 characters. This text will appear on content listings on the site, and will describe the content in search engines, and when this content is shared on social media."
 required: true
 translatable: false
 default_value: {  }

config/sync/views.view.va_blocks_admin.yml

@@ -16,7 +16,7 @@ dependencies:
 id: va_blocks_admin
 label: 'Blocks listing'
 module: views
-description: 'Shows existing blocks on the site. '
+description: 'Shows existing blocks on the site.'
 tag: ''
 base_table: block_content_field_data
 base_field: id

tests/behat/features/drupal-spec-tool/access_control.feature

@@ -7,14 +7,12 @@ Feature: Access control
   @spec @access
   Scenario: User roles
     Then exactly the following roles should exist
-      | Name                     | Machine name             |
-      | Administrator            | administrator            |
-      | Anonymous user           | anonymous                |
-      | Authenticated user       | authenticated            |
-      | Media creator            | media_creator            |
-      | Media manager            | media_manager            |
-      | Content creator          | content_creator          |
-      | Content publisher        | content_publisher        |
-      | Content reviewer         | content_reviewer         |
-      | Support Service creator  | support_service_creator  |
-      | Support Service reviewer | support_service_reviewer |
+      | Name                 | Machine name         |
+      | Administrator        | administrator        |
+      | Anonymous user       | anonymous            |
+      | Authenticated user   | authenticated        |
+      | Content API Consumer | content_api_consumer |
+      | Content editor       | content_editor       |
+      | Content publisher    | content_publisher    |
+      | Content reviewer     | content_reviewer     |
+      | User access admin    | admnistrator_users   |