Merge branch '4.11' into 4

tests/Behat/Extension/UniqueHtmlEditorConfigExtension.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace DNADesign\Elemental\Tests\Behat\Extension;
+
+use DNADesign\Elemental\Models\BaseElement;
+use SilverStripe\Core\Extension;
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig;
+use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
+
+/**
+ * @extends Extension<BaseElement>
+ */
+class UniqueHtmlEditorConfigExtension extends Extension implements TestOnly
+{
+    public function updateCMSFields(FieldList $fields)
+    {
+        $wysiwyg = $fields->dataFieldByName('HTML');
+        if ($wysiwyg instanceof HTMLEditorField) {
+            $config = clone HTMLEditorConfig::get('cms');
+            $config->setOption('editorIdentifier', 'cms-' . $this->getOwner()->getUniqueKey());
+            $wysiwyg->setEditorConfig($config);
+        }
+    }
+}

tests/Behat/features/multiple-wysiwyg-configs.feature

@@ -0,0 +1,42 @@
+Feature: multiple elemental blocks with different HTMLEditorConfig instances
+  As a developer
+  I want my elemental blocks to have different HTMLEditorConfig instances
+  So that the appropriate options are available for each block
+
+  Background:
+    Given I add an extension "DNADesign\Elemental\Tests\Behat\Extension\UniqueHtmlEditorConfigExtension" to the "DNADesign\Elemental\Models\BaseElement" class
+    And I add an extension "DNADesign\Elemental\Extensions\ElementalPageExtension" to the "Page" class
+    And a "page" "Blocks Page" with a "Alice's Block" content element with "<p>Some content</p>" content
+    And the "page" "Blocks Page" has a "Bob's Block" content element with "<p>completely different stuff</p>" content
+    And the "group" "EDITOR" has permissions "Access to 'Pages' section"
+    And I am logged in as a member of "EDITOR" group
+    And I go to "/admin/pages"
+    And I left click on "Blocks Page" in the tree
+
+  @unsavedChanges
+  Scenario: The WYSIWYG should work correctly for all configs
+    Given I see a list of blocks
+    # Check the link menu in the WYSIWYG "insert link" button is correct for block 1
+    When I click on block 1
+    And I click on the "#Form_ElementForm_1 [aria-label^='Insert link'] button" element
+    Then I should see "Page on this site" in the ".mce-menu.mce-in" element
+    And I should see "Link to a file" in the ".mce-menu.mce-in" element
+    And I should see "Link to external URL" in the ".mce-menu.mce-in" element
+    And I should see "Anchor on a page" in the ".mce-menu.mce-in" element
+    And I should see "Link to email address" in the ".mce-menu.mce-in" element
+    # Check the link menu in the WYSIWYG "insert link" button is correct for block 2
+    When I click on block 2
+    # In CI, the mouse position just happens to produce a tooltip that stops us clicking on the insert link button
+    # so we have to move the mouse somewhere else to avoid that
+    And I click on the "input[type='text']" element
+    And I click on the "#Form_ElementForm_2 [aria-label^='Insert link'] button" element
+    Then I should see "Page on this site" in the ".mce-menu.mce-in" element
+    And I should see "Link to a file" in the ".mce-menu.mce-in" element
+    And I should see "Link to external URL" in the ".mce-menu.mce-in" element
+    And I should see "Anchor on a page" in the ".mce-menu.mce-in" element
+    And I should see "Link to email address" in the ".mce-menu.mce-in" element
+    # Check the content of both WYSIWYG fields is correct
+    And the "Content" field for block 1 should contain "<p>Some content</p>"
+    And the "Content" field for block 2 should contain "<p>completely different stuff</p>"
+
+