Merge branch 'develop' into improvement/mftf-33584-eliminate-aspect-mock-from-object-handler-uti

Author: anzin

CHANGELOG.md

@@ -1,13 +1,30 @@
 Magento Functional Testing Framework Changelog
 ================================================
+3.6.0
+---------
+
+### Enhancements
+
+* Maintainability
+  * Updated composer dependencies to be PHP 8 compatible with the except of codeception/aspect-mock.
+    
+### GitHub Pull Requests:
+
+* [#830](https://github.com/magento/magento2-functional-testing-framework/pull/830) -- Add ability to configure multiple OTPs
+* [#832](https://github.com/magento/magento2-functional-testing-framework/pull/832) -- Updated monolog/monolog to ^2.2
+* [#833](https://github.com/magento/magento2-functional-testing-framework/pull/833) -- Removed usage of AspectMock in FilesystemTest
+* [#834](https://github.com/magento/magento2-functional-testing-framework/pull/834) -- Removed usage of AspectMock in AnnotationsCheckTest
+* [#838](https://github.com/magento/magento2-functional-testing-framework/pull/838) -- Removed usage of AspectMock in DeprecatedEntityUsageCheckTest
+* [#841](https://github.com/magento/magento2-functional-testing-framework/pull/841) -- Removed usage of AspectMock in GenerationErrorHandlerTest
+* [#854](https://github.com/magento/magento2-functional-testing-framework/pull/854) -- Updated "monolog" to the latest version 2.3.1
+
 3.5.1
 ---------
 
 ### GitHub Pull Requests:
 
 * [#825](https://github.com/magento/magento2-functional-testing-framework/pull/825) -- Update allure-codeception in order to support php8
 
-
 3.5.0
 ---------
 

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "3.5.1",
+    "version": "3.6.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

composer.lock

@@ -3,29 +3,38 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace tests\unit\Magento\FunctionalTestFramework\DataGenerator\Handlers\SecretStorage;
 
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\SecretStorage\FileStorage;
+use ReflectionClass;
 use tests\unit\Util\MagentoTestCase;
-use AspectMock\Test as AspectMock;
 
 class FileStorageTest extends MagentoTestCase
 {
-
     /**
      * Test basic encryption/decryption functionality in FileStorage class.
      */
-    public function testBasicEncryptDecrypt()
+    public function testBasicEncryptDecrypt(): void
     {
         $testKey = 'magento/myKey';
         $testValue = 'myValue';
-
-        AspectMock::double(FileStorage::class, [
-            'readInCredentialsFile' => ["$testKey=$testValue"]
-        ]);
+        $creds = ["$testKey=$testValue"];
 
         $fileStorage = new FileStorage();
+        $reflection = new ReflectionClass(FileStorage::class);
+
+        // Emulate initialize() function result with the test credentials
+        $reflectionMethod = $reflection->getMethod('encryptCredFileContents');
+        $reflectionMethod->setAccessible(true);
+        $secretData = $reflectionMethod->invokeArgs($fileStorage, [$creds]);
+
+        // Set encrypted test credentials to the private 'secretData' property
+        $reflectionProperty = $reflection->getProperty('secretData');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($fileStorage, $secretData);
+
         $encryptedCred = $fileStorage->getEncryptedValue($testKey);
 
         // assert the value we've gotten is in fact not identical to our test value

dev/tests/unit/Magento/FunctionalTestFramework/DataGenerator/Handlers/SecretStorage/FileStorageTest.php

@@ -3,26 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace tests\unit\Magento\FunctionalTestFramework\Test\Util;
 
-use AspectMock\Test as AspectMock;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
 use Magento\FunctionalTestingFramework\Exceptions\TestReferenceException;
 use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\Test\Objects\ActionObject;
 use Magento\FunctionalTestingFramework\Test\Util\ActionMergeUtil;
 use Magento\FunctionalTestingFramework\Test\Util\ActionObjectExtractor;
+use ReflectionProperty;
 use tests\unit\Util\MagentoTestCase;
 use tests\unit\Util\TestLoggingUtil;
 
 class ActionMergeUtilTest extends MagentoTestCase
 {
     /**
-     * Before test functionality
+     * Before test functionality.
+     *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         TestLoggingUtil::getInstance()->setMockLoggingUtil();
     }
@@ -31,8 +34,10 @@ public function setUp(): void
      * Test to validate actions are properly ordered during a merge.
      *
      * @return void
+     * @throws TestReferenceException
+     * @throws XmlException
      */
-    public function testResolveActionStepOrdering()
+    public function testResolveActionStepOrdering(): void
     {
         $actions = [];
         $actionsLength = 11;
@@ -46,7 +51,6 @@ public function testResolveActionStepOrdering()
             $stepKey = 'stepKey'. $i;
             $type = 'testType';
             $actionAttributes = [];
-
             $actions[] = new ActionObject($stepKey, $type, $actionAttributes);
         }
 
@@ -93,8 +97,10 @@ public function testResolveActionStepOrdering()
      * Test to validate action steps properly resolve entity data references.
      *
      * @return void
+     * @throws TestReferenceException
+     * @throws XmlException
      */
-    public function testResolveActionStepEntityData()
+    public function testResolveActionStepEntityData(): void
     {
         $dataObjectName = 'myObject';
         $dataObjectType = 'testObject';
@@ -110,36 +116,35 @@ public function testResolveActionStepEntityData()
         $mockDataObject = new EntityDataObject($dataObjectName, $dataObjectType, $mockData, null, null, null);
 
         // Set up mock DataObject Handler
-        $mockDOHInstance = AspectMock::double(DataObjectHandler::class, ['getObject' => $mockDataObject])->make();
-        AspectMock::double(DataObjectHandler::class, ['getInstance' => $mockDOHInstance]);
+        $mockDOHInstance = $this->createMock(DataObjectHandler::class);
+        $mockDOHInstance
+            ->expects($this->any())
+            ->method('getObject')
+            ->willReturn($mockDataObject);
+        $property = new ReflectionProperty(DataObjectHandler::class, 'INSTANCE');
+        $property->setAccessible(true);
+        $property->setValue($mockDOHInstance, $mockDOHInstance);
 
         // Create test object and action object
         $actionAttributes = [$userInputKey => $userInputValue];
         $actions[$actionName] = new ActionObject($actionName, $actionType, $actionAttributes);
-
         $this->assertEquals($userInputValue, $actions[$actionName]->getCustomActionAttributes()[$userInputKey]);
 
         $mergeUtil = new ActionMergeUtil("test", "TestCase");
         $resolvedActions = $mergeUtil->resolveActionSteps($actions);
-
         $this->assertEquals($dataFieldValue, $resolvedActions[$actionName]->getCustomActionAttributes()[$userInputKey]);
     }
 
     /**
      * Verify that an XmlException is thrown when an action references a non-existant action.
      *
-     * @throws TestReferenceException
-     * @throws XmlException
      * @return void
-     */
-    /**
      * @throws TestReferenceException
      * @throws XmlException
      */
-    public function testNoActionException()
+    public function testNoActionException(): void
     {
         $actionObjects = [];
-
         $actionObjects[] = new ActionObject('actionKey1', 'bogusType', []);
         $actionObjects[] = new ActionObject(
             'actionKey2',
@@ -149,20 +154,19 @@ public function testNoActionException()
             ActionObject::MERGE_ACTION_ORDER_BEFORE
         );
 
-        $this->expectException(\Magento\FunctionalTestingFramework\Exceptions\XmlException::class);
-
+        $this->expectException(XmlException::class);
         $actionMergeUtil = new ActionMergeUtil("actionMergeUtilTest", "TestCase");
         $actionMergeUtil->resolveActionSteps($actionObjects);
     }
 
     /**
      * Verify that a <waitForPageLoad> action is added after actions that have a wait (timeout property).
      *
+     * @return void
      * @throws TestReferenceException
      * @throws XmlException
-     * @return void
      */
-    public function testInsertWait()
+    public function testInsertWait(): void
     {
         $actionObjectOne = new ActionObject('actionKey1', 'bogusType', []);
         $actionObjectOne->setTimeout(42);
@@ -185,10 +189,11 @@ public function testInsertWait()
     /**
      * Verify that a <fillField> action is replaced by <fillSecretField> when secret _CREDS are referenced.
      *
+     * @return void
      * @throws TestReferenceException
      * @throws XmlException
      */
-    public function testValidFillFieldSecretFunction()
+    public function testValidFillFieldSecretFunction(): void
     {
         $actionObjectOne = new ActionObject(
             'actionKey1',
@@ -198,7 +203,6 @@ public function testValidFillFieldSecretFunction()
         $actionObject = [$actionObjectOne];
 
         $actionMergeUtil = new ActionMergeUtil('actionMergeUtilTest', 'TestCase');
-
         $result = $actionMergeUtil->resolveActionSteps($actionObject);
 
         $expectedValue = new ActionObject(
@@ -212,10 +216,11 @@ public function testValidFillFieldSecretFunction()
     /**
      * Verify that a <magentoCLI> action uses <magentoCLI> when secret _CREDS are referenced.
      *
+     * @return void
      * @throws TestReferenceException
      * @throws XmlException
      */
-    public function testValidMagentoCLISecretFunction()
+    public function testValidMagentoCLISecretFunction(): void
     {
         $actionObjectOne = new ActionObject(
             'actionKey1',
@@ -225,7 +230,6 @@ public function testValidMagentoCLISecretFunction()
         $actionObject = [$actionObjectOne];
 
         $actionMergeUtil = new ActionMergeUtil('actionMergeUtilTest', 'TestCase');
-
         $result = $actionMergeUtil->resolveActionSteps($actionObject);
 
         $expectedValue = new ActionObject(
@@ -239,10 +243,11 @@ public function testValidMagentoCLISecretFunction()
     /**
      * Verify that a <field> override in a <createData> action uses <field> when secret _CREDS are referenced.
      *
+     * @return void
      * @throws TestReferenceException
      * @throws XmlException
      */
-    public function testValidCreateDataSecretFunction()
+    public function testValidCreateDataSecretFunction(): void
     {
         $actionObjectOne = new ActionObject(
             'actionKey1',
@@ -252,7 +257,6 @@ public function testValidCreateDataSecretFunction()
         $actionObject = [$actionObjectOne];
 
         $actionMergeUtil = new ActionMergeUtil('actionMergeUtilTest', 'TestCase');
-
         $result = $actionMergeUtil->resolveActionSteps($actionObject);
 
         $expectedValue = new ActionObject(
@@ -266,10 +270,11 @@ public function testValidCreateDataSecretFunction()
     /**
      * Verify that a <click> action throws an exception when secret _CREDS are referenced.
      *
+     * @return void
      * @throws TestReferenceException
      * @throws XmlException
      */
-    public function testInvalidSecretFunctions()
+    public function testInvalidSecretFunctions(): void
     {
         $this->expectException(TestReferenceException::class);
         $this->expectExceptionMessage(
@@ -288,7 +293,8 @@ public function testInvalidSecretFunctions()
     }
 
     /**
-     * After class functionality
+     * After class functionality.
+     *
      * @return void
      */
     public static function tearDownAfterClass(): void