Merge pull request #978 from arodu/fix-tests

Fix tests

Author: skie

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.3', '7.4', '8.0']
+        php-version: ['7.3', '7.4', '8.0', '8.1']
         db-type: [sqlite, mysql, pgsql]
         prefer-lowest: ['']
 

tests/TestCase/Controller/Traits/Integration/LoginTraitIntegrationTest.php

@@ -76,8 +76,8 @@ public function testLoginGetRequestNoSocialLogin()
         $this->assertResponseNotContains('Username or password is incorrect');
         $this->assertResponseContains('<form method="post" accept-charset="utf-8" action="/login">');
         $this->assertResponseContains('<legend>Please enter your username and password</legend>');
-        $this->assertResponseContains('<input type="text" name="username" required="required" id="username"/>');
-        $this->assertResponseContains('<input type="password" name="password" required="required" id="password"/>');
+        $this->assertResponseContains('<input type="text" name="username" required="required" id="username" aria-required="true"/>');
+        $this->assertResponseContains('<input type="password" name="password" required="required" id="password" aria-required="true"/>');
         $this->assertResponseContains('<input type="checkbox" name="remember_me" value="1" checked="checked" id="remember-me">');
         $this->assertResponseContains('<button type="submit">Login</button>');
         $this->assertResponseContains('<a href="/register">Register</a>');
@@ -102,8 +102,8 @@ public function testLoginGetRequest()
         $this->assertResponseNotContains('Username or password is incorrect');
         $this->assertResponseContains('<form method="post" accept-charset="utf-8" action="/login">');
         $this->assertResponseContains('<legend>Please enter your username and password</legend>');
-        $this->assertResponseContains('<input type="text" name="username" required="required" id="username"/>');
-        $this->assertResponseContains('<input type="password" name="password" required="required" id="password"/>');
+        $this->assertResponseContains('<input type="text" name="username" required="required" id="username" aria-required="true"/>');
+        $this->assertResponseContains('<input type="password" name="password" required="required" id="password" aria-required="true"/>');
         $this->assertResponseContains('<input type="checkbox" name="remember_me" value="1" checked="checked" id="remember-me">');
         $this->assertResponseContains('<button type="submit">Login</button>');
         $this->assertResponseContains('<a href="/register">Register</a>');
@@ -131,8 +131,8 @@ public function testLoginPostRequestInvalidPassword()
         $this->assertResponseContains('Username or password is incorrect');
         $this->assertResponseContains('<form method="post" accept-charset="utf-8" action="/login">');
         $this->assertResponseContains('<legend>Please enter your username and password</legend>');
-        $this->assertResponseContains('<input type="text" name="username" required="required" id="username" value="user-2"/>');
-        $this->assertResponseContains('<input type="password" name="password" required="required" id="password" value="123456789"/>');
+        $this->assertResponseContains('<input type="text" name="username" required="required" id="username" aria-required="true" value="user-2"/>');
+        $this->assertResponseContains('<input type="password" name="password" required="required" id="password" aria-required="true" value="123456789"/>');
         $this->assertResponseContains('<input type="checkbox" name="remember_me" value="1" checked="checked" id="remember-me">');
         $this->assertResponseContains('<button type="submit">Login</button>');
     }

tests/TestCase/Controller/Traits/Integration/RegisterTraitIntegrationTest.php

@@ -48,7 +48,7 @@ public function testRegister()
         $this->assertResponseContains('<input type="text" name="first_name" id="first-name" maxlength="50"/>');
         $this->assertResponseContains('<input type="text" name="last_name" id="last-name" maxlength="50"/>');
         $this->assertResponseContains('<input type="hidden" name="tos" value="0"/>');
-        $this->assertResponseContains('<label for="tos"><input type="checkbox" name="tos" value="1" required="required" id="tos">Accept TOS conditions?</label>');
+        $this->assertResponseContains('<label for="tos"><input type="checkbox" name="tos" value="1" required="required" id="tos" aria-required="true">Accept TOS conditions?</label>');
         $this->assertResponseContains('<button type="submit">Submit</button>');
     }
 
@@ -83,7 +83,7 @@ public function testRegisterPostWithErrors()
         $this->assertResponseContains('<input type="text" name="first_name" id="first-name" value="" maxlength="50"/>');
         $this->assertResponseContains('<input type="text" name="last_name" id="last-name" value="" maxlength="50"/>');
         $this->assertResponseContains('<input type="hidden" name="tos" value="0"/>');
-        $this->assertResponseContains('<label for="tos"><input type="checkbox" name="tos" value="1" required="required" id="tos">Accept TOS conditions?</label>');
+        $this->assertResponseContains('<label for="tos"><input type="checkbox" name="tos" value="1" required="required" id="tos" aria-required="true">Accept TOS conditions?</label>');
         $this->assertResponseContains('<button type="submit">Submit</button>');
     }
 

tests/TestCase/Controller/Traits/Integration/SimpleCrudTraitIntegrationTest.php

@@ -95,9 +95,9 @@ public function testCrud()
 
         $this->get('/users/edit/00000000-0000-0000-0000-000000000006');
         $this->assertResponseContains('<input type="text" name="username" required="required');
-        $this->assertResponseContains('id="username" value="user-6"');
+        $this->assertResponseContains('id="username" aria-required="true" value="user-6"');
         $this->assertResponseContains('<input type="email" name="email" required="required');
-        $this->assertResponseContains('id="email" value="6@example.com"');
+        $this->assertResponseContains('id="email" aria-required="true" value="6@example.com"');
         $this->assertResponseContains('<input type="text" name="first_name" id="first-name" value="first-user-6');
         $this->assertResponseContains('<input type="text" name="last_name" id="last-name" value="firts name 6');
         $this->assertResponseContains('<label for="active"><input type="checkbox" name="active" value="1" id="active" checked="checked">Active</label>');