Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 3a6dbb9

Browse files
committed
MAGETWO-88960: [UI Component] URL Input: CMS Page link
- build stabilization
1 parent 74313f7 commit 3a6dbb9

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
98
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
109
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1110
<section name="AdminProductFormSection">
@@ -102,6 +101,8 @@
102101
<element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" />
103102
<element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
104103
<element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
104+
<element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
105+
<element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />
105106
<element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
106107
</section>
107108
<section name="ProductShortDescriptionWYSIWYGToolbarSection">

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
<fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName1" />
4646
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.AcceptFolderName}}" stepKey="acceptFolderName11" />
4747
<waitForLoadingMaskToDisappear stepKey="waitForLoading3" />
48-
<conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.StorageRootArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfArrowExpand}}" stepKey="clickArrowIfCloses1" visible="true"/>
48+
<conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.StorageRootArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfArrowExpand}}" stepKey="clickStorageRootArrowIfClosed" visible="true"/>
49+
<conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.WysiwygArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
4950
<waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
5051
<click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
5152
<waitForLoadingMaskToDisappear stepKey="waitForLoading4" />

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,16 @@ public function testGetConfig()
3939
public function testGetConfigCssUrls()
4040
{
4141
$config = $this->model->getConfig();
42-
$publicPathPattern = 'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/mage/%s';
42+
$publicPathPattern = 'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/%s';
4343
$tinyMce4Config = $config->getData('tinymce4');
44-
$this->assertStringMatchesFormat($publicPathPattern, $tinyMce4Config['content_css']);
44+
$contentCss = $tinyMce4Config['content_css'];
45+
if (is_array($contentCss)) {
46+
foreach ($contentCss as $url) {
47+
$this->assertStringMatchesFormat($publicPathPattern, $url);
48+
}
49+
} else {
50+
$this->assertStringMatchesFormat($publicPathPattern, $contentCss);
51+
}
4552
}
4653

4754
/**

0 commit comments

Comments
 (0)