33582: Eliminated AspectMock from MagentoTestCase.php #863

anzin · 2021-07-26T12:34:24Z

Description

I've eliminated AspectMock from \tests\unit\Util\MagentoTestCase.

This PR needs to be merged after all PRs with the eliminated AspectMock, will be merged.

Related Pull Requests
#852
#857
#843
#837
#848
#846
#845
#859
#856
#855
#842
#839
#853
#840
#844
#850

Fixed Issues (if relevant)

Fixes [MFTF] Eliminate AspectMock from MagentoTestCase (Complex!) magento2#33582

Contribution checklist

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/verification tests (if applicable)
All automated tests passed successfully (all builds on Travis CI are green)
Changes to Framework doesn't have backward incompatible changes for tests or have related Pull Request with fixes to tests

andrewbess

Hello @anzin
Thank you for your contribution.
It looks well for me.

…ock-from-magento-test-case # Conflicts: # dev/tests/unit/Util/MagentoTestCase.php

bohdan-harniuk

Hello, @anzin!
Thank you for your contribution!

@jilu1, please, proceed with the code review!

Thanks, Bohdan

okolesnyk

Looks good except file_exist change
Could you please revert to how it was

okolesnyk · 2021-07-30T21:35:36Z

dev/tests/unit/Util/MagentoTestCase.php

    public static function setUpBeforeClass(): void
    {
-        if (!self::fileExists(DOCS_OUTPUT_DIR)) {
+        if (!file_exists(DOCS_OUTPUT_DIR)) {


Please revert this change
\PHPUnit\Framework\Assert::fileExists will exist in version which support PHP 8

okolesnyk · 2021-08-02T19:33:42Z

@anzin please take a look at my comment

…ing-framework into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case # Conflicts: # dev/tests/unit/Util/MagentoTestCase.php

…-aspect-mock-from-magento-test-case' into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case

anzin · 2021-08-03T17:13:34Z

Hello @okolesnyk, I've reverted the method fileExists(), please check if everything is well.

Thanks

okolesnyk · 2021-08-10T18:28:05Z

@magento import pull request to https://github.com/magento-commerce/magento2-functional-testing-framework

magento-engcom-team · 2021-08-10T18:29:10Z

@okolesnyk the pull request successfully imported.

jilu1

@anzin Please bring the branch up to date and fix unit test failures.

…ing-framework into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case

bohdan-harniuk

Hello, @anzin!
Thank you for your contribution!

Hello, @jilu1!

The branch is actualised.
Please proceed with the code review.

This PR should be merged last.

Thanks, Bohdan

bohdan-harniuk · 2021-08-11T15:15:40Z

@jilu1, all failed tests will be passed right after #861 and #865 would be merged.

Here is the result in the local env (two branches mentioned before were merged):

So, let’s here wait for those PRs to be merged.

Thanks, Bohdan

jilu1 · 2021-08-11T15:58:13Z

@bohdan-harniuk
All relevant PRs are merged. Please sync with develop and remove AspectMock from composer.json and update composer.lock.

Great Job on your team!

bohdan-harniuk · 2021-08-11T16:04:13Z

Thank you, @jilu1!

I'll proceed with the requested changes!

Thanks, Bohdan

…ing-framework into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case

bohdan-harniuk

@jilu1, I have removed AspectMock as a package from the composer.

But before doing this I fixed few files that still used AspectMock and removed its configuration from the _bootstrap.php file.

Please, proceed with the code review.

Thanks,
Bohdan

33582: Eliminated AspectMock from MagentoTestCase.php

c43042d

magento-engcom-team added Partner: Atwix partners-contribution Pull Request is created by Magento Partner labels Jul 26, 2021

andrewbess previously approved these changes Jul 26, 2021

View reviewed changes

andrewbess self-assigned this Jul 26, 2021

KevinBKozan self-requested a review July 26, 2021 19:53

KevinBKozan added the in progress label Jul 26, 2021

bohdan-harniuk self-requested a review July 27, 2021 07:32

bohdan-harniuk self-assigned this Jul 27, 2021

Merge branch 'develop' into improvement/mftf-33582-eliminate-aspect-m…

5d9c124

…ock-from-magento-test-case # Conflicts: # dev/tests/unit/Util/MagentoTestCase.php

bohdan-harniuk previously approved these changes Jul 29, 2021

View reviewed changes

bohdan-harniuk removed the in progress label Jul 29, 2021

bohdan-harniuk requested a review from jilu1 July 29, 2021 07:00

okolesnyk approved these changes Jul 30, 2021

View reviewed changes

okolesnyk added the in progress label Jul 30, 2021

okolesnyk requested changes Jul 30, 2021

View reviewed changes

okolesnyk self-assigned this Jul 30, 2021

anzin added 2 commits August 3, 2021 20:08

Merge branch 'develop' of github.com:magento/magento2-functional-test…

9469dc1

…ing-framework into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case # Conflicts: # dev/tests/unit/Util/MagentoTestCase.php

Merge remote-tracking branch 'origin/improvement/mftf-33582-eliminate…

5da4b93

…-aspect-mock-from-magento-test-case' into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case

anzin dismissed stale reviews from bohdan-harniuk and andrewbess via 5da4b93 August 3, 2021 17:09

okolesnyk previously approved these changes Aug 10, 2021

View reviewed changes

jilu1 reviewed Aug 11, 2021

View reviewed changes

jilu1 added the needs update label Aug 11, 2021

Merge branch 'develop' of github.com:magento/magento2-functional-test…

8269d88

…ing-framework into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case

bohdan-harniuk previously approved these changes Aug 11, 2021

View reviewed changes

bohdan-harniuk added 2 commits August 11, 2021 19:34

Merge branch 'develop' of github.com:magento/magento2-functional-test…

b94dbb7

…ing-framework into improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case

MFTF-33582: Eliminated AspectMock remnants

85513e8

bohdan-harniuk dismissed stale reviews from okolesnyk and themself via 4932fe6 August 11, 2021 21:07

bohdan-harniuk requested review from jilu1, bohdan-harniuk and andrewbess August 11, 2021 21:08

MFTF-33582: Removed AspectMock package

71596ba

bohdan-harniuk force-pushed the improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case branch from 4932fe6 to 71596ba Compare August 11, 2021 21:10

bohdan-harniuk previously approved these changes Aug 11, 2021

View reviewed changes

bohdan-harniuk requested a review from okolesnyk August 11, 2021 21:13

bohdan-harniuk dismissed their stale review via 9b2f9a3 August 11, 2021 21:21

bohdan-harniuk force-pushed the improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case branch from 9b2f9a3 to 4d71876 Compare August 11, 2021 21:22

MFTF-33582: Fixing verification test

6fa4ad0

bohdan-harniuk force-pushed the improvement/mftf-33582-eliminate-aspect-mock-from-magento-test-case branch from 4d71876 to 6fa4ad0 Compare August 11, 2021 22:11

bohdan-harniuk approved these changes Aug 11, 2021

View reviewed changes

eduard13 self-assigned this Aug 12, 2021

jilu1 removed needs update in progress labels Aug 12, 2021

jilu1 approved these changes Aug 12, 2021

View reviewed changes

andrewbess approved these changes Aug 12, 2021

View reviewed changes

magento-devops-reposync-svc merged commit cc0fc8b into magento:develop Aug 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

33582: Eliminated AspectMock from MagentoTestCase.php #863

33582: Eliminated AspectMock from MagentoTestCase.php #863

Uh oh!

anzin commented Jul 26, 2021 •

edited

Loading

Uh oh!

andrewbess left a comment

Uh oh!

bohdan-harniuk left a comment

Uh oh!

okolesnyk left a comment

Uh oh!

okolesnyk Jul 30, 2021 •

edited

Loading

Uh oh!

okolesnyk commented Aug 2, 2021

Uh oh!

anzin commented Aug 3, 2021 •

edited

Loading

Uh oh!

okolesnyk commented Aug 10, 2021

Uh oh!

magento-engcom-team commented Aug 10, 2021

Uh oh!

jilu1 left a comment

Uh oh!

bohdan-harniuk left a comment •

edited

Loading

Uh oh!

bohdan-harniuk commented Aug 11, 2021

Uh oh!

jilu1 commented Aug 11, 2021

Uh oh!

bohdan-harniuk commented Aug 11, 2021

Uh oh!

bohdan-harniuk left a comment

Uh oh!

Uh oh!

33582: Eliminated AspectMock from MagentoTestCase.php #863

33582: Eliminated AspectMock from MagentoTestCase.php #863

Uh oh!

Conversation

anzin commented Jul 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Fixed Issues (if relevant)

Contribution checklist

Uh oh!

andrewbess left a comment

Choose a reason for hiding this comment

Uh oh!

bohdan-harniuk left a comment

Choose a reason for hiding this comment

Uh oh!

okolesnyk left a comment

Choose a reason for hiding this comment

Uh oh!

okolesnyk Jul 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

okolesnyk commented Aug 2, 2021

Uh oh!

anzin commented Aug 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

okolesnyk commented Aug 10, 2021

Uh oh!

magento-engcom-team commented Aug 10, 2021

Uh oh!

jilu1 left a comment

Choose a reason for hiding this comment

Uh oh!

bohdan-harniuk left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bohdan-harniuk commented Aug 11, 2021

Uh oh!

jilu1 commented Aug 11, 2021

Uh oh!

bohdan-harniuk commented Aug 11, 2021

Uh oh!

bohdan-harniuk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

anzin commented Jul 26, 2021 •

edited

Loading

okolesnyk Jul 30, 2021 •

edited

Loading

anzin commented Aug 3, 2021 •

edited

Loading

bohdan-harniuk left a comment •

edited

Loading