Merge pull request #949 from pestphp/fix-depends-with-describe

[2.x] Fix the Usage of `depends` With `describe`

overrides/Runner/TestSuiteLoader.php

@@ -132,7 +132,7 @@ public function load(string $suiteClassFile): ReflectionClass
                     continue;
                 }
 
-                if ($class->isAbstract() || ($class->getFileName() !== $suiteClassFile)) {
+                if ($class->isAbstract() || ($suiteClassFile !== $class->getFileName())) {
                     if (! str_contains($class->getFileName(), 'TestCaseFactory.php')) {
                         continue;
                     }

src/Expectation.php

@@ -239,7 +239,7 @@ public function sequence(mixed ...$callbacks): self
             $index = isset($callbacks[$index + 1]) ? $index + 1 : 0;
         }
 
-        if (count($callbacks) > $valuesCount) {
+        if ($valuesCount < count($callbacks)) {
             throw new OutOfRangeException('Sequence expectations are more than the iterable items.');
         }
 

src/Factories/Annotations/Depends.php

@@ -19,7 +19,7 @@ final class Depends implements AddsAnnotations
     public function __invoke(TestCaseMethodFactory $method, array $annotations): array
     {
         foreach ($method->depends as $depend) {
-            $depend = Str::evaluable($depend);
+            $depend = Str::evaluable($method->describing !== null ? Str::describe($method->describing, $depend) : $depend);
 
             $annotations[] = "@depends $depend";
         }

src/Factories/TestCaseFactory.php

@@ -241,7 +241,7 @@ public function hasMethod(string $methodName): bool
                 throw ShouldNotHappen::fromMessage('The test description may not be empty.');
             }
 
-            if (Str::evaluable($method->description) === $methodName) {
+            if ($methodName === Str::evaluable($method->description)) {
                 return true;
             }
         }
@@ -259,7 +259,7 @@ public function getMethod(string $methodName): TestCaseMethodFactory
                 throw ShouldNotHappen::fromMessage('The test description may not be empty.');
             }
 
-            if (Str::evaluable($method->description) === $methodName) {
+            if ($methodName === Str::evaluable($method->description)) {
                 return $method;
             }
         }

src/Mixins/Expectation.php

@@ -950,7 +950,7 @@ public function toThrow(callable|string|Throwable $exception, string $exceptionM
             }
 
             if (! class_exists($exception)) {
-                if ($e instanceof Error && $e->getMessage() === "Class \"$exception\" not found") {
+                if ($e instanceof Error && "Class \"$exception\" not found" === $e->getMessage()) {
                     Assert::assertTrue(true);
 
                     throw $e;

src/PendingCalls/TestCall.php

@@ -16,6 +16,7 @@
 use Pest\Support\Exporter;
 use Pest\Support\HigherOrderCallables;
 use Pest\Support\NullClosure;
+use Pest\Support\Str;
 use Pest\TestSuite;
 use PHPUnit\Framework\TestCase;
 
@@ -209,7 +210,7 @@ public function skipOnLinux(): self
      */
     private function skipOn(string $osFamily, string $message): self
     {
-        return PHP_OS_FAMILY === $osFamily
+        return $osFamily === PHP_OS_FAMILY
             ? $this->skip($message)
             : $this;
     }
@@ -361,7 +362,7 @@ public function __destruct()
     {
         if (! is_null($this->describing)) {
             $this->testCaseMethod->describing = $this->describing;
-            $this->testCaseMethod->description = sprintf('`%s` → %s', $this->describing, $this->testCaseMethod->description);
+            $this->testCaseMethod->description = Str::describe($this->describing, $this->testCaseMethod->description); // @phpstan-ignore-line
         }
 
         $this->testSuite->tests->set($this->testCaseMethod);

src/Support/Str.php

@@ -51,7 +51,7 @@ public static function endsWith(string $target, string $search): bool
             return true;
         }
 
-        return substr($target, -$length) === $search;
+        return $search === substr($target, -$length);
     }
 
     /**
@@ -92,4 +92,12 @@ public static function after(string $subject, string $search): string
     {
         return $search === '' ? $subject : array_reverse(explode($search, $subject, 2))[0];
     }
+
+    /**
+     * Creates a describe block as `$right` → `$left` format.
+     */
+    public static function describe(string $right, string $left): string
+    {
+        return sprintf('`%s` → %s', $right, $left);
+    }
 }

tests/Features/Describe.php

@@ -76,3 +76,23 @@
         expect($foo)->toBe(3);
     });
 })->with([3]);
+
+describe('depends on describe', function () {
+    test('foo', function () {
+        expect('foo')->toBe('foo');
+    });
+
+    test('bar', function () {
+        expect('bar')->toBe('bar');
+    })->depends('foo');
+});
+
+describe('depends on describe using with', function () {
+    test('foo', function ($foo) {
+        expect($foo)->toBe(3);
+    });
+
+    test('bar', function ($foo) {
+        expect($foo + $foo)->toBe(6);
+    })->depends('foo');
+})->with([3]);