Fixed form tests, updated uikit commit hash, fixed tests depending on drush. (#1338)

Author: richardgaunt

package-lock.json

@@ -63,6 +63,13 @@ class FeatureContext extends DrupalContext {
   use WysiwygTrait;
   use VisibilityTrait;
 
+  /**
+   * Keep track of drush output.
+   *
+   * @var string|bool
+   */
+  protected $drushOutput;
+
   /**
    * Assert that content is present in an iframe.
    *
@@ -205,7 +212,7 @@ public function paragraphsAddToParentEntityWithFields(string $field_name, string
       'entity_type' => $parent_entity_type,
     ]);
 
-    $referenceItem = $node->get($parent_entity_field)->get($delta);
+    $referenceItem = $node?->get($parent_entity_field)->get($delta);
     if (!$referenceItem) {
       throw new \Exception(sprintf('Unable to find entity that matches delta: "%s"', print_r($delta, TRUE)));
     }
@@ -559,4 +566,29 @@ public function elementAssertAttributeContains(string $selector, string $attribu
     }
   }
 
+  /**
+   * Step to run drush commands.
+   *
+   * @Given I run drush :command :arguments
+   */
+  public function assertDrushCommandWithArgument(string $command, string $arguments): void {
+    $this->drushOutput = $this->getDriver('drush')->$command($this->fixStepArgument($arguments));
+    if (!empty($this->drushOutput)) {
+      $this->drushOutput = TRUE;
+    }
+  }
+
+  /**
+   * Returns fixed step argument (with \\" replaced back to ").
+   *
+   * @param string $argument
+   *   Argument to update.
+   *
+   * @return string
+   *   Modified step argument.
+   */
+  protected function fixStepArgument($argument): string {
+    return str_replace('\\"', '"', $argument);
+  }
+
 }

tests/behat/bootstrap/FeatureContext.php

@@ -6,7 +6,7 @@ Feature: Webform render
     Given I am an anonymous user
     When I visit "/enquiry"
     Then I press the "Send" button
-    And I should see "First name field is required."
+    And I should see "Your first name is required."
     And I should see "Last name field is required."
     And I should see "Phone number field is required."
     And I should see "Email field is required."

tests/behat/features/webform.enquiry.render.feature

@@ -4,7 +4,7 @@ Feature: Webform render
   @api @javascript
   Scenario: Form inputs are correctly validated
     Given I am an anonymous user
-    When I visit "/form/civictheme-feedback"
+    When I visit "/feedback"
     And I should see 3 ".progress-step" elements
     And I should see the text "Personal information"
     And I should see the text "Additional information"

tests/behat/features/webform.feedback.render.feature

@@ -5,20 +5,19 @@ Feature: XML Sitemap
   Scenario: XML Sitemap is accessible
 
     Given civictheme_page content:
-      | title                 | status | path                 |
-      | [TEST] Published page | 1      | /test-published-page |
-      | [TEST] Draft page     | 0      | /test-draft-page     |
+      | title                 | status | moderation_state | path                 |
+      | [TEST] Published page | 1      | published        | /test-published-page |
+      | [TEST] Draft page     | 0      | draft            | /test-draft-page     |
     And civictheme_event content:
-      | title                  | status | path                         |
-      | [TEST] Published event | 1      | /events/test-published-event |
-      | [TEST] Draft event     | 0      | /events/test-draft-event     |
+      | title                  | status | moderation_state | path                         |
+      | [TEST] Published event | 1      | published        | /events/test-published-event |
+      | [TEST] Draft event     | 0      | draft            | /events/test-draft-event     |
     And civictheme_alert content:
-      | title                  | status | path                         |
-      | [TEST] Published alert | 1      | /alerts/test-published-alert |
-      | [TEST] Draft alert     | 0      | /alerts/test-draft-alert     |
+      | title                  | status | moderation_state | path                         |
+      | [TEST] Published alert | 1      | published        | /alerts/test-published-alert |
+      | [TEST] Draft alert     | 0      | draft            | /alerts/test-draft-alert     |
 
     Given I run drush "simple-sitemap:generate" "--uri=http://example.com"
-
     When I go to "sitemap.xml"
     Then the response status code should be 200
 

tests/behat/features/xmlsitemap.feature

@@ -1,9 +1,9 @@
 langcode: en
 status: open
 dependencies: {  }
+weight: 0
 open: null
 close: null
-weight: 0
 uid: 1
 template: false
 archive: false
@@ -19,6 +19,7 @@ elements: |-
       '#type': textfield
       '#title': 'First name'
       '#required': true
+      '#required_error': 'Your first name is required.'
     last_name:
       '#type': textfield
       '#title': 'Last name'
@@ -77,9 +78,9 @@ settings:
   page_theme_name: ''
   form_title: both
   form_submit_once: false
-  form_exception_message: ''
   form_open_message: ''
   form_close_message: ''
+  form_exception_message: ''
   form_previous_submissions: true
   form_confidential: false
   form_confidential_message: ''
@@ -89,28 +90,36 @@ settings:
   form_prepopulate_source_entity: false
   form_prepopulate_source_entity_required: false
   form_prepopulate_source_entity_type: ''
-  form_reset: false
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
   form_disable_autocomplete: false
   form_novalidate: true
   form_disable_inline_errors: false
   form_required: false
-  form_unsaved: false
-  form_disable_back: false
-  form_submit_back: false
   form_autofocus: false
   form_details_toggle: false
+  form_reset: false
   form_access_denied: default
   form_access_denied_title: ''
   form_access_denied_message: ''
   form_access_denied_attributes: {  }
   form_file_limit: ''
+  form_attributes: {  }
+  form_method: ''
+  form_action: ''
   share: false
   share_node: false
   share_theme_name: ''
   share_title: true
   share_page_body_attributes: {  }
   submission_label: ''
+  submission_exception_message: ''
+  submission_locked_message: ''
   submission_log: false
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
   submission_views: {  }
   submission_views_replace: {  }
   submission_user_columns: {  }
@@ -119,11 +128,6 @@ settings:
   submission_access_denied_title: ''
   submission_access_denied_message: ''
   submission_access_denied_attributes: {  }
-  submission_exception_message: ''
-  submission_locked_message: ''
-  submission_excluded_elements: {  }
-  submission_exclude_empty: false
-  submission_exclude_empty_checkbox: false
   previous_submission_message: ''
   previous_submissions_message: ''
   autofill: false
@@ -134,13 +138,13 @@ settings:
   wizard_progress_percentage: false
   wizard_progress_link: false
   wizard_progress_states: false
-  wizard_auto_forward: true
-  wizard_auto_forward_hide_next_button: false
-  wizard_keyboard: true
   wizard_start_label: ''
   wizard_preview_link: false
   wizard_confirmation: true
   wizard_confirmation_label: ''
+  wizard_auto_forward: true
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
   wizard_track: ''
   wizard_prev_button_label: ''
   wizard_next_button_label: ''
@@ -163,9 +167,9 @@ settings:
   draft_pending_single_message: ''
   draft_pending_multiple_message: ''
   confirmation_type: page
+  confirmation_url: ''
   confirmation_title: ''
   confirmation_message: ''
-  confirmation_url: ''
   confirmation_attributes: {  }
   confirmation_back: true
   confirmation_back_label: ''
@@ -194,9 +198,6 @@ settings:
   token_update: false
   token_delete: false
   serial_disabled: false
-  form_method: ''
-  form_action: ''
-  form_attributes: {  }
 access:
   create:
     roles:

web/themes/contrib/civictheme/config/install/webform.webform.civictheme_enquiry.yml

@@ -1,15 +1,15 @@
 langcode: en
 status: open
 dependencies: {  }
+weight: 0
 open: null
 close: null
-weight: 0
 uid: 1
 template: false
 archive: false
 id: civictheme_feedback
 title: 'General form'
-description: 'A simple multi-step form.'
+description: '<p>A simple multi-step form.</p>'
 categories: {  }
 elements: |-
   personal_information:
@@ -87,14 +87,14 @@ settings:
   ajax_effect: ''
   ajax_speed: null
   page: true
-  page_submit_path: /enquiry
+  page_submit_path: /feedback
   page_confirm_path: ''
   page_theme_name: ''
   form_title: both
   form_submit_once: false
-  form_exception_message: ''
   form_open_message: ''
   form_close_message: ''
+  form_exception_message: ''
   form_previous_submissions: true
   form_confidential: false
   form_confidential_message: ''
@@ -104,28 +104,36 @@ settings:
   form_prepopulate_source_entity: false
   form_prepopulate_source_entity_required: false
   form_prepopulate_source_entity_type: ''
-  form_reset: false
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
   form_disable_autocomplete: false
   form_novalidate: true
   form_disable_inline_errors: false
   form_required: false
-  form_unsaved: false
-  form_disable_back: false
-  form_submit_back: false
   form_autofocus: false
   form_details_toggle: false
+  form_reset: false
   form_access_denied: default
   form_access_denied_title: ''
   form_access_denied_message: ''
   form_access_denied_attributes: {  }
   form_file_limit: ''
+  form_attributes: {  }
+  form_method: ''
+  form_action: ''
   share: false
   share_node: false
   share_theme_name: ''
   share_title: true
   share_page_body_attributes: {  }
   submission_label: ''
+  submission_exception_message: ''
+  submission_locked_message: ''
   submission_log: false
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
   submission_views: {  }
   submission_views_replace: {  }
   submission_user_columns: {  }
@@ -134,11 +142,6 @@ settings:
   submission_access_denied_title: ''
   submission_access_denied_message: ''
   submission_access_denied_attributes: {  }
-  submission_exception_message: ''
-  submission_locked_message: ''
-  submission_excluded_elements: {  }
-  submission_exclude_empty: false
-  submission_exclude_empty_checkbox: false
   previous_submission_message: ''
   previous_submissions_message: ''
   autofill: false
@@ -149,19 +152,21 @@ settings:
   wizard_progress_percentage: false
   wizard_progress_link: false
   wizard_progress_states: false
-  wizard_auto_forward: true
-  wizard_auto_forward_hide_next_button: false
-  wizard_keyboard: true
   wizard_start_label: ''
   wizard_preview_link: false
   wizard_confirmation: true
   wizard_confirmation_label: ''
+  wizard_auto_forward: true
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
   wizard_track: ''
   wizard_prev_button_label: ''
   wizard_next_button_label: ''
   wizard_toggle: false
   wizard_toggle_show_label: ''
   wizard_toggle_hide_label: ''
+  wizard_page_type: container
+  wizard_page_title_tag: h2
   preview: 0
   preview_label: ''
   preview_title: ''
@@ -178,9 +183,9 @@ settings:
   draft_pending_single_message: ''
   draft_pending_multiple_message: ''
   confirmation_type: page
+  confirmation_url: ''
   confirmation_title: ''
   confirmation_message: ''
-  confirmation_url: ''
   confirmation_attributes: {  }
   confirmation_back: true
   confirmation_back_label: ''
@@ -209,9 +214,6 @@ settings:
   token_update: false
   token_delete: false
   serial_disabled: false
-  form_method: ''
-  form_action: ''
-  form_attributes: {  }
 access: {  }
 handlers: {  }
 variants: {  }

web/themes/contrib/civictheme/config/install/webform.webform.civictheme_feedback.yml

@@ -2,18 +2,17 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.node.field_c_n_summary
     - field.storage.node.field_c_n_components
+    - field.storage.node.field_c_n_summary
     - field.storage.paragraph.field_c_p_content
-    - field.storage.paragraph.field_c_p_summary
-    - field.storage.paragraph.field_c_p_title
     - field.storage.paragraph.field_c_p_list_items
     - field.storage.paragraph.field_c_p_subtitle
+    - field.storage.paragraph.field_c_p_summary
+    - field.storage.paragraph.field_c_p_title
     - search_api.server.civictheme_database
   module:
-    - paragraphs
     - node
-    - search_api
+    - paragraphs
 id: civictheme_content
 name: Content
 description: ''
@@ -184,4 +183,5 @@ options:
   cron_limit: 50
   index_directly: true
   track_changes_in_references: true
+  delete_on_fail: true
 server: civictheme_database