Merge branch 'MAGETWO-89693' into team3-delivery

Author: irenelagno

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

@@ -12,8 +12,6 @@
             <features value="MAGETWO-36659-[CMS] WYSIWYG update"/>
             <stories value="MAGETWO-42158-Variable with WYSIWYG"/>
             <group value="Cms"/>
-            <group value="skip"/>
-            <!-- Skipped; see MAGETWO-88218 -->
             <title value="Admin should be able to add variable to WYSIWYG content of Block"/>
             <description value="You should be able to add variable to WYSIWYG content Block"/>
             <testCaseId value="MAGETWO-84378"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterCest.xml

@@ -12,7 +12,6 @@
             <features value="MAGETWO-36659-[CMS] WYSIWYG update"/>
             <stories value="MAGETWO-42158-Variable with WYSIWYG"/>
             <group value="Newsletter"/>
-            <group value="skip"/>
             <title value="Admin should be able to add variable to WYSIWYG Editor of Newsletter"/>
             <description value="Admin should be able to add variable to WYSIWYG Editor Newsletter"/>
             <testCaseId value="MAGETWO-84379"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterCest.xml

@@ -16,8 +16,6 @@
             <description value="Admin see TinyMCEv4.6 is native WYSIWYG on Newsletter"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84683"/>
-            <!-- MAGETWO-90659 -->
-            <group value="skip"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
@@ -30,6 +28,7 @@
         <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
         <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
         <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <conditionalClick selector="#toggletext" dependentSelector=".mce-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
         <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
         <actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
         <executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/ActionGroup/CreateCustomVariableActionGroup.xml

@@ -21,6 +21,8 @@
     <amOnPage url="admin/admin/system_variable/" stepKey="goToVarialeGrid" />
     <waitForPageLoad stepKey="waitForPageLoad1" />
     <click selector="{{CustomVariableSection.GridCustomVariableCode(customVariable.code)}}" stepKey="goToCustomVariableEditPage" />
+    <waitForPageLoad stepKey="waitForPageLoad"/>
+    <waitForElementVisible selector="{{CustomVariableSection.delete}}" stepKey="waitForDeleteBtn" />
     <click selector="{{CustomVariableSection.delete}}" stepKey="deleteCustomVariable" />
     <waitForText userInput="Are you sure you want to do this?" stepKey="waitForText" />
     <click selector="{{CustomVariableSection.confirmDelete}}" stepKey="confirmDelete" />