Merge branch 'develop' into feature/3526953-ckeditor-figure

Author: joshua-salsadigital

composer.json

@@ -6,6 +6,7 @@
         "php": ">=8.2",
         "composer/installers": "^2.1",
         "cweagans/composer-patches": "^1.7",
+        "drupal/admin_toolbar": "^3.6",
         "drupal/components": "^3.1",
         "drupal/core-composer-scaffold": "^11",
         "drupal/core-project-message": "^11",

composer.lock

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@civictheme/uikit": "github:civictheme/uikit#057a2d3e24a0fd7918e00db8bfed326e7f5f00b9"
+    "@civictheme/uikit": "github:civictheme/uikit#fd4cbae4cf41ed780011c7e4f2366a3685561071"
   },
   "scripts": {
     "uikit-change": "node scripts/civictheme-uikit-version-manager/index.mjs"

package-lock.json

@@ -21,6 +21,7 @@ if [ "${DRUPAL_PROFILE:-}" = "govcms" ]; then
 else
   echo "  > Enable Admin module."
   drush pm-enable civictheme_admin
+  drush pm-enable admin_toolbar admin_toolbar_search
 fi
 
 echo "  > Enable development module."

package.json

@@ -0,0 +1,29 @@
+@p0 @civictheme @civictheme_message
+Feature: Message fields
+
+  @api
+  Scenario: Fields appear as expected
+    Given I am logged in as a user with the "Site Administrator" role
+    When I visit "node/add/civictheme_page"
+    And I fill in "Title" with "[TEST] Page fields"
+    When I press "Add Message"
+
+    Then should see an "[name='field_c_n_components[0][subform][field_c_p_title][0][value]']" element
+    And should not see an "[name='field_c_n_components[0][subform][field_c_p_title][0][value]'].required" element
+    And should not see an "[name='field_c_n_components[0][subform][field_c_p_title][0][value]'][disabled]" element
+
+    And should see an "[name='field_c_n_components[0][subform][field_c_p_content][0][value]']" element
+    And should not see an "[name='field_c_n_components[0][subform][field_c_p_content][0][value]'].required" element
+    And should not see an "[name='field_c_n_components[0][subform][field_c_p_content][0][value]'][disabled]" element
+
+    And should see an "[name='field_c_n_components[0][subform][field_c_p_message_type]']" element
+    And should see an "[name='field_c_n_components[0][subform][field_c_p_message_type]'].required" element
+    And should not see an "[name='field_c_n_components[0][subform][field_c_p_message_type]'][disabled]" element
+
+    And should see an "[name='field_c_n_components[0][subform][field_c_p_theme]']" element
+
+    And should see an "[name='field_c_n_components[0][subform][field_c_p_background][value]']" element
+
+    And should see an "[name='field_c_n_components[0][subform][field_c_p_vertical_spacing]']" element
+    And should see an "[name='field_c_n_components[0][subform][field_c_p_vertical_spacing]'].required" element
+    And should not see an "[name='field_c_n_components[0][subform][field_c_p_vertical_spacing]'][disabled]" element

scripts/civictheme-uikit-version-manager/package-lock.json

@@ -0,0 +1,48 @@
+@p1 @civictheme @civictheme_message
+Feature: Message render
+
+  Background:
+    Given "civictheme_page" content:
+      | title                    | status |
+      | [TEST] Page message test | 1      |
+
+  @api
+  Scenario: CivicTheme page content type page can be viewed by anonymous with message light
+    Given I am an anonymous user
+    And "field_c_n_components" in "civictheme_page" "node" with "title" of "[TEST] Page message test" has "civictheme_message" paragraph:
+      | field_c_p_title          | [TEST] message title                                                                               |
+      | field_c_p_theme          | light                                                                                              |
+      | field_c_p_content:value  | Content text                                                                                       |
+      | field_c_p_content:format | civictheme_rich_text                                                                               |
+      | field_c_p_message_type   | information                                                                                        |
+      | field_c_p_background     | 1                                                                                                  |
+
+    When I visit "civictheme_page" "[TEST] Page message test"
+    Then I should see an ".ct-message" element
+    And I should see an ".ct-message.ct-theme-light" element
+    And I should not see an ".ct-message.ct-theme-dark" element
+    And I should see an ".ct-message__title" element
+    And I should see an ".ct-message__content" element
+    And I should see the text "[TEST] message title"
+    And I should see the text "Content text"
+    And save screenshot
+
+  @api
+  Scenario: CivicTheme page content type page can be viewed by anonymous with message dark
+    Given I am an anonymous user
+    And "field_c_n_components" in "civictheme_page" "node" with "title" of "[TEST] Page message test" has "civictheme_message" paragraph:
+      | field_c_p_title        | [TEST] message title |
+      | field_c_p_theme        | dark                 |
+      | field_c_p_content      | Content text         |
+      | field_c_p_message_type | warning              |
+      | field_c_p_background   | 0                    |
+
+    When I visit "civictheme_page" "[TEST] Page message test"
+    Then I should see an ".ct-message" element
+    And I should see an ".ct-message.ct-theme-dark" element
+    And I should not see an ".ct-message.ct-theme-light" element
+    And I should see an ".ct-message__title" element
+    And I should see an ".ct-message__content" element
+    And I should see the text "[TEST] message title"
+    And I should see the text "Content text"
+    And save screenshot

scripts/custom/provision-30-enable-modules.sh

@@ -156,6 +156,7 @@ config_devel:
     - core.entity_form_display.paragraph.civictheme_iframe.default
     - core.entity_form_display.paragraph.civictheme_manual_list.default
     - core.entity_form_display.paragraph.civictheme_map.default
+    - core.entity_form_display.paragraph.civictheme_message.default
     - core.entity_form_display.paragraph.civictheme_navigation_card.default
     - core.entity_form_display.paragraph.civictheme_navigation_card_ref.default
     - core.entity_form_display.paragraph.civictheme_next_step.default
@@ -217,6 +218,7 @@ config_devel:
     - core.entity_view_display.paragraph.civictheme_iframe.default
     - core.entity_view_display.paragraph.civictheme_manual_list.default
     - core.entity_view_display.paragraph.civictheme_map.default
+    - core.entity_view_display.paragraph.civictheme_message.default
     - core.entity_view_display.paragraph.civictheme_navigation_card.default
     - core.entity_view_display.paragraph.civictheme_navigation_card_ref.default
     - core.entity_view_display.paragraph.civictheme_next_step.default
@@ -394,6 +396,12 @@ config_devel:
     - field.field.paragraph.civictheme_map.field_c_p_theme
     - field.field.paragraph.civictheme_map.field_c_p_vertical_spacing
     - field.field.paragraph.civictheme_map.field_c_p_view_link
+    - field.field.paragraph.civictheme_message.field_c_p_background
+    - field.field.paragraph.civictheme_message.field_c_p_content
+    - field.field.paragraph.civictheme_message.field_c_p_message_type
+    - field.field.paragraph.civictheme_message.field_c_p_theme
+    - field.field.paragraph.civictheme_message.field_c_p_title
+    - field.field.paragraph.civictheme_message.field_c_p_vertical_spacing
     - field.field.paragraph.civictheme_navigation_card.field_c_p_image
     - field.field.paragraph.civictheme_navigation_card.field_c_p_link
     - field.field.paragraph.civictheme_navigation_card.field_c_p_show_image_as_icon
@@ -552,6 +560,7 @@ config_devel:
     - field.storage.paragraph.field_c_p_list_topics
     - field.storage.paragraph.field_c_p_list_type
     - field.storage.paragraph.field_c_p_location
+    - field.storage.paragraph.field_c_p_message_type
     - field.storage.paragraph.field_c_p_panels
     - field.storage.paragraph.field_c_p_reference
     - field.storage.paragraph.field_c_p_show_image_as_icon
@@ -597,6 +606,7 @@ config_devel:
     - paragraphs.paragraphs_type.civictheme_iframe
     - paragraphs.paragraphs_type.civictheme_manual_list
     - paragraphs.paragraphs_type.civictheme_map
+    - paragraphs.paragraphs_type.civictheme_message
     - paragraphs.paragraphs_type.civictheme_navigation_card
     - paragraphs.paragraphs_type.civictheme_navigation_card_ref
     - paragraphs.paragraphs_type.civictheme_next_step

tests/behat/features/paragraph.civictheme_message.fields.feature

@@ -34,6 +34,7 @@ require_once __DIR__ . '/includes/libraries.inc';
 require_once __DIR__ . '/includes/map.inc';
 require_once __DIR__ . '/includes/media.inc';
 require_once __DIR__ . '/includes/menu.inc';
+require_once __DIR__ . '/includes/message.inc';
 require_once __DIR__ . '/includes/mobile_navigation.inc';
 require_once __DIR__ . '/includes/next_step.inc';
 require_once __DIR__ . '/includes/node.inc';