This repository was archived by the owner on Apr 29, 2019. It is now read-only.
File tree 3 files changed +13
-4
lines changed
acceptance/tests/functional/Magento/FunctionalTest/Catalog
integration/testsuite/Magento/Cms/Model/Wysiwyg
3 files changed +13
-4
lines changed Original file line number Diff line number Diff line change 5
5
* See COPYING.txt for license details.
6
6
*/
7
7
-->
8
-
9
8
<sections xmlns : xsi =" http://www.w3.org/2001/XMLSchema-instance"
10
9
xsi : noNamespaceSchemaLocation =" ../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd" >
11
10
<section name =" AdminProductFormSection" >
102
101
<element name =" AcceptFolderName" type =" button" selector =" .action-primary.action-accept" />
103
102
<element name =" StorageRootArrow" type =" button" selector =" #root > .jstree-icon" />
104
103
<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')]" />
105
106
<element name =" confirmDelete" type =" button" selector =" .action-primary.action-accept" />
106
107
</section >
107
108
<section name =" ProductShortDescriptionWYSIWYGToolbarSection" >
Original file line number Diff line number Diff line change 45
45
<fillField selector =" {{ProductDescriptionWYSIWYGToolbarSection.FolderName}}" userInput =" {{ImageFolder.name}}" stepKey =" fillFolderName1" />
46
46
<click selector =" {{ProductDescriptionWYSIWYGToolbarSection.AcceptFolderName}}" stepKey =" acceptFolderName11" />
47
47
<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" />
49
50
<waitForText userInput =" {{ImageFolder.name}}" stepKey =" waitForNewFolder1" />
50
51
<click userInput =" {{ImageFolder.name}}" stepKey =" clickOnCreatedFolder1" />
51
52
<waitForLoadingMaskToDisappear stepKey =" waitForLoading4" />
Original file line number Diff line number Diff line change @@ -39,9 +39,16 @@ public function testGetConfig()
39
39
public function testGetConfigCssUrls ()
40
40
{
41
41
$ 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 ' ;
43
43
$ 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
+ }
45
52
}
46
53
47
54
/**
You can’t perform that action at this time.
0 commit comments