fix toBe expectation

Author: fabio-ivona

.gitignore

@@ -9,3 +9,4 @@ coverage.xml
 .temp/coverage.php
 *.swp
 *.swo
+/.phpunit.cache/

docs/11.expectations/8.time.md

@@ -5,6 +5,14 @@ menuTitle: Time
 
 ### `toBeAfter()`
 
+Assert the date equals the given one.
+
+```php
+expect('2021-10-20')->toBe(today());
+ ```
+
+### `toBeAfter()`
+
 Assert the date is after the given one.
 
 ```php

phpstan.neon

@@ -9,10 +9,11 @@ parameters:
         - src
 
     checkMissingIterableValueType: true
-    checkGenericClassInNonGenericObjectType: false
+
     reportUnmatchedIgnoredErrors: false
 
     ignoreErrors:
+        - identifier: missingType.generics
         - "#Undefined variable: \\$this#"
         - "#Call to static method user\\(\\) on an unknown class Auth#"
         - "#Variable method call on Illuminate\\\\Database\\\\Eloquent\\\\Model#"

phpunit.xml

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="default">
-            <directory suffix=".php">./tests/Expect</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" colors="true" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="default">
+      <directory suffix=".php">./tests/Expect</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>

src/Expectations/Models.php

@@ -143,4 +143,4 @@ function (Model $related, string $relationshipName = ''): Expectation {
     }
 );
 
-expect()->intercept('toBe', Model::class, fn (Model $anotherModel) => expect($this->value)->toBeSameModelAs($anotherModel)); //@phpstan-ignore-line
+expect()->intercept('toBe', Model::class, fn (Model $anotherModel) => expect($this->value)->toBeSameModelAs($anotherModel)); // @phpstan-ignore-line

src/Expectations/Time.php

@@ -4,17 +4,31 @@
 
 declare(strict_types=1);
 
-use Carbon\CarbonInterface;
+use Carbon\Carbon;
 use DefStudio\PestLaravelExpectations\Helpers\ValueProcessor;
 use Pest\Expectation;
 
 use function PHPUnit\Framework\assertTrue;
 
-expect()->intercept(
+expect()->pipe(
     'toBe',
-    CarbonInterface::class,
-    function (CarbonInterface $expected) {
-        expect($this->value->timestamp)->toBe($expected->timestamp);
+    function (Closure $next, mixed $date) {
+        try {
+            $value = Carbon::make($this->value);
+            $expected = Carbon::make($date);
+        } catch (Exception) { // @phpstan-ignore-line
+            return $next();
+        }
+
+        if ($value === null) {
+            return $next();
+        }
+
+        if ($expected === null) {
+            return $next();
+        }
+
+        return expect($value->timestamp)->toBe($expected->timestamp, sprintf('Failed to assert that date [%s] is equal to [%s]', $value->toString(), $expected->toString()));
     }
 );
 

src/Helpers/Models/RelationshipGuesser.php

@@ -69,40 +69,40 @@ public function throwException(bool $throw): self
 
     public function guess(): string
     {
-        if (! empty($this->hintedRelationshipName)) {
+        if ($this->hintedRelationshipName !== '' && $this->hintedRelationshipName !== '0') {
             $this->foundRelationshipName = $this->hintedRelationshipName;
         }
 
         if ($this->relationshipClass == BelongsTo::class) {
-            $this->try(Str::camel(class_basename($this->related))); //@phpstan-ignore-line
-            $this->try(Str::snake(class_basename($this->related))); //@phpstan-ignore-line
+            $this->try(Str::camel(class_basename($this->related))); // @phpstan-ignore-line
+            $this->try(Str::snake(class_basename($this->related))); // @phpstan-ignore-line
         }
 
         if ($this->relationshipClass == HasOne::class) {
-            $this->try(Str::camel(class_basename($this->related))); //@phpstan-ignore-line
-            $this->try(Str::snake(class_basename($this->related))); //@phpstan-ignore-line
+            $this->try(Str::camel(class_basename($this->related))); // @phpstan-ignore-line
+            $this->try(Str::snake(class_basename($this->related))); // @phpstan-ignore-line
         }
 
         if ($this->relationshipClass == HasMany::class) {
-            $this->try(Str::camel(Str::plural(class_basename($this->related)))); //@phpstan-ignore-line
-            $this->try(Str::snake(Str::plural(class_basename($this->related)))); //@phpstan-ignore-line
+            $this->try(Str::camel(Str::plural(class_basename($this->related)))); // @phpstan-ignore-line
+            $this->try(Str::snake(Str::plural(class_basename($this->related)))); // @phpstan-ignore-line
         }
 
-        if ($this->throwException && empty($this->foundRelationshipName)) {
+        if ($this->throwException && ($this->foundRelationshipName === '' || $this->foundRelationshipName === '0')) {
             $triedNames = implode(' / ', array_unique($this->triedRelationshipNames));
-            throw new ExpectationFailedException(sprintf('Failed to assert that [%s] has relationship [%s]', $this->model::class, $triedNames)); //@phpstan-ignore-line
+            throw new ExpectationFailedException(sprintf('Failed to assert that [%s] has relationship [%s]', $this->model::class, $triedNames)); // @phpstan-ignore-line
         }
 
         return $this->foundRelationshipName;
     }
 
     private function try(string $relationshipName): void
     {
-        if (empty($relationshipName)) {
+        if ($relationshipName === '' || $relationshipName === '0') {
             return;
         }
 
-        if (! empty($this->foundRelationshipName)) {
+        if ($this->foundRelationshipName !== '' && $this->foundRelationshipName !== '0') {
             return;
         }
 
@@ -118,7 +118,7 @@ private function try(string $relationshipName): void
     private function validateRelationship(string $relationshipName): void
     {
         if (! $this->model->{$relationshipName}() instanceof $this->relationshipClass) {
-            throw new ExpectationFailedException(sprintf('Failed to assert that [%s] has relationship [%s] of type [%s]', $this->model::class, $relationshipName, $this->relationshipClass)); //@phpstan-ignore-line
+            throw new ExpectationFailedException(sprintf('Failed to assert that [%s] has relationship [%s] of type [%s]', $this->model::class, $relationshipName, $this->relationshipClass)); // @phpstan-ignore-line
         }
     }
 

src/Helpers/ValueProcessor.php

@@ -20,7 +20,7 @@ public static function getCarbonDate(mixed $value): CarbonInterface
     {
         $carbon = Carbon::make($value);
 
-        if (! $carbon instanceof \Carbon\Carbon) {
+        if (! $carbon instanceof Carbon) {
             throw InvalidDataException::cannotCast($value, Carbon::class);
         }
 

tests/Expect/Time/toBe.php

@@ -0,0 +1,32 @@
+<?php
+
+use Carbon\Carbon;
+use PHPUnit\Framework\ExpectationFailedException;
+
+test('pass with string values', function () {
+    expect('2021-01-02 01:05:36')->toBe(new DateTime('2021-01-02 01:05:36'));
+});
+
+test('pass with string expectation', function () {
+    expect(new DateTime('2021-01-02 01:05:36'))->toBe('2021-01-02 01:05:36');
+});
+
+test('pass with datetime values', function () {
+    expect(new DateTime('2021-01-02 01:05:36'))->toBe(new DateTime('2021-01-02 01:05:36'));
+});
+
+test('pass with carbon values', function () {
+    expect(Carbon::make('2021-01-02 01:05:36'))->toBe(Carbon::make('2021-01-02 01:05:36'));
+});
+
+test('fails', function () {
+    expect(new DateTime('2021-01-01'))->toBe(new DateTime('2021-01-02'));
+})->throws(ExpectationFailedException::class, 'Failed to assert that date [Fri Jan 01 2021 00:00:00 GMT+0000] is equal to [Sat Jan 02 2021 00:00:00 GMT+0000]');
+
+test('pass negated', function () {
+    expect(now())->not->toBe(now()->addHour());
+});
+
+test('fails negated', function () {
+    expect(Carbon::make('2021-01-02'))->not->toBe(Carbon::make('2021-01-02'));
+})->throws(ExpectationFailedException::class);