MAGETWO-90531: WYSIWYG shows special character button in toolbar on product page - when test module is enabled

- modifying integration test to customize toolbar

Author: cpartica

dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/Model/Config.php

@@ -19,17 +19,64 @@ class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
      */
     const CONFIG_CONTENT_CSS = 'something_else.css';
 
+    /** @var \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider */
+    private $cmsConfigProvider;
+
+    /**
+     * @param \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider $cmsConfigProvider
+     */
+    public function __construct(\Magento\Cms\Model\Wysiwyg\DefaultConfigProvider $cmsConfigProvider)
+    {
+        $this->cmsConfigProvider = $cmsConfigProvider;
+    }
+
     /**
      * @inheritdoc
      */
     public function getConfig(\Magento\Framework\DataObject $config): \Magento\Framework\DataObject
     {
-        $config->addData(
+        //get default config
+        $config = $this->cmsConfigProvider->getConfig($config);
+
+        $config = $this->removeSpecialCharacterFromToolbar($config);
+
+        $config = $this->modifyHeightAndContentCss($config);
+        return $config;
+    }
+
+    /**
+     * Modify height and content_css in the config
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    private function modifyHeightAndContentCss(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject
+    {
+        return $config->addData(
             [
                 'height' => self::CONFIG_HEIGHT,
                 'content_css' => self::CONFIG_CONTENT_CSS
             ]
         );
+    }
+
+    /**
+     * Modify height and content_css in the config
+     *
+     * @param \Magento\Framework\DataObject $config
+     * @return \Magento\Framework\DataObject
+     */
+    private function removeSpecialCharacterFromToolbar(
+        \Magento\Framework\DataObject $config
+    ) : \Magento\Framework\DataObject {
+        $tinymce4 = $config->getData('tinymce4');
+        if (isset($tinymce4['toolbar']) && isset($tinymce4['plugins'])) {
+            $toolbar = $tinymce4['toolbar'];
+            $plugins = $tinymce4['plugins'];
+            $tinymce4['toolbar'] = str_replace('charmap', '', $toolbar);
+            $tinymce4['plugins'] = str_replace('charmap', '', $plugins);
+            $config->setData('tinymce4', $tinymce4);
+        }
         return $config;
     }
 }

dev/tests/integration/_files/Magento/TestModuleWysiwygConfig/etc/adminhtml/di.xml

@@ -11,6 +11,12 @@
             <argument name="wysiwygConfigPostProcessor" xsi:type="array">
                 <item name="testAdapter" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
             </argument>
+            <argument name="wysiwygConfigPostProcessor" xsi:type="array">
+                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
+            </argument>
+            <argument name="wysiwygConfigPostProcessor" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\TestModuleWysiwygConfig\Model\Config</item>
+            </argument>
             <argument name="variablePluginConfigProvider" xsi:type="array">
                 <item name="testAdapter" xsi:type="string">Magento\Variable\Model\Variable\ConfigProvider</item>
             </argument>
@@ -22,4 +28,14 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Cms\Model\Config\Source\Wysiwyg\Editor">
+        <arguments>
+            <argument name="adapterOptions" xsi:type="array">
+                <item name="testAdapter" xsi:type="array">
+                    <item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</item>
+                    <item name="label" xsi:type="string" translatable="true">Test Adapter</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php

@@ -57,7 +57,7 @@ public function testGetConfigCssUrls()
      *
      * @magentoConfigFixture default/cms/wysiwyg/editor testAdapter
      */
-    public function testEnabledModuleIsAbleToModifyConfig()
+    public function testTestModuleEnabledModuleIsAbleToModifyConfig()
     {
         $objectManager = Bootstrap::getObjectManager();
         $compositeConfigProvider = $objectManager->create(\Magento\Cms\Model\Wysiwyg\CompositeConfigProvider::class);
@@ -68,5 +68,12 @@ public function testEnabledModuleIsAbleToModifyConfig()
         $config = $model->getConfig();
         $this->assertEquals(TestModuleWysiwygConfig::CONFIG_HEIGHT, $config['height']);
         $this->assertEquals(TestModuleWysiwygConfig::CONFIG_CONTENT_CSS, $config['content_css']);
+        $this->assertArrayHasKey('tinymce4', $config);
+        $this->assertArrayHasKey('toolbar', $config['tinymce4']);
+        $this->assertNotContains(
+            'charmap',
+            $config['tinymce4']['toolbar'],
+            'Failed to address that the custom test module removes "charmap" button from the toolbar'
+        );
     }
 }