diff --git a/php/composer.json b/php/composer.json index a07c73bf..55e66bc5 100644 --- a/php/composer.json +++ b/php/composer.json @@ -21,12 +21,13 @@ }, "autoload-dev": { "psr-4": { - "Tests\\": "tests/", + "Tests\\": "tests/approval/", + "PhpUnitTests\\": "tests/phpunit/", "BehatTests\\": "tests/behat/contexts/" } }, "scripts": { - "tests": "./vendor/bin/phpunit; ./vendor/bin/behat;", + "tests": "./vendor/bin/phpunit --testsuite UnitTests; ./vendor/bin/phpunit --testsuite ApprovalTests; ./vendor/bin/behat;", "test-coverage": "phpunit --coverage-html build/coverage", "check-cs": "ecs check", "fix-cs": "ecs check --fix", diff --git a/php/phpunit.xml b/php/phpunit.xml index 03f801e1..78b45a16 100644 --- a/php/phpunit.xml +++ b/php/phpunit.xml @@ -6,8 +6,11 @@ - - ./tests + + ./tests/approval + + + ./tests/phpunit diff --git a/php/tests/ApprovalTest.php b/php/tests/approval/ApprovalTest.php similarity index 93% rename from php/tests/ApprovalTest.php rename to php/tests/approval/ApprovalTest.php index 5de922a0..8b107430 100644 --- a/php/tests/ApprovalTest.php +++ b/php/tests/approval/ApprovalTest.php @@ -34,7 +34,7 @@ class ApprovalTest extends TestCase ob_start(); $argv = ['', '30']; - include(__DIR__ . '/../fixtures/texttest_fixture.php'); + include(__DIR__ . '/../../fixtures/texttest_fixture.php'); $output = ob_get_clean(); diff --git a/php/tests/GildedRoseTest.php b/php/tests/approval/GildedRoseTest.php similarity index 100% rename from php/tests/GildedRoseTest.php rename to php/tests/approval/GildedRoseTest.php diff --git a/php/tests/approvals/ApprovalTest.testFoo.approved.txt b/php/tests/approval/approvals/ApprovalTest.testFoo.approved.txt similarity index 100% rename from php/tests/approvals/ApprovalTest.testFoo.approved.txt rename to php/tests/approval/approvals/ApprovalTest.testFoo.approved.txt diff --git a/php/tests/approvals/ApprovalTest.testThirtyDays.approved.txt b/php/tests/approval/approvals/ApprovalTest.testThirtyDays.approved.txt similarity index 100% rename from php/tests/approvals/ApprovalTest.testThirtyDays.approved.txt rename to php/tests/approval/approvals/ApprovalTest.testThirtyDays.approved.txt diff --git a/php/tests/phpunit/ExampleTest.php b/php/tests/phpunit/ExampleTest.php new file mode 100644 index 00000000..ea7b98a0 --- /dev/null +++ b/php/tests/phpunit/ExampleTest.php @@ -0,0 +1,18 @@ +assertTrue(true); + } +}