Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/jetstream
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.0.4
Choose a base ref
...
head repository: laravel/jetstream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.0.5
Choose a head ref
  • 2 commits
  • 45 files changed
  • 2 contributors

Commits on Apr 10, 2024

  1. Update CHANGELOG

    taylorotwell authored and github-actions[bot] committed Apr 10, 2024
    Copy the full SHA
    b360d9f View commit details

Commits on Apr 29, 2024

  1. Remove unused variables from test stubs (#1480)

    alsterholm authored Apr 29, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    2ee2c38 View commit details
Showing with 67 additions and 63 deletions.
  1. +5 −1 CHANGELOG.md
  2. +1 −1 stubs/pest-tests/inertia/ApiTokenPermissionsTest.php
  3. +1 −1 stubs/pest-tests/inertia/BrowserSessionsTest.php
  4. +1 −1 stubs/pest-tests/inertia/CreateApiTokenTest.php
  5. +1 −1 stubs/pest-tests/inertia/CreateTeamTest.php
  6. +2 −2 stubs/pest-tests/inertia/DeleteAccountTest.php
  7. +1 −1 stubs/pest-tests/inertia/DeleteApiTokenTest.php
  8. +2 −2 stubs/pest-tests/inertia/DeleteTeamTest.php
  9. +2 −2 stubs/pest-tests/inertia/InviteTeamMemberTest.php
  10. +1 −1 stubs/pest-tests/inertia/LeaveTeamTest.php
  11. +1 −1 stubs/pest-tests/inertia/ProfileInformationTest.php
  12. +1 −1 stubs/pest-tests/inertia/RemoveTeamMemberTest.php
  13. +1 −1 stubs/pest-tests/inertia/TwoFactorAuthenticationSettingsTest.php
  14. +1 −1 stubs/pest-tests/inertia/UpdatePasswordTest.php
  15. +2 −2 stubs/pest-tests/inertia/UpdateTeamMemberRoleTest.php
  16. +1 −1 stubs/pest-tests/inertia/UpdateTeamNameTest.php
  17. +1 −1 stubs/pest-tests/livewire/BrowserSessionsTest.php
  18. +1 −1 stubs/pest-tests/livewire/DeleteAccountTest.php
  19. +2 −2 stubs/pest-tests/livewire/DeleteTeamTest.php
  20. +1 −1 stubs/pest-tests/livewire/InviteTeamMemberTest.php
  21. +2 −2 stubs/pest-tests/livewire/LeaveTeamTest.php
  22. +2 −2 stubs/pest-tests/livewire/RemoveTeamMemberTest.php
  23. +2 −2 stubs/pest-tests/livewire/UpdateTeamMemberRoleTest.php
  24. +3 −3 stubs/tests/PasswordResetTest.php
  25. +1 −1 stubs/tests/inertia/ApiTokenPermissionsTest.php
  26. +1 −1 stubs/tests/inertia/BrowserSessionsTest.php
  27. +1 −1 stubs/tests/inertia/CreateApiTokenTest.php
  28. +1 −1 stubs/tests/inertia/CreateTeamTest.php
  29. +2 −2 stubs/tests/inertia/DeleteAccountTest.php
  30. +1 −1 stubs/tests/inertia/DeleteApiTokenTest.php
  31. +2 −2 stubs/tests/inertia/DeleteTeamTest.php
  32. +2 −2 stubs/tests/inertia/InviteTeamMemberTest.php
  33. +1 −1 stubs/tests/inertia/LeaveTeamTest.php
  34. +1 −1 stubs/tests/inertia/ProfileInformationTest.php
  35. +1 −1 stubs/tests/inertia/RemoveTeamMemberTest.php
  36. +1 −1 stubs/tests/inertia/TwoFactorAuthenticationSettingsTest.php
  37. +1 −1 stubs/tests/inertia/UpdatePasswordTest.php
  38. +2 −2 stubs/tests/inertia/UpdateTeamMemberRoleTest.php
  39. +1 −1 stubs/tests/inertia/UpdateTeamNameTest.php
  40. +1 −1 stubs/tests/livewire/BrowserSessionsTest.php
  41. +2 −2 stubs/tests/livewire/DeleteTeamTest.php
  42. +1 −1 stubs/tests/livewire/InviteTeamMemberTest.php
  43. +2 −2 stubs/tests/livewire/LeaveTeamTest.php
  44. +2 −2 stubs/tests/livewire/RemoveTeamMemberTest.php
  45. +2 −2 stubs/tests/livewire/UpdateTeamMemberRoleTest.php
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release Notes

## [Unreleased](https://github.com/laravel/jetstream/compare/v5.0.3...5.x)
## [Unreleased](https://github.com/laravel/jetstream/compare/v5.0.4...5.x)

## [v5.0.4](https://github.com/laravel/jetstream/compare/v5.0.3...v5.0.4) - 2024-04-10

* Revert "[5.x] Install API optionally" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/jetstream/pull/1473

## [v5.0.3](https://github.com/laravel/jetstream/compare/v5.0.2...v5.0.3) - 2024-04-05

2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/ApiTokenPermissionsTest.php
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
'abilities' => ['create', 'read'],
]);

$response = $this->put('/user/api-tokens/'.$token->id, [
$this->put('/user/api-tokens/'.$token->id, [
'name' => $token->name,
'permissions' => [
'delete',
2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/BrowserSessionsTest.php
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
use App\Models\User;

test('other browser sessions can be logged out', function () {
$this->actingAs($user = User::factory()->create());
$this->actingAs(User::factory()->create());

$response = $this->delete('/user/other-browser-sessions', [
'password' => 'password',
2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/CreateApiTokenTest.php
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
$this->actingAs($user = User::factory()->create());
}

$response = $this->post('/user/api-tokens', [
$this->post('/user/api-tokens', [
'name' => 'Test Token',
'permissions' => [
'read',
2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/CreateTeamTest.php
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
test('teams can be created', function () {
$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$response = $this->post('/teams', [
$this->post('/teams', [
'name' => 'Test Team',
]);

4 changes: 2 additions & 2 deletions stubs/pest-tests/inertia/DeleteAccountTest.php
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
test('user accounts can be deleted', function () {
$this->actingAs($user = User::factory()->create());

$response = $this->delete('/user', [
$this->delete('/user', [
'password' => 'password',
]);

@@ -18,7 +18,7 @@
test('correct password must be provided before account can be deleted', function () {
$this->actingAs($user = User::factory()->create());

$response = $this->delete('/user', [
$this->delete('/user', [
'password' => 'wrong-password',
]);

2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/DeleteApiTokenTest.php
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
'abilities' => ['create', 'read'],
]);

$response = $this->delete('/user/api-tokens/'.$token->id);
$this->delete('/user/api-tokens/'.$token->id);

expect($user->fresh()->tokens)->toHaveCount(0);
})->skip(function () {
4 changes: 2 additions & 2 deletions stubs/pest-tests/inertia/DeleteTeamTest.php
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
$otherUser = User::factory()->create(), ['role' => 'test-role']
);

$response = $this->delete('/teams/'.$team->id);
$this->delete('/teams/'.$team->id);

expect($team->fresh())->toBeNull();
expect($otherUser->fresh()->teams)->toHaveCount(0);
@@ -23,7 +23,7 @@
test('personal teams cant be deleted', function () {
$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$response = $this->delete('/teams/'.$user->currentTeam->id);
$this->delete('/teams/'.$user->currentTeam->id);

expect($user->currentTeam->fresh())->not->toBeNull();
});
4 changes: 2 additions & 2 deletions stubs/pest-tests/inertia/InviteTeamMemberTest.php
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@

$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$response = $this->post('/teams/'.$user->currentTeam->id.'/members', [
$this->post('/teams/'.$user->currentTeam->id.'/members', [
'email' => 'test@example.com',
'role' => 'admin',
]);
@@ -32,7 +32,7 @@
'role' => 'admin',
]);

$response = $this->delete('/team-invitations/'.$invitation->id);
$this->delete('/team-invitations/'.$invitation->id);

expect($user->currentTeam->fresh()->teamInvitations)->toHaveCount(0);
})->skip(function () {
2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/LeaveTeamTest.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

$this->actingAs($otherUser);

$response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id);
$this->delete('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id);

expect($user->currentTeam->fresh()->users)->toHaveCount(0);
});
2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/ProfileInformationTest.php
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
test('profile information can be updated', function () {
$this->actingAs($user = User::factory()->create());

$response = $this->put('/user/profile-information', [
$this->put('/user/profile-information', [
'name' => 'Test Name',
'email' => 'test@example.com',
]);
2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/RemoveTeamMemberTest.php
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
$otherUser = User::factory()->create(), ['role' => 'admin']
);

$response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id);
$this->delete('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id);

expect($user->currentTeam->fresh()->users)->toHaveCount(0);
});
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

$this->withSession(['auth.password_confirmed_at' => time()]);

$response = $this->post('/user/two-factor-authentication');
$this->post('/user/two-factor-authentication');

expect($user->fresh()->two_factor_secret)->not->toBeNull();
expect($user->fresh()->recoveryCodes())->toHaveCount(8);
2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/UpdatePasswordTest.php
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
test('password can be updated', function () {
$this->actingAs($user = User::factory()->create());

$response = $this->put('/user/password', [
$this->put('/user/password', [
'current_password' => 'password',
'password' => 'new-password',
'password_confirmation' => 'new-password',
4 changes: 2 additions & 2 deletions stubs/pest-tests/inertia/UpdateTeamMemberRoleTest.php
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
$otherUser = User::factory()->create(), ['role' => 'admin']
);

$response = $this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
$this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
'role' => 'editor',
]);

@@ -27,7 +27,7 @@

$this->actingAs($otherUser);

$response = $this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
$this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
'role' => 'editor',
]);

2 changes: 1 addition & 1 deletion stubs/pest-tests/inertia/UpdateTeamNameTest.php
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
test('team names can be updated', function () {
$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$response = $this->put('/teams/'.$user->currentTeam->id, [
$this->put('/teams/'.$user->currentTeam->id, [
'name' => 'Test Team',
]);

2 changes: 1 addition & 1 deletion stubs/pest-tests/livewire/BrowserSessionsTest.php
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
use Livewire\Livewire;

test('other browser sessions can be logged out', function () {
$this->actingAs($user = User::factory()->create());
$this->actingAs(User::factory()->create());

Livewire::test(LogoutOtherBrowserSessionsForm::class)
->set('password', 'password')
2 changes: 1 addition & 1 deletion stubs/pest-tests/livewire/DeleteAccountTest.php
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
test('user accounts can be deleted', function () {
$this->actingAs($user = User::factory()->create());

$component = Livewire::test(DeleteUserForm::class)
Livewire::test(DeleteUserForm::class)
->set('password', 'password')
->call('deleteUser');

4 changes: 2 additions & 2 deletions stubs/pest-tests/livewire/DeleteTeamTest.php
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
$otherUser = User::factory()->create(), ['role' => 'test-role']
);

$component = Livewire::test(DeleteTeamForm::class, ['team' => $team->fresh()])
Livewire::test(DeleteTeamForm::class, ['team' => $team->fresh()])
->call('deleteTeam');

expect($team->fresh())->toBeNull();
@@ -26,7 +26,7 @@
test('personal teams cant be deleted', function () {
$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$component = Livewire::test(DeleteTeamForm::class, ['team' => $user->currentTeam])
Livewire::test(DeleteTeamForm::class, ['team' => $user->currentTeam])
->call('deleteTeam')
->assertHasErrors(['team']);

2 changes: 1 addition & 1 deletion stubs/pest-tests/livewire/InviteTeamMemberTest.php
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@

$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$component = Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
->set('addTeamMemberForm', [
'email' => 'test@example.com',
'role' => 'admin',
4 changes: 2 additions & 2 deletions stubs/pest-tests/livewire/LeaveTeamTest.php
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@

$this->actingAs($otherUser);

$component = Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
->call('leaveTeam');

expect($user->currentTeam->fresh()->users)->toHaveCount(0);
@@ -22,7 +22,7 @@
test('team owners cant leave their own team', function () {
$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$component = Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
->call('leaveTeam')
->assertHasErrors(['team']);

4 changes: 2 additions & 2 deletions stubs/pest-tests/livewire/RemoveTeamMemberTest.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
$otherUser = User::factory()->create(), ['role' => 'admin']
);

$component = Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
->set('teamMemberIdBeingRemoved', $otherUser->id)
->call('removeTeamMember');

@@ -27,7 +27,7 @@

$this->actingAs($otherUser);

$component = Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
->set('teamMemberIdBeingRemoved', $user->id)
->call('removeTeamMember')
->assertStatus(403);
4 changes: 2 additions & 2 deletions stubs/pest-tests/livewire/UpdateTeamMemberRoleTest.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
$otherUser = User::factory()->create(), ['role' => 'admin']
);

$component = Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
->set('managingRoleFor', $otherUser)
->set('currentRole', 'editor')
->call('updateRole');
@@ -30,7 +30,7 @@

$this->actingAs($otherUser);

$component = Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
Livewire::test(TeamMemberManager::class, ['team' => $user->currentTeam])
->set('managingRoleFor', $otherUser)
->set('currentRole', 'editor')
->call('updateRole')
6 changes: 3 additions & 3 deletions stubs/tests/PasswordResetTest.php
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ public function test_reset_password_link_can_be_requested(): void

$user = User::factory()->create();

$response = $this->post('/forgot-password', [
$this->post('/forgot-password', [
'email' => $user->email,
]);

@@ -51,7 +51,7 @@ public function test_reset_password_screen_can_be_rendered(): void

$user = User::factory()->create();

$response = $this->post('/forgot-password', [
$this->post('/forgot-password', [
'email' => $user->email,
]);

@@ -74,7 +74,7 @@ public function test_password_can_be_reset_with_valid_token(): void

$user = User::factory()->create();

$response = $this->post('/forgot-password', [
$this->post('/forgot-password', [
'email' => $user->email,
]);

2 changes: 1 addition & 1 deletion stubs/tests/inertia/ApiTokenPermissionsTest.php
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ public function test_api_token_permissions_can_be_updated(): void
'abilities' => ['create', 'read'],
]);

$response = $this->put('/user/api-tokens/'.$token->id, [
$this->put('/user/api-tokens/'.$token->id, [
'name' => $token->name,
'permissions' => [
'delete',
2 changes: 1 addition & 1 deletion stubs/tests/inertia/BrowserSessionsTest.php
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ class BrowserSessionsTest extends TestCase

public function test_other_browser_sessions_can_be_logged_out(): void
{
$this->actingAs($user = User::factory()->create());
$this->actingAs(User::factory()->create());

$response = $this->delete('/user/other-browser-sessions', [
'password' => 'password',
2 changes: 1 addition & 1 deletion stubs/tests/inertia/CreateApiTokenTest.php
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ public function test_api_tokens_can_be_created(): void

$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$response = $this->post('/user/api-tokens', [
$this->post('/user/api-tokens', [
'name' => 'Test Token',
'permissions' => [
'read',
2 changes: 1 addition & 1 deletion stubs/tests/inertia/CreateTeamTest.php
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ public function test_teams_can_be_created(): void
{
$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$response = $this->post('/teams', [
$this->post('/teams', [
'name' => 'Test Team',
]);

4 changes: 2 additions & 2 deletions stubs/tests/inertia/DeleteAccountTest.php
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ public function test_user_accounts_can_be_deleted(): void

$this->actingAs($user = User::factory()->create());

$response = $this->delete('/user', [
$this->delete('/user', [
'password' => 'password',
]);

@@ -34,7 +34,7 @@ public function test_correct_password_must_be_provided_before_account_can_be_del

$this->actingAs($user = User::factory()->create());

$response = $this->delete('/user', [
$this->delete('/user', [
'password' => 'wrong-password',
]);

2 changes: 1 addition & 1 deletion stubs/tests/inertia/DeleteApiTokenTest.php
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ public function test_api_tokens_can_be_deleted(): void
'abilities' => ['create', 'read'],
]);

$response = $this->delete('/user/api-tokens/'.$token->id);
$this->delete('/user/api-tokens/'.$token->id);

$this->assertCount(0, $user->fresh()->tokens);
}
4 changes: 2 additions & 2 deletions stubs/tests/inertia/DeleteTeamTest.php
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ public function test_teams_can_be_deleted(): void
$otherUser = User::factory()->create(), ['role' => 'test-role']
);

$response = $this->delete('/teams/'.$team->id);
$this->delete('/teams/'.$team->id);

$this->assertNull($team->fresh());
$this->assertCount(0, $otherUser->fresh()->teams);
@@ -33,7 +33,7 @@ public function test_personal_teams_cant_be_deleted(): void
{
$this->actingAs($user = User::factory()->withPersonalTeam()->create());

$response = $this->delete('/teams/'.$user->currentTeam->id);
$this->delete('/teams/'.$user->currentTeam->id);

$this->assertNotNull($user->currentTeam->fresh());
}
Loading