Compare commits

...

8 Commits

Author SHA1 Message Date
5ae061d208 release: release: v2.3.0 2023-03-28 10:16:29 +01:00
3d7e621b7d chore: phpunit >10.0.19 support 2023-03-28 10:11:58 +01:00
bf14c4262a Merge pull request #740 from faissaloux/scheduled-workflows-condition
[2.x] Run scheduled workflows only on origin repo
2023-03-28 08:48:42 +01:00
b186d7a4ee Merge pull request #743 from pestphp/feat/uses-hint
[2.x] Adds `uses()` hint
2023-03-28 08:13:10 +01:00
e109cd1da2 feat: uses()hint 2023-03-28 01:48:46 +01:00
473f295b77 run scheduled workflows only on origin repo 2023-03-25 01:48:18 +00:00
5df46d03c3 Merge pull request #739 from dansysanalyst/fix_inconsistent_dataset_spelling
Inconsistency in spelling of "dataset"
2023-03-24 16:22:28 +00:00
19424ae06d fix inconsistency in dataset spelling 2023-03-24 16:00:33 +01:00
15 changed files with 86 additions and 41 deletions

View File

@ -8,6 +8,7 @@ on:
jobs:
ci:
if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
runs-on: ${{ matrix.os }}
strategy:
matrix:

View File

@ -8,6 +8,7 @@ on:
jobs:
static:
if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
name: Static Tests
runs-on: ubuntu-latest

View File

@ -9,6 +9,7 @@ on:
jobs:
ci:
if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
runs-on: ${{ matrix.os }}
strategy:
matrix:

View File

@ -2,6 +2,17 @@
## Unreleased
## [v2.3.0 (2023-03-28)](https://github.com/pestphp/pest/compare/v2.2.3...v2.3.0)
### Added
- Better error handler about missing uses ([#743](https://github.com/pestphp/pest/pull/743))
### Fixed
- Inconsistent spelling of `dataset` ([#739](https://github.com/pestphp/pest/pull/739))
### Chore
- Bumps PHPUnit to `^10.0.19` ([3d7e621](https://github.com/pestphp/pest/commit/3d7e621b7dfc03f0b2d9dcf6eb06c26bc383f502))
## [v2.2.3 (2023-03-24)](https://github.com/pestphp/pest/compare/v2.2.2...v2.2.3)
### Fixed

View File

@ -23,11 +23,11 @@
"nunomaduro/termwind": "^1.15.1",
"pestphp/pest-plugin": "^2.0.1",
"pestphp/pest-plugin-arch": "^2.0.2",
"phpunit/phpunit": "^10.0.18"
"phpunit/phpunit": "^10.0.19"
},
"conflict": {
"webmozart/assert": "<1.11.0",
"phpunit/phpunit": ">10.0.18"
"phpunit/phpunit": ">10.0.19"
},
"autoload": {
"psr-4": {

View File

@ -107,7 +107,7 @@ final class NameFilterIterator extends RecursiveFilterIterator
if (preg_match('/^(.*?)#(\d+)(?:-(\d+))?$/', $filter, $matches)) {
if (isset($matches[3]) && $matches[2] < $matches[3]) {
$filter = sprintf(
'%s.*with data set #(\d+)$',
'%s.*with dataset #(\d+)$',
$matches[1]
);
@ -115,7 +115,7 @@ final class NameFilterIterator extends RecursiveFilterIterator
$this->filterMax = (int) $matches[3];
} else {
$filter = sprintf(
'%s.*with data set #%s$',
'%s.*with dataset #%s$',
$matches[1],
$matches[2]
);
@ -125,7 +125,7 @@ final class NameFilterIterator extends RecursiveFilterIterator
// * testDetermineJsonError@JSON.*
elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
$filter = sprintf(
'%s.*with data set "%s"$',
'%s.*with dataset "%s"$',
$matches[1],
$matches[2]
);

View File

@ -6,7 +6,7 @@ namespace Pest;
function version(): string
{
return '2.2.3';
return '2.3.0';
}
function testDirectory(string $file = ''): string

View File

@ -235,6 +235,6 @@ final class DatasetsRepository
return sprintf('(%s)', $exporter->shortenedRecursiveExport($data));
}
return sprintf('data set "%s"', $key);
return sprintf('dataset "%s"', $key);
}
}

View File

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Pest\Support;
use Closure;
use PHPUnit\Framework\TestCase;
use Throwable;
/**
@ -15,8 +16,7 @@ final class ExceptionTrace
private const UNDEFINED_METHOD = 'Call to undefined method P\\';
/**
* Ensures the given closure reports
* the good execution context.
* Ensures the given closure reports the good execution context.
*
* @return mixed
*
@ -28,8 +28,14 @@ final class ExceptionTrace
return $closure();
} catch (Throwable $throwable) {
if (Str::startsWith($message = $throwable->getMessage(), self::UNDEFINED_METHOD)) {
$class = preg_match('/^Call to undefined method ([^:]+)::/', $message, $matches) === false ? null : $matches[1];
$message = str_replace(self::UNDEFINED_METHOD, 'Call to undefined method ', $message);
if (class_exists($class) && count(class_parents($class)) > 0 && array_values(class_parents($class))[0] === TestCase::class) {
$message .= '. Did you forget to use the [uses()] function? https://pestphp.com/docs/configuring-tests';
}
Reflection::setPropertyValue($throwable, 'message', $message);
}

View File

@ -1,5 +1,5 @@
Pest Testing Framework 2.2.3.
Pest Testing Framework 2.3.0.
USAGE: pest <file> [options]
@ -43,17 +43,17 @@
--enforce-time-limit ................. Enforce time limit based on test size
--default-time-limit [sec] Timeout in seconds for tests that have no declared size
--dont-report-useless-tests .. Do not report tests that do not test anything
--stop-on-defect ................. Stop execution upon first not-passed test
--stop-on-error ............................ Stop execution upon first error
--stop-on-failure ............... Stop execution upon first error or failure
--stop-on-warning ........................ Stop execution upon first warning
--stop-on-risky ....................... Stop execution upon first risky test
--stop-on-skipped ................... Stop execution upon first skipped test
--stop-on-incomplete ............. Stop execution upon first incomplete test
--fail-on-incomplete .................... Treat incomplete tests as failures
--fail-on-risky .............................. Treat risky tests as failures
--fail-on-skipped .......................... Treat skipped tests as failures
--fail-on-warning .................... Treat tests with warnings as failures
--stop-on-defect ... Stop after first error, failure, warning or, risky test
--stop-on-error ..................................... Stop after first error
--stop-on-failure ................................. Stop after first failure
--stop-on-warning ................................. Stop after first warning
--stop-on-risky ................................ Stop after first risky test
--stop-on-skipped ............................ Stop after first skipped test
--stop-on-incomplete ...................... Stop after first incomplete test
--fail-on-warning Signal failure using shell exit code when a warning was triggered
--fail-on-risky Signal failure using shell exit code when a test was considered risky
--fail-on-skipped Signal failure using shell exit code when a test was skipped
--fail-on-incomplete Signal failure using shell exit code when a test was marked incomplete
--cache-result ............................ Write test results to cache file
--do-not-cache-result .............. Do not write test results to cache file
--order-by [order] Run tests in order: default|defects|depends|duration|no-depends|random|reverse|size

View File

@ -60,8 +60,8 @@
✓ eager wrapped registered datasets with (1)
✓ eager wrapped registered datasets with (2)
✓ eager registered wrapped datasets did the job right
✓ named datasets with data set "one"
✓ named datasets with data set "two"
✓ named datasets with dataset "one"
✓ named datasets with dataset "two"
✓ named datasets did the job right
✓ lazy named datasets with (Bar Object (…))
✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #1
@ -96,10 +96,10 @@
✓ eager wrapped registered multiple datasets with (2) / (1)
✓ eager wrapped registered multiple datasets with (2) / (2)
✓ eager wrapped registered multiple datasets did the job right
✓ named multiple datasets with data set "one" / data set "three"
✓ named multiple datasets with data set "one" / data set "four"
✓ named multiple datasets with data set "two" / data set "three"
✓ named multiple datasets with data set "two" / data set "four"
✓ named multiple datasets with dataset "one" / dataset "three"
✓ named multiple datasets with dataset "one" / dataset "four"
✓ named multiple datasets with dataset "two" / dataset "three"
✓ named multiple datasets with dataset "two" / dataset "four"
✓ named multiple datasets did the job right
✓ more than two datasets with (1) / (3) / (5)
✓ more than two datasets with (1) / (3) / (6)
@ -115,8 +115,8 @@
✓ eager registered wrapped datasets with Generator functions with (3)
✓ eager registered wrapped datasets with Generator functions with (4)
✓ eager registered wrapped datasets with Generator functions did the job right
✓ eager registered wrapped datasets with Generator functions display description with data set "taylor"
✓ eager registered wrapped datasets with Generator functions display description with data set "james"
✓ eager registered wrapped datasets with Generator functions display description with dataset "taylor"
✓ eager registered wrapped datasets with Generator functions display description with dataset "james"
✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #1
✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #2
✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #1
@ -903,6 +903,10 @@
✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…rs.php') #2
✓ it computes the dataset scope with ('/var/www/project/tests/Featur…ts.php', '/var/www/project/tests/Featur…ollers')
PASS Tests\Unit\Support\ExceptionTrace
✓ it ensures the given closures reports the correct class name
✓ it ensures the given closures reports the correct class name and suggests the [uses()] function
PASS Tests\Unit\Support\Reflection
✓ it gets file name from closure
✓ it gets property values
@ -1004,4 +1008,4 @@
PASS Tests\Visual\Version
✓ visual snapshot of help command output
Tests: 2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 14 skipped, 703 passed (1702 assertions)
Tests: 2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 14 skipped, 705 passed (1706 assertions)

View File

@ -1,3 +1,3 @@
Pest Testing Framework 2.2.3.
Pest Testing Framework 2.3.0.

View File

@ -10,8 +10,8 @@ it('show only the names of named datasets in their description', function () {
],
], __FILE__));
expect($descriptions[0])->toBe('data set "one"')
->and($descriptions[1])->toBe('data set "two"');
expect($descriptions[0])->toBe('dataset "one"')
->and($descriptions[1])->toBe('dataset "two"');
});
it('show the actual dataset of non-named datasets in their description', function () {
@ -38,10 +38,10 @@ it('show only the names of multiple named datasets in their description', functi
],
], __FILE__));
expect($descriptions[0])->toBe('data set "one" / data set "three"');
expect($descriptions[1])->toBe('data set "one" / data set "four"');
expect($descriptions[2])->toBe('data set "two" / data set "three"');
expect($descriptions[3])->toBe('data set "two" / data set "four"');
expect($descriptions[0])->toBe('dataset "one" / dataset "three"');
expect($descriptions[1])->toBe('dataset "one" / dataset "four"');
expect($descriptions[2])->toBe('dataset "two" / dataset "three"');
expect($descriptions[3])->toBe('dataset "two" / dataset "four"');
});
it('show the actual dataset of multiple non-named datasets in their description', function () {
@ -74,10 +74,10 @@ it('show the correct description for mixed named and not-named datasets', functi
],
], __FILE__));
expect($descriptions[0])->toBe('data set "one" / (3)');
expect($descriptions[1])->toBe('data set "one" / data set "four"');
expect($descriptions[0])->toBe('dataset "one" / (3)');
expect($descriptions[1])->toBe('dataset "one" / dataset "four"');
expect($descriptions[2])->toBe('([2]) / (3)');
expect($descriptions[3])->toBe('([2]) / data set "four"');
expect($descriptions[3])->toBe('([2]) / dataset "four"');
});
it('shows the correct description for long texts with newlines', function () {

View File

@ -0,0 +1,21 @@
<?php
use Pest\Support\ExceptionTrace;
it('ensures the given closures reports the correct class name', function () {
$closure = function () {
throw new Exception('Call to undefined method P\Tests\IntentionallyNotExisting::testBasic().');
};
ExceptionTrace::ensure($closure);
})->throws(
Exception::class,
'Call to undefined method Tests\IntentionallyNotExisting::testBasic().',
);
it('ensures the given closures reports the correct class name and suggests the [uses()] function', function () {
$this->get();
})->throws(
Error::class,
'Call to undefined method Tests\Unit\Support\ExceptionTrace::get(). Did you forget to use the [uses()] function? https://pestphp.com/docs/configuring-tests',
);

View File

@ -15,6 +15,6 @@ $run = function () {
};
test('parallel', function () use ($run) {
expect($run())->toContain('Tests: 2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 11 skipped, 692 passed (1688 assertions)')
expect($run())->toContain('Tests: 2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 11 skipped, 694 passed (1692 assertions)')
->toContain('Parallel: 3 processes');
})->skip(PHP_OS_FAMILY === 'Windows');