Skip to content

Commit

Permalink
Move PHPUnit test from tests to tests/unit folder for integration tes…
Browse files Browse the repository at this point in the history
…t compatibility reasons
  • Loading branch information
wagnert committed Mar 24, 2018
1 parent 9a8d6c5 commit f50b2bd
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 29 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# Version 1.0.0

## Bugfixes

* None

## Features

* Move PHPUnit test from tests to tests/unit folder for integration test compatibility reasons

# Version 1.0.0-beta29

## Bugfixes
Expand Down
4 changes: 1 addition & 3 deletions RoboFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ class RoboFile extends \Robo\Tasks
'src.dir' => __DIR__ . '/src',
'dist.dir' => __DIR__ . '/dist',
'vendor.dir' => __DIR__ . '/vendor',
'target.dir' => __DIR__ . '/target',
'webapp.name' => 'import-cli-simple',
'webapp.version' => '1.0.0-alpha5'
'target.dir' => __DIR__ . '/target'
);

/**
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "techdivision/import-product-ee",
"description": "M2IF library providing basic Magento 2 EE product import functionality",
"minimum-stability": "alpha",
"license": "OSL-3.0",
"require": {
"php": ">=5.6.0",
"techdivision/import-ee": "~1.0",
"techdivision/import-product": "~1.0"
},
Expand All @@ -17,7 +17,7 @@
"phpunit/phpunit": "4.4.*",
"sebastian/phpcpd": "2.0.*",
"squizlabs/php_codesniffer": "2.2.*",
"phpdocumentor/phpdocumentor": "2.8.*",
"phpdocumentor/phpdocumentor": "2.9.*",
"consolidation/robo": "~1.0"
},
"authors": [
Expand All @@ -30,8 +30,8 @@
"psr-4": {
"TechDivision\\Import\\Product\\Ee\\": [
"src/",
"tests/",
"symfony/"
"symfony/",
"tests/unit"
]
}
}
Expand Down
45 changes: 23 additions & 22 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<phpunit>
<testsuites>
<testsuite name="techdivision/import-product-ee PHPUnit testsuite">
<directory suffix="Test.php">tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src</directory>
<exclude>
<directory prefix="Mock">src</directory>
<directory suffix="Test.php">src</directory>
</exclude>
</whitelist>
</filter>
<logging>
<log type="coverage-html" target="target/reports/unit/coverage" />
<log type="coverage-clover" target="target/reports/unit/clover.xml" />
<log type="junit" target="target/reports/unit/junit.xml" logIncompleteSkipped="false" />
</logging>
<php>
<ini name="date.timezone" value="Europe/Berlin" />
</php>
<testsuites>
<testsuite name="techdivision/import-product-ee PHPUnit testsuite">
<directory suffix="Test.php">tests/unit</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src</directory>
<exclude>
<directory prefix="Mock">src</directory>
<directory suffix="Test.php">src</directory>
</exclude>
</whitelist>
</filter>
<logging>
<log type="coverage-html" target="target/reports/unit/coverage" />
<log type="coverage-clover" target="target/reports/unit/clover.xml" />
<log type="junit" target="target/reports/unit/junit.xml"
logIncompleteSkipped="false" />
</logging>
<php>
<ini name="date.timezone" value="Europe/Berlin" />
</php>
</phpunit>
File renamed without changes.

0 comments on commit f50b2bd

Please sign in to comment.