Skip to content

Commit 6af0565

Browse files
driesvintsdriesvints
authored
Merge pull request #34252 from open-source-contributions/improve_auth_test_assert
Improve assertions for classes on Auth folder
2 parents f7493ab + e8977ad commit 6af0565

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎tests/Auth/AuthAccessGateTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public function testCurrentUserThatIsOnGateAlwaysInjectedIntoClosureCallbacks()
328328
$gate = $this->getBasicGate();
329329

330330
$gate->define('foo', function ($user) {
331-
$this->assertEquals(1, $user->id);
331+
$this->assertSame(1, $user->id);
332332

333333
return true;
334334
});
@@ -519,7 +519,7 @@ public function testForUserMethodAttachesANewUserToANewGateInstance()
519519

520520
// Assert that the callback receives the new user with ID of 2 instead of ID of 1...
521521
$gate->define('foo', function ($user) {
522-
$this->assertEquals(2, $user->id);
522+
$this->assertSame(2, $user->id);
523523

524524
return true;
525525
});
@@ -541,16 +541,16 @@ public function testForUserMethodAttachesANewUserToANewGateInstanceWithGuessCall
541541
};
542542
$gate->guessPolicyNamesUsing($guesserCallback);
543543
$gate->getPolicyFor('fooClass');
544-
$this->assertEquals(1, $counter);
544+
$this->assertSame(1, $counter);
545545

546546
// now the guesser callback should be present on the new gate as well
547547
$newGate = $gate->forUser((object) ['id' => 1]);
548548

549549
$newGate->getPolicyFor('fooClass');
550-
$this->assertEquals(2, $counter);
550+
$this->assertSame(2, $counter);
551551

552552
$newGate->getPolicyFor('fooClass');
553-
$this->assertEquals(3, $counter);
553+
$this->assertSame(3, $counter);
554554
}
555555

556556
/**

‎tests/Auth/AuthDatabaseUserProviderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testRetrieveByIDReturnsUserWhenUserIsFound()
2828
$user = $provider->retrieveById(1);
2929

3030
$this->assertInstanceOf(GenericUser::class, $user);
31-
$this->assertEquals(1, $user->getAuthIdentifier());
31+
$this->assertSame(1, $user->getAuthIdentifier());
3232
$this->assertSame('Dayle', $user->name);
3333
}
3434

@@ -98,7 +98,7 @@ public function testRetrieveByCredentialsReturnsUserWhenUserIsFound()
9898
$user = $provider->retrieveByCredentials(['username' => 'dayle', 'password' => 'foo', 'group' => ['one', 'two']]);
9999

100100
$this->assertInstanceOf(GenericUser::class, $user);
101-
$this->assertEquals(1, $user->getAuthIdentifier());
101+
$this->assertSame(1, $user->getAuthIdentifier());
102102
$this->assertSame('taylor', $user->name);
103103
}
104104

‎tests/Auth/AuthPasswordBrokerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testIfUserIsNotFoundErrorRedirectIsReturned()
2626
$broker = $this->getMockBuilder(PasswordBroker::class)->setMethods(['getUser', 'makeErrorRedirect'])->setConstructorArgs(array_values($mocks))->getMock();
2727
$broker->expects($this->once())->method('getUser')->willReturn(null);
2828

29-
$this->assertEquals(PasswordBrokerContract::INVALID_USER, $broker->sendResetLink(['credentials']));
29+
$this->assertSame(PasswordBrokerContract::INVALID_USER, $broker->sendResetLink(['credentials']));
3030
}
3131

3232
public function testIfTokenIsRecentlyCreated()
@@ -37,7 +37,7 @@ public function testIfTokenIsRecentlyCreated()
3737
$mocks['tokens']->shouldReceive('recentlyCreatedToken')->once()->with($user)->andReturn(true);
3838
$user->shouldReceive('sendPasswordResetNotification')->with('token');
3939

40-
$this->assertEquals(PasswordBrokerContract::RESET_THROTTLED, $broker->sendResetLink(['foo']));
40+
$this->assertSame(PasswordBrokerContract::RESET_THROTTLED, $broker->sendResetLink(['foo']));
4141
}
4242

4343
public function testGetUserThrowsExceptionIfUserDoesntImplementCanResetPassword()
@@ -68,15 +68,15 @@ public function testBrokerCreatesTokenAndRedirectsWithoutError()
6868
$mocks['tokens']->shouldReceive('create')->once()->with($user)->andReturn('token');
6969
$user->shouldReceive('sendPasswordResetNotification')->with('token');
7070

71-
$this->assertEquals(PasswordBrokerContract::RESET_LINK_SENT, $broker->sendResetLink(['foo']));
71+
$this->assertSame(PasswordBrokerContract::RESET_LINK_SENT, $broker->sendResetLink(['foo']));
7272
}
7373

7474
public function testRedirectIsReturnedByResetWhenUserCredentialsInvalid()
7575
{
7676
$broker = $this->getBroker($mocks = $this->getMocks());
7777
$mocks['users']->shouldReceive('retrieveByCredentials')->once()->with(['creds'])->andReturn(null);
7878

79-
$this->assertEquals(PasswordBrokerContract::INVALID_USER, $broker->reset(['creds'], function () {
79+
$this->assertSame(PasswordBrokerContract::INVALID_USER, $broker->reset(['creds'], function () {
8080
//
8181
}));
8282
}
@@ -88,7 +88,7 @@ public function testRedirectReturnedByRemindWhenRecordDoesntExistInTable()
8888
$mocks['users']->shouldReceive('retrieveByCredentials')->once()->with(Arr::except($creds, ['token']))->andReturn($user = m::mock(CanResetPassword::class));
8989
$mocks['tokens']->shouldReceive('exists')->with($user, 'token')->andReturn(false);
9090

91-
$this->assertEquals(PasswordBrokerContract::INVALID_TOKEN, $broker->reset($creds, function () {
91+
$this->assertSame(PasswordBrokerContract::INVALID_TOKEN, $broker->reset($creds, function () {
9292
//
9393
}));
9494
}
@@ -105,7 +105,7 @@ public function testResetRemovesRecordOnReminderTableAndCallsCallback()
105105
return 'foo';
106106
};
107107

108-
$this->assertEquals(PasswordBrokerContract::PASSWORD_RESET, $broker->reset(['password' => 'password', 'token' => 'token'], $callback));
108+
$this->assertSame(PasswordBrokerContract::PASSWORD_RESET, $broker->reset(['password' => 'password', 'token' => 'token'], $callback));
109109
$this->assertEquals(['user' => $user, 'password' => 'password'], $_SERVER['__password.reset.test']);
110110
}
111111

‎tests/Auth/AuthTokenGuardTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public function testUserCanBeRetrievedByQueryStringVariable()
2727

2828
$user = $guard->user();
2929

30-
$this->assertEquals(1, $user->id);
30+
$this->assertSame(1, $user->id);
3131
$this->assertTrue($guard->check());
3232
$this->assertFalse($guard->guest());
33-
$this->assertEquals(1, $guard->id());
33+
$this->assertSame(1, $guard->id());
3434
}
3535

3636
public function testTokenCanBeHashed()
@@ -45,10 +45,10 @@ public function testTokenCanBeHashed()
4545

4646
$user = $guard->user();
4747

48-
$this->assertEquals(1, $user->id);
48+
$this->assertSame(1, $user->id);
4949
$this->assertTrue($guard->check());
5050
$this->assertFalse($guard->guest());
51-
$this->assertEquals(1, $guard->id());
51+
$this->assertSame(1, $guard->id());
5252
}
5353

5454
public function testUserCanBeRetrievedByAuthHeaders()
@@ -61,7 +61,7 @@ public function testUserCanBeRetrievedByAuthHeaders()
6161

6262
$user = $guard->user();
6363

64-
$this->assertEquals(1, $user->id);
64+
$this->assertSame(1, $user->id);
6565
}
6666

6767
public function testUserCanBeRetrievedByBearerToken()
@@ -74,7 +74,7 @@ public function testUserCanBeRetrievedByBearerToken()
7474

7575
$user = $guard->user();
7676

77-
$this->assertEquals(1, $user->id);
77+
$this->assertSame(1, $user->id);
7878
}
7979

8080
public function testValidateCanDetermineIfCredentialsAreValid()
@@ -124,7 +124,7 @@ public function testItAllowsToPassCustomRequestInSetterAndUseItForValidation()
124124

125125
$user = $guard->user();
126126

127-
$this->assertEquals(1, $user->id);
127+
$this->assertSame(1, $user->id);
128128
}
129129

130130
public function testUserCanBeRetrievedByBearerTokenWithCustomKey()
@@ -137,7 +137,7 @@ public function testUserCanBeRetrievedByBearerTokenWithCustomKey()
137137

138138
$user = $guard->user();
139139

140-
$this->assertEquals(1, $user->id);
140+
$this->assertSame(1, $user->id);
141141
}
142142

143143
public function testUserCanBeRetrievedByQueryStringVariableWithCustomKey()
@@ -152,10 +152,10 @@ public function testUserCanBeRetrievedByQueryStringVariableWithCustomKey()
152152

153153
$user = $guard->user();
154154

155-
$this->assertEquals(1, $user->id);
155+
$this->assertSame(1, $user->id);
156156
$this->assertTrue($guard->check());
157157
$this->assertFalse($guard->guest());
158-
$this->assertEquals(1, $guard->id());
158+
$this->assertSame(1, $guard->id());
159159
}
160160

161161
public function testUserCanBeRetrievedByAuthHeadersWithCustomField()
@@ -168,7 +168,7 @@ public function testUserCanBeRetrievedByAuthHeadersWithCustomField()
168168

169169
$user = $guard->user();
170170

171-
$this->assertEquals(1, $user->id);
171+
$this->assertSame(1, $user->id);
172172
}
173173

174174
public function testValidateCanDetermineIfCredentialsAreValidWithCustomKey()

0 commit comments

Comments
 (0)