Merge remote-tracking branches 'local/ACP2E-874' and 'local/ACP2E-997' into PR_29_JUN_2022_odubovyk

Author: o-dubovyk

app/code/Magento/Authorization/Test/Fixture/Role.php

@@ -9,14 +9,12 @@
 
 use Magento\Authorization\Model\Acl\Role\Group;
 use Magento\Authorization\Model\ResourceModel\Role as RoleResource;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\DataObject;
-use Magento\SharedCatalog\Model\SharedCatalogFactory;
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
-use Magento\Authorization\Model\RoleFactory;
-use Magento\Authorization\Model\RulesFactory;
-use Magento\User\Model\UserFactory;
 
 /**
  * Creating a new admin role

app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingDateAfterChangeFrenchCanadaInterfaceLocaleTest.xml

@@ -84,7 +84,10 @@
         <grabTextFrom selector="{{AdminOrdersGridSection.gridCell('1','Purchase Date')}}" stepKey="grabPurchaseDateInFrenchLocale"/>
 
         <!--Get month name in French-->
-        <executeJS function="return (new Date('{$grabPurchaseDateInDefaultLocale}').toLocaleDateString('fr-CA', {month: 'short'}))" stepKey="getMonthNameInFrench"/>
+       <executeJS function="
+       var moment = require('moment');
+       moment.locale('fr-Ca');
+       return (moment('{$grabPurchaseDateInDefaultLocale}').locale('fr-Ca').format('MMM'))" stepKey="getMonthNameInFrench"/>
 
         <!--Checking Date after changing "Interface Locale"-->
         <assertStringContainsString stepKey="checkingDateAfterChangeInterfaceLocale">

dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Rule for searching php file dependency
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -138,7 +136,7 @@ public function __construct(
      */
     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     {
-        if (!in_array($fileType, ['php', 'template'])) {
+        if (!in_array($fileType, ['php', 'template', 'fixture'])) {
             return [];
         }
 

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

@@ -435,6 +435,7 @@ protected function _getCleanedFileContents($fileType, $file)
     {
         $contents = null;
         switch ($fileType) {
+            case 'fixture':
             case 'php':
                 $contents = php_strip_whitespace($file);
                 break;
@@ -499,7 +500,7 @@ function ($fileType, $file) use ($blackList) {
                 $result = [];
 
                 foreach ($undeclaredDependency as $type => $modules) {
-                    $modules = $this->filterOutBlacklistedDependencies($file, $modules, $blackList);
+                    $modules = $this->filterOutBlacklistedDependencies($file, $fileType, $modules, $blackList);
                     $modules = array_unique($modules);
                     if (empty($modules)) {
                         continue;
@@ -517,18 +518,24 @@ function ($fileType, $file) use ($blackList) {
     /**
      * Filter out list of module dependencies based on the provided blacklist.
      *
-     * Always exclude dependency on Setup because it is part of base Magento package.
+     * Additionally, exclude:
+     *   - dependency on Setup for all modules as it is part of base Magento package.
+     *   - dependency on Magento\TestFramework for in fixture classes
      *
      * @param string $filePath
+     * @param string $fileType
      * @param string[] $modules
      * @param array $blackList
      * @return string[]
      */
-    private function filterOutBlacklistedDependencies($filePath, $modules, array $blackList): array
+    private function filterOutBlacklistedDependencies($filePath, $fileType, $modules, $blackList): array
     {
         $relativeFilePath = substr_replace($filePath, '', 0, strlen(BP . '/'));
         foreach ($modules as $moduleKey => $module) {
-            if ($module == 'Magento\Setup') {
+            if ($module === 'Magento\Setup') {
+                unset($modules[$moduleKey]);
+            }
+            if ($fileType === 'fixture' && $module === 'Magento\TestFramework') {
                 unset($modules[$moduleKey]);
             }
             if (isset($blackList[$relativeFilePath])
@@ -567,7 +574,7 @@ function ($fileType, $file) use ($blackList) {
                 // Prepare output message
                 $result = [];
                 foreach ($externalDependencies as $type => $modules) {
-                    $modules = $this->filterOutBlacklistedDependencies($file, $modules, $blackList);
+                    $modules = $this->filterOutBlacklistedDependencies($file, $fileType, $modules, $blackList);
                     $modules = array_unique($modules);
                     if (empty($modules)) {
                         continue;
@@ -903,7 +910,8 @@ public function getAllFiles()
             ),
             $this->_prepareFiles('config', Files::init()->getConfigFiles()),
             $this->_prepareFiles('layout', Files::init()->getLayoutFiles()),
-            $this->_prepareFiles('template', Files::init()->getPhtmlFiles())
+            $this->_prepareFiles('template', Files::init()->getPhtmlFiles()),
+            $this->_prepareFiles('fixture', Files::composeDataSets($this->getFixtureFiles()), true)
         );
     }
 
@@ -1316,4 +1324,18 @@ private static function getAllowedDependencies(): array
         }
         return self::$allowedDependencies;
     }
+
+    /**
+     * Returns fixture files located in <module-directory>/Test/Fixture directory
+     *
+     * @return array
+     */
+    private function getFixtureFiles(): array
+    {
+        $fixtureDirs = [];
+        foreach (self::getComponentRegistrar()->getPaths(ComponentRegistrar::MODULE) as $moduleDir) {
+            $fixtureDirs[] = $moduleDir . '/Test/Fixture';
+        }
+        return Files::getFiles($fixtureDirs, '*.php');
+    }
 }