Merge pull request #1995 from magento-obsessive-owls/pr-jan25

[Obsessive Owls] Stabilize Functional Tests

Author: Igor Melnikov

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml

@@ -16,6 +16,7 @@
             <severity value="NORMAL"/>
             <testCaseId value="MAGETWO-63981"/>
             <group value="analytics"/>
+            <group value="skip"/>
         </annotations>
         <after>
             <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewBlockPage.xml

@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CmsNewBlock" url="admin/cms/block/new" area="admin" module="Magento_Cms">
+    <page name="CmsNewBlock" area="admin" url="/cms/block/new" module="Magento_Cms">
         <section name="CmsNewBlockBlockActionsSection"/>
         <section name="CmsNewBlockBlockBasicFieldsSection"/>
     </page>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockBasicFieldsSection.xml

@@ -11,6 +11,6 @@
     <section name="CmsNewBlockBlockBasicFieldsSection">
         <element name="title" type="input" selector="input[name=title]"/>
         <element name="identifier" type="input" selector="input[name=identifier]"/>
-        <element name="wysiwyg_hr_element" type="input" selector="#cms_block_form_content_hr"/>
+        <element name="content_textarea" type="input" selector="#cms_block_form_content"/>
     </section>
 </sections>

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

@@ -12,6 +12,7 @@
             <features value="Add Image to WYSIWYG of Newsletter"/>
             <stories value="Apply new WYSIWYG in Newsletter-MAGETWO-47309"/>
             <group value="newsletter"/>
+            <group value="skip"/>
             <title value="You should be able to add image to WYSIWYG Editor of Newsletter"/>
             <description value="You should be able to add image to WYSIWYG Editor Newsletter"/>
             <severity value="CRITICAL"/>

dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php

@@ -31,13 +31,24 @@ class PublicCodeTest extends \PHPUnit\Framework\TestCase
      */
     public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
     {
+        // A block can be whitelisted and thus not be required to be public
+        $whiteListFiles = str_replace('\\', '/', realpath(__DIR__))
+            . '/_files/whitelist/public_code*.txt';
+        $whiteListBlocks = [];
+        foreach (glob($whiteListFiles) as $fileName) {
+            $whiteListBlocks = array_merge(
+                $whiteListBlocks,
+                file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+            );
+        }
+
         $nonPublishedBlocks = [];
         $xml = simplexml_load_file($layoutFile);
         $elements = $xml->xpath('//block | //referenceBlock') ?: [];
         /** @var $node \SimpleXMLElement */
         foreach ($elements as $node) {
             $class = (string) $node['class'];
-            if ($class && \class_exists($class)) {
+            if ($class && \class_exists($class) && !in_array($class, $whiteListBlocks)) {
                 $reflection = (new \ReflectionClass($class));
                 if (strpos($reflection->getDocComment(), '@api') === false) {
                     $nonPublishedBlocks[] = $class;