Merge pull request #2329 from magento-panda/2.3-PR

Fixed issues:
  - MAGETWO-88028 Table is full errors on same modify profile
  - MAGETWO-89417 [2.3.x][Functional-Tests] - AdminSwitchWYSIWYGOptionsCest fails on 2.3-develop

Author: igrybkov

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php

@@ -38,8 +38,7 @@ protected function setUp()
 
     public function testEstimateRowSize()
     {
-        $this->markTestSkipped('Unskip after MAGETWO-89738');
-        $expectedValue = 2400000;
+        $expectedValue = 4000000;
 
         $this->websiteManagementMock->expects($this->once())->method('getCount')->willReturn(100);
         $collectionMock = $this->createMock(\Magento\Customer\Model\ResourceModel\Group\Collection::class);

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminSwitchWYSIWYGOptionsCest.xml

@@ -16,8 +16,6 @@
             <title value="Admin are able to switch between versions of TinyMCE."/>
             <description value="Admin are able to switch between versions of TinyMCE."/>
             <severity value="CRITICAL"/>
-            <group value="skip"/>
-            <!-- Skipped; see MAGETWO-89417 -->
             <testCaseId value="MAGETWO-82936"/>
             <!--Skip because of issue MAGETWO-89417-->
             <group value="skip"/>
@@ -27,6 +25,7 @@
             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
         </before>
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
         <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox1" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue1"/>
@@ -35,7 +34,7 @@
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions1" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig1" />
         <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage1"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <waitForPageLoad stepKey="wait2"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle1"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab1" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
@@ -54,6 +53,7 @@
         <!--see widget on Storefront-->
         <see userInput="Hello TinyMCE4!" stepKey="seeContent1"/>
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage2"/>
+        <waitForPageLoad stepKey="wait4"/>
         <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
@@ -62,7 +62,7 @@
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions2" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig2" />
         <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <waitForPageLoad stepKey="wait5"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
@@ -77,7 +77,7 @@
         <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage2"/>
         <!-- Go to storefront cms page, assert cms content -->
         <amOnPage url="{{simpleCmsPage.identifier}}" stepKey="amOnPageTestPage2"/>
-        <waitForPageLoad stepKey="wait4" />
+        <waitForPageLoad stepKey="wait6" />
         <!--see widget on Storefront-->
         <see userInput="Hello TinyMCE3!" stepKey="seeContent2"/>
         <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />