release: v1.15.0

Add `toBeTruthy` and `ToBeFalsy`

.github/workflows/tests.yml

@@ -5,26 +5,11 @@ on: ['push', 'pull_request']
 jobs:
   ci:
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         php: ['7.3', '7.4', '8.0']
         dependency-version: [prefer-lowest, prefer-stable]
-        experimental: [false]
-        include:
-          - php: '8.1'
-            os: ubuntu-latest
-            experimental: true
-            dependency-version: prefer-stable
-          - php: '8.1'
-            os: macos-latest
-            experimental: true
-            dependency-version: prefer-stable
-          - php: '8.1'
-            os: windows-latest
-            experimental: true
-            dependency-version: prefer-stable
 
     name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
 

.php-cs-fixer.dist.php

@@ -3,7 +3,6 @@
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'tests')
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'bin')
-    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'scripts')
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'stubs')
     ->in(__DIR__ . DIRECTORY_SEPARATOR . 'src')
     ->append(['.php-cs-fixer.dist.php']);

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v1.15.0 (2021-08-04)](https://github.com/pestphp/pest/compare/v1.14.0...v1.15.0)
+### Added
+- `toBeTruthy` and `toBeFalsy` ([#367](https://github.com/pestphp/pest/pull/367))
+
+## [v1.14.0 (2021-08-03)](https://github.com/pestphp/pest/compare/v1.13.0...v1.14.0)
+### Added
+- A new bound closure that allows you to access the test case in Datasets ([#364](https://github.com/pestphp/pest/pull/364))
+
 ## [v1.13.0 (2021-08-02)](https://github.com/pestphp/pest/compare/v1.12.0...v1.13.0)
 ### Added
 - A cleaner output when running the Pest runner in PhpStorm ([#350](https://github.com/pestphp/pest/pull/350)) 

RELEASE.md

@@ -6,7 +6,7 @@ When releasing a new version of Pest there are some checks and updates that need
 - On the GitHub repository, check the contents of [github.com/pestphp/pest/compare/{latest_version}...master](https://github.com/pestphp/pest/compare/{latest_version}...master) and update the [changelog](CHANGELOG.md) file with the main changes for this release
 - Update the version number in [src/Pest.php](src/Pest.php)
 - Run the tests locally using: `composer test`
-- Commit the CHANGELOG and Pest file with the message: `git commit -m "docs: update changelog"`
+- Commit the CHANGELOG and Pest file with the message: `git commit -m "release: vX.X.X"`
 - Push the changes to GitHub
 - Check that the CI is passing as expected: [github.com/pestphp/pest/actions](https://github.com/pestphp/pest/actions)
 - Tag and push the tag with `git tag vX.X.X && git push --tags`

bin/pest

@@ -27,7 +27,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
     (new Provider())->register();
 
-    // get $rootPath based on $autoloadPath
+    // Get $rootPath based on $autoloadPath
     $rootPath = dirname($autoloadPath, 2);
     $argv = new ArgvInput();
 
@@ -42,7 +42,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
     ValidatesEnvironment::in($testSuite);
 
-    // lets remove any arguments that PHPUnit does not understand
+    // Let's remove any arguments that PHPUnit does not understand
     if ($argv->hasParameterOption('--test-directory')) {
         foreach ($_SERVER['argv'] as $key => $value) {
             if (strpos($value, '--test-directory') !== false) {

phpstan.neon

@@ -7,7 +7,6 @@ parameters:
     level: max
     paths:
         - src
-        - scripts
 
     checkMissingIterableValueType: true
     checkGenericClassInNonGenericObjectType: false

scripts/compile.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-$globalsFilePath = implode(DIRECTORY_SEPARATOR, [
-    dirname(__DIR__),
-    'vendor',
-    'phpunit',
-    'phpunit',
-    'src',
-    'Framework',
-    'Assert',
-    'Functions.php',
-]);
-
-$compiledFilePath = implode(DIRECTORY_SEPARATOR, [dirname(__DIR__), 'compiled', 'globals.php']);
-
-/* @phpstan-ignore-next-line */
-@unlink($compiledFilePath);
-
-$replace = function ($contents, $string, $by) {
-    return str_replace($string, $by, $contents);
-};
-
-$remove = function ($contents, $string) {
-    return str_replace($string, '', $contents);
-};
-
-$contents = file_get_contents($globalsFilePath);
-$contents = $replace($contents, 'namespace PHPUnit\Framework;', 'use PHPUnit\Framework\Assert;');
-$contents = $remove($contents, 'use ArrayAccess;');
-$contents = $remove($contents, 'use Countable;');
-$contents = $remove($contents, 'use DOMDocument;');
-$contents = $remove($contents, 'use DOMElement;');
-$contents = $remove($contents, 'use Throwable;');
-
-file_put_contents(implode(DIRECTORY_SEPARATOR, [dirname(__DIR__), 'compiled', 'globals.php']), $contents);

src/Actions/AddsTests.php

@@ -22,8 +22,6 @@ final class AddsTests
     {
         self::removeTestClosureWarnings($testSuite);
 
-        // @todo refactor this...
-
         $testSuites = [];
         $pestTestSuite->tests->build($pestTestSuite, function (TestCase $testCase) use (&$testSuites): void {
             $testCaseClass = get_class($testCase);

src/Concerns/Testable.php

@@ -273,7 +273,19 @@ trait Testable
      */
     public function __test()
     {
-        return $this->__callClosure($this->__test, func_get_args());
+        return $this->__callClosure($this->__test, $this->resolveTestArguments(func_get_args()));
+    }
+
+    /**
+     * Resolve the passed arguments. Any Closures will be bound to the testcase and resolved.
+     *
+     * @throws Throwable
+     */
+    private function resolveTestArguments(array $arguments): array
+    {
+        return array_map(function ($data) {
+            return $data instanceof Closure ? $this->__callClosure($data, []) : $data;
+        }, $arguments);
     }
 
     /**

src/Expectation.php

@@ -205,6 +205,16 @@ final class Expectation
         return $this;
     }
 
+    /**
+     * Asserts that the value is truthy.
+     */
+    public function toBeTruthy(): Expectation
+    {
+        Assert::assertTrue((bool) $this->value);
+
+        return $this;
+    }
+
     /**
      * Asserts that the value is false.
      */
@@ -215,6 +225,16 @@ final class Expectation
         return $this;
     }
 
+    /**
+     * Asserts that the value is falsy.
+     */
+    public function toBeFalsy(): Expectation
+    {
+        Assert::assertFalse((bool) $this->value);
+
+        return $this;
+    }
+
     /**
      * Asserts that the value is greater than $expected.
      *

src/Pest.php

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

tests/.snapshots/success.txt

@@ -96,6 +96,11 @@
   ✓ more than two datasets with (2) / (4) / (5)
   ✓ more than two datasets with (2) / (4) / (6)
   ✓ more than two datasets did the job right
+  ✓ it can resolve a dataset after the test case is available with (Closure Object (...))
+  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (...)) #1
+  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (...)) #2
+  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (...)) #1
+  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (...)) #2
 
    PASS  Tests\Features\Exceptions
   ✓ it gives access the the underlying expectException
@@ -201,6 +206,20 @@
    PASS  Tests\Features\Expect\toBeFalse
   ✓ strict comparisons
   ✓ failures
+  ✓ not failures
+
+   PASS  Tests\Features\Expect\toBeFalsy
+  ✓ passes as falsy with (false)
+  ✓ passes as falsy with ('')
+  ✓ passes as falsy with (null)
+  ✓ passes as falsy with (0)
+  ✓ passes as falsy with ('0')
+  ✓ passes as not falsy with (true)
+  ✓ passes as not falsy with (1) #1
+  ✓ passes as not falsy with ('false')
+  ✓ passes as not falsy with (1) #2
+  ✓ passes as not falsy with (-1)
+  ✓ failures
   ✓ not failures
 
    PASS  Tests\Features\Expect\toBeFile
@@ -311,6 +330,20 @@
    PASS  Tests\Features\Expect\toBeTrue
   ✓ strict comparisons
   ✓ failures
+  ✓ not failures
+
+   PASS  Tests\Features\Expect\toBeTruthy
+  ✓ passes as truthy with (true)
+  ✓ passes as truthy with (1) #1
+  ✓ passes as truthy with ('false')
+  ✓ passes as truthy with (1) #2
+  ✓ passes as truthy with (-1)
+  ✓ passes as not truthy with (false)
+  ✓ passes as not truthy with ('')
+  ✓ passes as not truthy with (null)
+  ✓ passes as not truthy with (0)
+  ✓ passes as not truthy with ('0')
+  ✓ failures
   ✓ not failures
 
    PASS  Tests\Features\Expect\toBeWritableDirectory
@@ -614,5 +647,5 @@
   ✓ it is a test
   ✓ it uses correct parent class
 
-  Tests:  4 incompleted, 9 skipped, 390 passed
+  Tests:  4 incompleted, 9 skipped, 419 passed
   

tests/Datasets/Bound.php

@@ -0,0 +1,11 @@
+<?php
+
+dataset('bound.closure', function () {
+    yield function () { return 1; };
+    yield function () { return 2; };
+});
+
+dataset('bound.array', [
+    function () { return 1; },
+    function () { return 2; },
+]);

tests/Features/Datasets.php

@@ -5,6 +5,10 @@ use Pest\Exceptions\DatasetAlreadyExist;
 use Pest\Exceptions\DatasetDoesNotExist;
 use Pest\Plugin;
 
+beforeEach(function () {
+    $this->foo = 'bar';
+});
+
 it('throws exception if dataset does not exist', function () {
     $this->expectException(DatasetDoesNotExist::class);
     $this->expectExceptionMessage("A dataset with the name `first` does not exist. You can create it using `dataset('first', ['a', 'b']);`.");
@@ -223,3 +227,17 @@ test('more than two datasets', function ($text_a, $text_b, $text_c) use ($state,
 test('more than two datasets did the job right', function () use ($state) {
     expect($state->text)->toBe('121212121212131423241314232411122122111221221112212213142324135136145146235236245246');
 });
+
+it('can resolve a dataset after the test case is available', function ($result) {
+    expect($result)->toBe('bar');
+})->with([
+    function () { return $this->foo; },
+]);
+
+it('can resolve a dataset after the test case is available with shared yield sets', function ($result) {
+    expect($result)->toBeInt()->toBeLessThan(3);
+})->with('bound.closure');
+
+it('can resolve a dataset after the test case is available with shared array sets', function ($result) {
+    expect($result)->toBeInt()->toBeLessThan(3);
+})->with('bound.array');

tests/Features/Expect/toBeFalsy.php

@@ -0,0 +1,19 @@
+<?php
+
+use PHPUnit\Framework\ExpectationFailedException;
+
+test('passes as falsy', function ($value) {
+    expect($value)->toBeFalsy();
+})->with([false, '', null, 0, '0']);
+
+test('passes as not falsy', function ($value) {
+    expect($value)->not->toBeFalsy();
+})->with([true, [1], 'false', 1, -1]);
+
+test('failures', function () {
+    expect(1)->toBeFalsy();
+})->throws(ExpectationFailedException::class);
+
+test('not failures', function () {
+    expect(null)->not->toBeFalsy();
+})->throws(ExpectationFailedException::class);

tests/Features/Expect/toBeTruthy.php

@@ -0,0 +1,19 @@
+<?php
+
+use PHPUnit\Framework\ExpectationFailedException;
+
+test('passes as truthy', function ($value) {
+    expect($value)->toBeTruthy();
+})->with([true, [1], 'false', 1, -1]);
+
+test('passes as not truthy', function ($value) {
+    expect($value)->not->toBeTruthy();
+})->with([false, '', null, 0, '0']);
+
+test('failures', function () {
+    expect(null)->toBeTruthy();
+})->throws(ExpectationFailedException::class);
+
+test('not failures', function () {
+    expect(1)->not->toBeTruthy();
+})->throws(ExpectationFailedException::class);