[FrameworkBundle] Fix checkboxes check assertions

MatTheCat · MatTheCat · commit 541d84fa022c · 2022-12-06T23:53:02.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/DomCrawlerAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/DomCrawlerAssertionsTrait.php
@@ -15,7 +15,6 @@
 use PHPUnit\Framework\Constraint\LogicalNot;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Test\Constraint as DomCrawlerConstraint;
-use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorAttributeValueSame;
 use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorExists;
 
 /**
@@ -87,18 +86,12 @@ public static function assertInputValueNotSame(string $fieldName, string $expect
 
     public static function assertCheckboxChecked(string $fieldName, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
-            new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked')
-        ), $message);
+        self::assertThat(self::getCrawler(), new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked"), $message);
     }
 
     public static function assertCheckboxNotChecked(string $fieldName, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
-            new LogicalNot(new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked'))
-        ), $message);
+        self::assertThat(self::getCrawler(), new LogicalNot(new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked")), $message);
     }
 
     public static function assertFormValue(string $formSelector, string $fieldName, string $value, string $message = ''): void
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php
@@ -238,16 +238,18 @@ public function testAssertInputValueNotSame()
     public function testAssertCheckboxChecked()
     {
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');
+        $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');
         $this->expectException(AssertionFailedError::class);
-        $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and has a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');
+        $this->expectExceptionMessage('matches selector "input[name="rememberMe"]:checked".');
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxChecked('rememberMe');
     }
 
     public function testAssertCheckboxNotChecked()
     {
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');
+        $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');
         $this->expectException(AssertionFailedError::class);
-        $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and does not have a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');
+        $this->expectExceptionMessage('does not match selector "input[name="rememberMe"]:checked".');
         $this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxNotChecked('rememberMe');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`use PHPUnit\Framework\Constraint\LogicalNot;`
`16`	`16`	`use Symfony\Component\DomCrawler\Crawler;`
`17`	`17`	`use Symfony\Component\DomCrawler\Test\Constraint as DomCrawlerConstraint;`
`18`		`-use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorAttributeValueSame;`
`19`	`18`	`use Symfony\Component\DomCrawler\Test\Constraint\CrawlerSelectorExists;`
`20`	`19`
`21`	`20`	`/**`
`@@ -87,18 +86,12 @@ public static function assertInputValueNotSame(string $fieldName, string $expect`
`87`	`86`
`88`	`87`	`public static function assertCheckboxChecked(string $fieldName, string $message = ''): void`
`89`	`88`	`{`
`90`		`- self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(`
`91`		`- new CrawlerSelectorExists("input[name=\"$fieldName\"]"),`
`92`		`- new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked')`
`93`		`- ), $message);`
	`89`	`+ self::assertThat(self::getCrawler(), new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked"), $message);`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`public static function assertCheckboxNotChecked(string $fieldName, string $message = ''): void`
`97`	`93`	`{`
`98`		`- self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(`
`99`		`- new CrawlerSelectorExists("input[name=\"$fieldName\"]"),`
`100`		`- new LogicalNot(new CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'checked', 'checked'))`
`101`		`- ), $message);`
	`94`	`+ self::assertThat(self::getCrawler(), new LogicalNot(new CrawlerSelectorExists("input[name=\"$fieldName\"]:checked")), $message);`
`102`	`95`	`}`
`103`	`96`
`104`	`97`	`public static function assertFormValue(string $formSelector, string $fieldName, string $value, string $message = ''): void`
Original file line number	Diff line number	Diff line change
`@@ -238,16 +238,18 @@ public function testAssertInputValueNotSame()`
`238`	`238`	`public function testAssertCheckboxChecked()`
`239`	`239`	`{`
`240`	`240`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');`
	`241`	`+ $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxChecked('rememberMe');`
`241`	`242`	`$this->expectException(AssertionFailedError::class);`
`242`		`- $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and has a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');`
	`243`	`+ $this->expectExceptionMessage('matches selector "input[name="rememberMe"]:checked".');`
`243`	`244`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxChecked('rememberMe');`
`244`	`245`	`}`
`245`	`246`
`246`	`247`	`public function testAssertCheckboxNotChecked()`
`247`	`248`	`{`
`248`	`249`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');`
	`250`	`+ $this->getCrawlerTester(new Crawler('<!DOCTYPE html><body><form><input type="checkbox" name="rememberMe">'))->assertCheckboxNotChecked('rememberMe');`
`249`	`251`	`$this->expectException(AssertionFailedError::class);`
`250`		`- $this->expectExceptionMessage('matches selector "input[name="rememberMe"]" and does not have a node matching selector "input[name="rememberMe"]" with attribute "checked" of value "checked".');`
	`252`	`+ $this->expectExceptionMessage('does not match selector "input[name="rememberMe"]:checked".');`
`251`	`253`	`$this->getCrawlerTester(new Crawler('<html><body><form><input type="checkbox" name="rememberMe" checked>'))->assertCheckboxNotChecked('rememberMe');`
`252`	`254`	`}`
`253`	`255`