Allow to use the assertions with Panther

dunglas · dunglas · commit 850d1932d35d · 2019-06-28T11:33:59.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/BrowserKitAssertionsTrait.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\Constraint\LogicalAnd;
 use PHPUnit\Framework\Constraint\LogicalNot;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\Test\Constraint as BrowserKitConstraint;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -124,15 +124,15 @@ public static function assertRouteSame($expectedRoute, array $parameters = [], s
         self::assertThat(self::getRequest(), $constraint, $message);
     }
 
-    private static function getClient(KernelBrowser $newClient = null): ?KernelBrowser
+    private static function getClient(AbstractBrowser $newClient = null): ?AbstractBrowser
     {
         static $client;
 
         if (0 < \func_num_args()) {
             return $client = $newClient;
         }
 
-        if (!$client instanceof KernelBrowser) {
+        if (!$client instanceof AbstractBrowser) {
             static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestAssertionsTrait.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Test;
 
-
 /**
  * Ideas borrowed from Laravel Dusk's assertions.
  *
diff --git a/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorAttributeValueSame.php b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorAttributeValueSame.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\Constraint\Constraint;
 use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\Panther\DomCrawler\Crawler as PantherCrawler;
 
 final class CrawlerSelectorAttributeValueSame extends Constraint
 {
@@ -47,7 +48,13 @@ protected function matches($crawler): bool
             return false;
         }
 
-        return $this->expectedText === trim($crawler->getNode(0)->getAttribute($this->attribute));
+        if ($crawler instanceof PantherCrawler) {
+            $actualText = $crawler->getAttribute($this->attribute);
+        } else {
+            $actualText = $crawler->getNode(0)->getAttribute($this->attribute);
+        }
+
+        return $this->expectedText === trim($actualText);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\Constraint\LogicalAnd;`
`15`	`15`	`use PHPUnit\Framework\Constraint\LogicalNot;`
`16`		`-use Symfony\Bundle\FrameworkBundle\KernelBrowser;`
	`16`	`+use Symfony\Component\BrowserKit\AbstractBrowser;`
`17`	`17`	`use Symfony\Component\BrowserKit\Test\Constraint as BrowserKitConstraint;`
`18`	`18`	`use Symfony\Component\HttpFoundation\Request;`
`19`	`19`	`use Symfony\Component\HttpFoundation\Response;`
`@@ -124,15 +124,15 @@ public static function assertRouteSame($expectedRoute, array $parameters = [], s`
`124`	`124`	`self::assertThat(self::getRequest(), $constraint, $message);`
`125`	`125`	`}`
`126`	`126`
`127`		`- private static function getClient(KernelBrowser $newClient = null): ?KernelBrowser`
	`127`	`+ private static function getClient(AbstractBrowser $newClient = null): ?AbstractBrowser`
`128`	`128`	`{`
`129`	`129`	`static $client;`
`130`	`130`
`131`	`131`	`if (0 < \func_num_args()) {`
`132`	`132`	`return $client = $newClient;`
`133`	`133`	`}`
`134`	`134`
`135`		`- if (!$client instanceof KernelBrowser) {`
	`135`	`+ if (!$client instanceof AbstractBrowser) {`
`136`	`136`	`static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Test;`
`13`	`13`
`14`		`-`
`15`	`14`	`/**`
`16`	`15`	`* Ideas borrowed from Laravel Dusk's assertions.`
`17`	`16`	`*`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\Constraint\Constraint;`
`15`	`15`	`use Symfony\Component\DomCrawler\Crawler;`
	`16`	`+use Symfony\Component\Panther\DomCrawler\Crawler as PantherCrawler;`
`16`	`17`
`17`	`18`	`final class CrawlerSelectorAttributeValueSame extends Constraint`
`18`	`19`	`{`
`@@ -47,7 +48,13 @@ protected function matches($crawler): bool`
`47`	`48`	`return false;`
`48`	`49`	`}`
`49`	`50`
`50`		`- return $this->expectedText === trim($crawler->getNode(0)->getAttribute($this->attribute));`
	`51`	`+ if ($crawler instanceof PantherCrawler) {`
	`52`	`+ $actualText = $crawler->getAttribute($this->attribute);`
	`53`	`+ } else {`
	`54`	`+ $actualText = $crawler->getNode(0)->getAttribute($this->attribute);`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ return $this->expectedText === trim($actualText);`
`51`	`58`	`}`
`52`	`59`
`53`	`60`	`/**`