Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- 'tests/**.php'
- 'spark'
- composer.json
- phpunit.xml.dist
- phpunit.dist.xml
- .github/workflows/test-phpunit.yml
- .github/workflows/reusable-phpunit-test.yml

Expand All @@ -25,7 +25,7 @@ on:
- 'tests/**.php'
- 'spark'
- composer.json
- phpunit.xml.dist
- phpunit.dist.xml
- .github/workflows/test-phpunit.yml
- .github/workflows/reusable-phpunit-test.yml

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-random-execution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- '.github/scripts/run-random-tests.sh'
- '.github/scripts/random-tests-config.txt'
- '.github/workflows/test-random-execution.yml'
- 'phpunit.xml.dist'
- 'phpunit.dist.xml'
- 'system/**.php'
- 'tests/**.php'

Expand All @@ -21,7 +21,7 @@ on:
- '.github/scripts/run-random-tests.sh'
- '.github/scripts/random-tests-config.txt'
- '.github/workflows/test-random-execution.yml'
- 'phpunit.xml.dist'
- 'phpunit.dist.xml'
- 'system/**.php'
- 'tests/**.php'

Expand Down
2 changes: 1 addition & 1 deletion admin/starter/builds
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if (is_file($file)) {

$files = [
__DIR__ . DIRECTORY_SEPARATOR . 'app/Config/Paths.php',
__DIR__ . DIRECTORY_SEPARATOR . 'phpunit.xml.dist',
__DIR__ . DIRECTORY_SEPARATOR . 'phpunit.dist.xml',
__DIR__ . DIRECTORY_SEPARATOR . 'phpunit.xml',
];

Expand Down
4 changes: 2 additions & 2 deletions admin/starter/tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ The HTML files can be viewed by opening **tests/coverage/index.html** in your fa

## PHPUnit XML Configuration

The repository has a ``phpunit.xml.dist`` file in the project root that's used for
The repository has a ``phpunit.dist.xml`` file in the project root that's used for
PHPUnit configuration. This is used to provide a default configuration if you
do not have your own configuration file in the project root.

The normal practice would be to copy ``phpunit.xml.dist`` to ``phpunit.xml``
The normal practice would be to copy ``phpunit.dist.xml`` to ``phpunit.xml``
(which is git ignored), and to tailor it as you see fit.
For instance, you might wish to exclude database tests, or automatically generate
HTML code coverage reports.
Expand Down
4 changes: 2 additions & 2 deletions admin/starter/tests/unit/HealthTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function testBaseUrlHasBeenSet(): void

if ($env) {
// BaseURL in .env is a valid URL?
// phpunit.xml.dist sets app.baseURL in $_SERVER
// phpunit.dist.xml sets app.baseURL in $_SERVER
// So if you set app.baseURL in .env, it takes precedence
$config = new App();
$this->assertTrue(
Expand All @@ -37,7 +37,7 @@ public function testBaseUrlHasBeenSet(): void
}

// Get the baseURL in app/Config/App.php
// You can't use Config\App, because phpunit.xml.dist sets app.baseURL
// You can't use Config\App, because phpunit.dist.xml sets app.baseURL
$reader = new ConfigReader();

// BaseURL in app/Config/App.php is a valid URL?
Expand Down
4 changes: 2 additions & 2 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ as a comprehensive collection of HTML files that show the status of every line o

## PHPUnit XML Configuration

The repository has a ``phpunit.xml.dist`` file in the project root that's used for
The repository has a ``phpunit.dist.xml`` file in the project root that's used for
PHPUnit configuration. This is used to provide a default configuration if you
do not have your own configuration file in the project root.

The normal practice would be to copy ``phpunit.xml.dist`` to ``phpunit.xml``
The normal practice would be to copy ``phpunit.dist.xml`` to ``phpunit.xml``
(which is git ignored), and to tailor it as you see fit.
For instance, you might wish to exclude database tests, or automatically generate
HTML code coverage reports.
Loading