ISSUE-27500: Fixed unit tests for module Magento_SampleData #27598

andrewbess · 2020-04-04T20:54:20Z

Description (*)

This PR partially updates unit tests in SampleData module
Other tests of this module have been updated in #27481

Related Pull Requests

Fixed Issues (if relevant)

Unit Tests incompatible with PHPUnit 8 #27500: Unit Tests incompatible with PHPUnit 8

Manual testing scenarios (*)

Run tests in phpunit 6 (currently in 2.4-develop) using vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist app/code/Magento/SampleData/
Install phpunit 8, run tests using vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist app/code/Magento/SampleData/

Questions or comments

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/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

m2-assistant · 2020-04-04T20:54:23Z

Hi @andrewbess. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Guide documentation.

lbajsarowicz

Please review the comments. Only minor changes to be introduced.

app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

lbajsarowicz · 2020-04-05T02:42:59Z

app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

@@ -197,11 +210,11 @@ public function stubComposerJsonReader(array $composerJsonContent)
    }

    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject


Suggested change

* @return MockObject

* @return ReadInterface|MockObject

lbajsarowicz · 2020-04-05T02:43:28Z

app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

@@ -178,11 +190,12 @@ public static function dataPackagesFromComposerSuggest()

    /**
     * @param array $composerJsonContent
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject


Suggested change

* @return MockObject

* @return ReadInterface|MockObject

lbajsarowicz · 2020-04-05T02:43:39Z

app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

+    public function stubComposerJsonReader(
+        array $composerJsonContent
+    ): MockObject {


Suggested change

public function stubComposerJsonReader(

array $composerJsonContent

): MockObject {

public function stubComposerJsonReader(array $composerJsonContent): MockObject {

magento-engcom-team · 2020-04-05T03:44:36Z

Hi @lbajsarowicz, thank you for the review.
ENGCOM-7263 has been created to process this Pull Request
✳️ @lbajsarowicz, could you please add one of the following labels to the Pull Request?

Label	Description
`Auto-Tests: Covered`	All changes in Pull Request is covered by auto-tests
`Auto-Tests: Not Covered`	Changes in Pull Request requires coverage by auto-tests
`Auto-Tests: Not Required`	Changes in Pull Request does not require coverage by auto-tests

lbajsarowicz

✔️ Great job, thank you for your contribution.

magento-engcom-team · 2020-04-05T09:52:31Z

Hi @lbajsarowicz, thank you for the review.
ENGCOM-7263 has been created to process this Pull Request

engcom-Alfa

Hi @andrewbess

During testing, we faced the issue

PHPUnit 8

Run: vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist app/code/Magento/SampleData/

Actual Result:

@andrewbess Could you take a look?
Thanks!

Pull Request state was updated. Re-review required.

andrewbess · 2020-04-15T17:52:06Z

Hello @engcom-Alfa
It has already done earlier in #27481 but still doesn't merged.

slavvka · 2020-04-16T14:48:39Z

@andrewbess Please resolve the conflict

…ps://github.com/andrewbess/magento2 into ISSUE-27500/Magento_SampleData � Conflicts: � app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

andrewbess · 2020-04-17T12:27:05Z

Hello @slavvka
Done.
Please check.
Thank you in advance.

lbajsarowicz

Looks fine for me.

app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

m2-assistant · 2020-04-17T16:11:50Z

Hi @andrewbess, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

ISSUE-27500: Fixed unit tests for module Magento_SampleData

5df8881

ghost added the Progress: pending review label Apr 4, 2020

magento-engcom-team added Component: SampleData Release Line: 2.4 Partner: Atwix Pull Request is created by partner Atwix partners-contribution Pull Request is created by Magento Partner Event: Global-Contribution-Day labels Apr 4, 2020

andrewbess requested a review from lbajsarowicz April 5, 2020 02:40

lbajsarowicz suggested changes Apr 5, 2020

View reviewed changes

ghost assigned lbajsarowicz Apr 5, 2020

ghost added Progress: needs update and removed Progress: pending review labels Apr 5, 2020

Fixed tests according to reviewer request

dce23ec

lbajsarowicz approved these changes Apr 5, 2020

View reviewed changes

ghost added Progress: ready for testing and removed Progress: needs update labels Apr 5, 2020

dmytro-ch added the Auto-Tests: Covered All changes in Pull Request is covered by auto-tests label Apr 5, 2020

lbajsarowicz previously approved these changes Apr 5, 2020

View reviewed changes

engcom-Alfa self-assigned this Apr 9, 2020

ghost added Progress: testing in progress and removed Progress: ready for testing labels Apr 9, 2020

engcom-Alfa requested changes Apr 9, 2020

View reviewed changes

ghost added Progress: needs update and removed Progress: testing in progress labels Apr 9, 2020

slavvka changed the base branch from 2.4-develop to phpunit8 April 16, 2020 14:48

Merge branches 'ISSUE-27500/Magento_SampleData' and 'phpunit8' of htt…

d12e189

…ps://github.com/andrewbess/magento2 into ISSUE-27500/Magento_SampleData � Conflicts: � app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

lbajsarowicz approved these changes Apr 17, 2020

View reviewed changes

app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php Show resolved Hide resolved

ghost added Progress: ready for testing and removed Progress: needs update labels Apr 17, 2020

slavvka approved these changes Apr 17, 2020

View reviewed changes

ghost assigned slavvka Apr 17, 2020

slavvka merged commit b93e9c4 into magento:phpunit8 Apr 17, 2020

ghost added Progress: extended testing Progress: accept and removed Progress: ready for testing Progress: extended testing labels Apr 21, 2020

magento-engcom-team mentioned this pull request May 1, 2020

Unit Tests incompatible with PHPUnit 8 #27500

Closed

andrewbess deleted the ISSUE-27500/Magento_SampleData branch October 28, 2020 09:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

ISSUE-27500: Fixed unit tests for module Magento_SampleData #27598

ISSUE-27500: Fixed unit tests for module Magento_SampleData #27598

Uh oh!

andrewbess commented Apr 4, 2020

Uh oh!

m2-assistant bot commented Apr 4, 2020

Uh oh!

lbajsarowicz left a comment

Uh oh!

Uh oh!

lbajsarowicz Apr 5, 2020

Uh oh!

lbajsarowicz Apr 5, 2020

Uh oh!

lbajsarowicz Apr 5, 2020

Uh oh!

magento-engcom-team commented Apr 5, 2020

Uh oh!

lbajsarowicz left a comment

Uh oh!

magento-engcom-team commented Apr 5, 2020

Uh oh!

engcom-Alfa left a comment

Uh oh!

andrewbess commented Apr 15, 2020 •

edited

Loading

Uh oh!

slavvka commented Apr 16, 2020

Uh oh!

andrewbess commented Apr 17, 2020

Uh oh!

lbajsarowicz left a comment

Uh oh!

Uh oh!

m2-assistant bot commented Apr 17, 2020

Uh oh!

Uh oh!

ISSUE-27500: Fixed unit tests for module Magento_SampleData #27598

ISSUE-27500: Fixed unit tests for module Magento_SampleData #27598

Uh oh!

Conversation

andrewbess commented Apr 4, 2020

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Uh oh!

m2-assistant bot commented Apr 4, 2020

Uh oh!

lbajsarowicz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lbajsarowicz Apr 5, 2020

Choose a reason for hiding this comment

Uh oh!

lbajsarowicz Apr 5, 2020

Choose a reason for hiding this comment

Uh oh!

lbajsarowicz Apr 5, 2020

Choose a reason for hiding this comment

Uh oh!

magento-engcom-team commented Apr 5, 2020

Uh oh!

lbajsarowicz left a comment

Choose a reason for hiding this comment

Uh oh!

magento-engcom-team commented Apr 5, 2020

Uh oh!

engcom-Alfa left a comment

Choose a reason for hiding this comment

Uh oh!

andrewbess commented Apr 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

slavvka commented Apr 16, 2020

Uh oh!

andrewbess commented Apr 17, 2020

Uh oh!

lbajsarowicz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

m2-assistant bot commented Apr 17, 2020

Uh oh!

Uh oh!

andrewbess commented Apr 15, 2020 •

edited

Loading