Fix auth test for Laravel 10

Author: alcaeus

src/Auth/PasswordBrokerManager.php

@@ -16,7 +16,8 @@ protected function createTokenRepository(array $config)
             $this->app['hash'],
             $config['table'],
             $this->app['config']['app.key'],
-            $config['expire']
+            $config['expire'],
+            $config['throttle'] ?? 0
         );
     }
 }

src/Auth/PasswordResetServiceProvider.php

@@ -6,29 +6,6 @@
 
 class PasswordResetServiceProvider extends BasePasswordResetServiceProvider
 {
-    /**
-     * Register the token repository implementation.
-     *
-     * @return void
-     */
-    protected function registerTokenRepository()
-    {
-        $this->app->singleton('auth.password.tokens', function ($app) {
-            $connection = $app['db']->connection();
-
-            // The database token repository is an implementation of the token repository
-            // interface, and is responsible for the actual storing of auth tokens and
-            // their e-mail addresses. We will inject this table and hash key to it.
-            $table = $app['config']['auth.password.table'];
-
-            $key = $app['config']['app.key'];
-
-            $expire = $app['config']->get('auth.password.expire', 60);
-
-            return new DatabaseTokenRepository($connection, $table, $key, $expire);
-        });
-    }
-
     /**
      * @inheritdoc
      */

tests/AuthTest.php

@@ -1,7 +1,6 @@
 <?php
 
 use Illuminate\Auth\Passwords\PasswordBroker;
-use Illuminate\Foundation\Application;
 use MongoDB\BSON\UTCDateTime;
 
 class AuthTest extends TestCase
@@ -10,55 +9,56 @@ public function tearDown(): void
     {
         parent::setUp();
         User::truncate();
-        DB::collection('password_reminders')->truncate();
+        DB::collection('password_reset_tokens')->truncate();
     }
 
     public function testAuthAttempt()
     {
         User::create([
             'name' => 'John Doe',
-            'email' => 'john@doe.com',
+            'email' => 'john.doe@example.com',
             'password' => Hash::make('foobar'),
         ]);
 
-        $this->assertTrue(Auth::attempt(['email' => 'john@doe.com', 'password' => 'foobar'], true));
+        $this->assertTrue(Auth::attempt(['email' => 'john.doe@example.com', 'password' => 'foobar'], true));
         $this->assertTrue(Auth::check());
     }
 
     public function testRemindOld()
     {
-        if (Application::VERSION >= '5.2') {
-            $this->expectNotToPerformAssertions();
-
-            return;
-        }
-
-        $mailer = Mockery::mock('Illuminate\Mail\Mailer');
-        $tokens = $this->app->make('auth.password.tokens');
-        $users = $this->app['auth']->driver()->getProvider();
-
-        $broker = new PasswordBroker($tokens, $users, $mailer, '');
+        $broker = $this->app->make('auth.password.broker');
 
         $user = User::create([
             'name' => 'John Doe',
-            'email' => 'john@doe.com',
+            'email' => 'john.doe@example.com',
             'password' => Hash::make('foobar'),
         ]);
 
-        $mailer->shouldReceive('send')->once();
-        $broker->sendResetLink(['email' => '[email protected]']);
+        $token = null;
+
+        $this->assertSame(
+            PasswordBroker::RESET_LINK_SENT,
+            $broker->sendResetLink(
+                ['email' => '[email protected]'],
+                function ($actualUser, $actualToken) use ($user, &$token) {
+                    $this->assertEquals($user->_id, $actualUser->_id);
+                    // Store token for later use
+                    $token = $actualToken;
+                }
+            )
+        );
 
-        $this->assertEquals(1, DB::collection('password_resets')->count());
-        $reminder = DB::collection('password_resets')->first();
-        $this->assertEquals('john@doe.com', $reminder['email']);
+        $this->assertEquals(1, DB::collection('password_reset_tokens')->count());
+        $reminder = DB::collection('password_reset_tokens')->first();
+        $this->assertEquals('john.doe@example.com', $reminder['email']);
         $this->assertNotNull($reminder['token']);
         $this->assertInstanceOf(UTCDateTime::class, $reminder['created_at']);
 
         $credentials = [
-            'email' => 'john@doe.com',
+            'email' => 'john.doe@example.com',
             'password' => 'foobar',
             'password_confirmation' => 'foobar',
-            'token' => $reminder['token'],
+            'token' => $token,
         ];
 
         $response = $broker->reset($credentials, function ($user, $password) {