Skip to content

Commit d16535f

Browse files
committed
Use pds-skeleton standard for src and tests directories
1 parent f8949b8 commit d16535f

14 files changed

+11
-10
lines changed

.travis/before_script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ composer require ${COMPOSER_PACKAGE_NAME}:dev-${TRAVIS_BRANCH}\#{$TRAVIS_COMMIT}
3030
# prepare for test suite
3131
case $TEST_SUITE in
3232
integration)
33-
cp vendor/$COMPOSER_PACKAGE_NAME/Test/Integration/phpunit.xml.dist dev/tests/integration/phpunit.xml
33+
cp vendor/$COMPOSER_PACKAGE_NAME/tests/Integration/phpunit.xml.dist dev/tests/integration/phpunit.xml
3434

3535
cd dev/tests/integration
3636

@@ -45,6 +45,6 @@ case $TEST_SUITE in
4545
cd ../../..
4646
;;
4747
unit)
48-
cp vendor/$COMPOSER_PACKAGE_NAME/Test/Unit/phpunit.xml.dist dev/tests/unit/phpunit.xml
48+
cp vendor/$COMPOSER_PACKAGE_NAME/tests/Unit/phpunit.xml.dist dev/tests/unit/phpunit.xml
4949
;;
5050
esac

composer.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@
2424
],
2525
"autoload": {
2626
"files": [
27-
"registration.php"
27+
"src/registration.php"
2828
],
2929
"psr-4": {
30-
"IntegerNet\\SessionUnblocker\\": ""
30+
"IntegerNet\\SessionUnblocker\\": "src/"
31+
}
32+
},
33+
"autoload-dev": {
34+
"psr-4": {
35+
"IntegerNet\\SessionUnblocker\\Test\\": "tests/"
3136
}
3237
},
3338
"repositories": [
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Test/Integration/AbstractSessionTest.php renamed to tests/Integration/AbstractSessionTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@
55

66
use IntegerNet\SessionUnblocker\Plugin\SessionStoragePlugin;
77
use IntegerNet\SessionUnblocker\Test\Util\MethodLog;
8-
use IntegerNet\SessionUnblocker\Test\Util\ProfilerSpy;
98
use IntegerNet\SessionUnblocker\Test\Util\SectionLoadActionSpy;
109
use IntegerNet\SessionUnblocker\Test\Util\SessionSpy;
11-
use IntegerNet\SessionUnblocker\Test\Util\SessionSpyCustomer;
12-
use IntegerNet\SessionUnblocker\Test\Util\SessionSpyMessage;
13-
use IntegerNet\SessionUnblocker\Test\Util\SessionStorageSpy;
1410
use Magento\Customer\Controller\Section\Load as LoadAction;
1511
use Magento\Framework\Session\Generic as GenericSession;
1612
use Magento\TestFramework\Helper\Bootstrap;
File renamed without changes.

Test/Integration/phpunit.xml.dist renamed to tests/Integration/phpunit.xml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<!-- Test suites definition -->
1616
<testsuites>
1717
<testsuite name="SessionUnblocker Integration Tests">
18-
<directory suffix="Test.php">../../../vendor/integer-net/magento2-session-unblocker/Test/Integration</directory>
18+
<directory suffix="Test.php">../../../vendor/integer-net/magento2-session-unblocker/tests/Integration</directory>
1919
</testsuite>
2020
</testsuites>
2121
<!-- Code coverage filters -->
2222
<filter>
2323
<whitelist addUncoveredFilesFromWhiteList="true">
2424
<directory suffix=".php">../../../vendor/integer-net/magento2-session-unblocker</directory>
2525
<exclude>
26-
<directory>../../../vendor/integer-net/magento2-session-unblocker/Test</directory>
26+
<directory>../../../vendor/integer-net/magento2-session-unblocker/tests</directory>
2727
</exclude>
2828
</whitelist>
2929
</filter>
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)