mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-13 10:42:16 +01:00
Moved invitation from jetstream to API; Deactived moved jetstream features
This commit is contained in:
committed by
Constantin Graf
parent
555417dbbd
commit
fd8d596e9b
@@ -11,14 +11,13 @@ use App\Models\User;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
use Laravel\Jetstream\Mail\TeamInvitation;
|
||||
use Tests\TestCase;
|
||||
|
||||
class InviteTeamMemberTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
public function test_team_members_can_be_invited_to_team(): void
|
||||
public function test_team_members_can_no_longer_be_invited_to_team_over_jetstream(): void
|
||||
{
|
||||
// Arrange
|
||||
Mail::fake();
|
||||
@@ -31,54 +30,12 @@ class InviteTeamMemberTest extends TestCase
|
||||
]);
|
||||
|
||||
// Assert
|
||||
Mail::assertSent(TeamInvitation::class);
|
||||
$this->assertCount(1, $user->currentTeam->fresh()->teamInvitations);
|
||||
$response->assertStatus(403);
|
||||
$response->assertSee('Moved to API');
|
||||
Mail::assertNothingSent();
|
||||
}
|
||||
|
||||
public function test_team_member_can_not_be_invited_to_team_if_already_on_team(): void
|
||||
{
|
||||
// Arrange
|
||||
Mail::fake();
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
$existingUser = User::factory()->create();
|
||||
$user->currentTeam->users()->attach($existingUser, ['role' => 'admin']);
|
||||
$this->actingAs($user);
|
||||
|
||||
// Act
|
||||
$response = $this->post('/teams/'.$user->currentTeam->id.'/members', [
|
||||
'email' => $existingUser->email,
|
||||
'role' => 'admin',
|
||||
]);
|
||||
|
||||
// Assert
|
||||
$response->assertInvalid(['email'], 'addTeamMember');
|
||||
Mail::assertNotSent(TeamInvitation::class);
|
||||
$this->assertCount(0, $user->currentTeam->fresh()->teamInvitations);
|
||||
}
|
||||
|
||||
public function test_team_member_can_be_invited_to_team_if_already_on_team_as_placeholder(): void
|
||||
{
|
||||
// Arrange
|
||||
Mail::fake();
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
$existingUser = User::factory()->create([
|
||||
'is_placeholder' => true,
|
||||
]);
|
||||
$user->currentTeam->users()->attach($existingUser, ['role' => Role::Employee->value]);
|
||||
$this->actingAs($user);
|
||||
|
||||
// Act
|
||||
$response = $this->post('/teams/'.$user->currentTeam->id.'/members', [
|
||||
'email' => $existingUser->email,
|
||||
'role' => Role::Employee->value,
|
||||
]);
|
||||
|
||||
// Assert
|
||||
Mail::assertSent(TeamInvitation::class);
|
||||
$this->assertCount(1, $user->currentTeam->fresh()->teamInvitations);
|
||||
}
|
||||
|
||||
public function test_team_member_invitations_can_be_cancelled(): void
|
||||
public function test_team_member_invitations_can_no_longer_be_cancelled_over_jetstream(): void
|
||||
{
|
||||
// Arrange
|
||||
Mail::fake();
|
||||
@@ -94,7 +51,8 @@ class InviteTeamMemberTest extends TestCase
|
||||
$response = $this->delete('/team-invitations/'.$invitation->id);
|
||||
|
||||
// Assert
|
||||
$this->assertCount(0, $user->currentTeam->fresh()->teamInvitations);
|
||||
$response->assertStatus(403);
|
||||
$this->assertCount(1, $user->currentTeam->fresh()->teamInvitations);
|
||||
}
|
||||
|
||||
public function test_team_member_invitations_can_be_accepted(): void
|
||||
@@ -153,6 +111,7 @@ class InviteTeamMemberTest extends TestCase
|
||||
$response = $this->get($acceptUrl);
|
||||
|
||||
// Assert
|
||||
$response->assertRedirect();
|
||||
$user->refresh();
|
||||
$this->assertDatabaseMissing(User::class, ['id' => $placeholder->id]);
|
||||
$this->assertCount(0, $owner->currentTeam->fresh()->teamInvitations);
|
||||
|
||||
@@ -12,8 +12,9 @@ class LeaveTeamTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
public function test_users_can_leave_teams(): void
|
||||
public function test_users_can_no_longer_leave_team_over_jetstream(): void
|
||||
{
|
||||
// Arrange
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
|
||||
$user->currentTeam->users()->attach(
|
||||
@@ -22,19 +23,11 @@ class LeaveTeamTest extends TestCase
|
||||
|
||||
$this->actingAs($otherUser);
|
||||
|
||||
// Act
|
||||
$response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id);
|
||||
|
||||
$this->assertCount(1, $user->currentTeam->fresh()->users);
|
||||
}
|
||||
|
||||
public function test_team_owners_cant_leave_their_own_team(): void
|
||||
{
|
||||
$this->actingAs($user = User::factory()->withPersonalOrganization()->create());
|
||||
|
||||
$response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$user->id);
|
||||
|
||||
$response->assertSessionHasErrorsIn('removeTeamMember', ['team']);
|
||||
|
||||
$this->assertNotNull($user->currentTeam->fresh());
|
||||
// Assert
|
||||
$response->assertStatus(403);
|
||||
$this->assertCount(2, $user->currentTeam->fresh()->users);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,31 +12,20 @@ class RemoveTeamMemberTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
public function test_team_members_can_be_removed_from_teams(): void
|
||||
public function test_team_members_can_no_longer_be_removed_from_teams_over_jetstream_endpoints(): void
|
||||
{
|
||||
// Arrange
|
||||
$this->actingAs($user = User::factory()->withPersonalOrganization()->create());
|
||||
|
||||
$user->currentTeam->users()->attach(
|
||||
$otherUser = User::factory()->create(), ['role' => 'admin']
|
||||
);
|
||||
|
||||
$response = $this->withoutExceptionHandling()->delete('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id);
|
||||
// Act
|
||||
$response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id);
|
||||
|
||||
$this->assertCount(1, $user->currentTeam->fresh()->users);
|
||||
}
|
||||
|
||||
public function test_only_team_owner_can_remove_team_members(): void
|
||||
{
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
|
||||
$user->currentTeam->users()->attach(
|
||||
$otherUser = User::factory()->create(), ['role' => 'admin']
|
||||
);
|
||||
|
||||
$this->actingAs($otherUser);
|
||||
|
||||
$response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$user->id);
|
||||
|
||||
$response->assertForbidden();
|
||||
// Assert
|
||||
$response->assertStatus(403);
|
||||
$response->assertSee('Moved to API');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ class UpdateTeamMemberRoleTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
public function test_team_member_roles_can_be_updated(): void
|
||||
public function test_team_member_roles_can_no_longer_be_updated_over_jetstream(): void
|
||||
{
|
||||
// Arrange
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
@@ -28,73 +28,8 @@ class UpdateTeamMemberRoleTest extends TestCase
|
||||
'role' => Role::Employee->value,
|
||||
]);
|
||||
|
||||
// Assert
|
||||
$this->assertTrue($otherUser->fresh()->hasTeamRole(
|
||||
$user->currentTeam->fresh(), Role::Employee->value,
|
||||
));
|
||||
}
|
||||
|
||||
public function test_team_member_roles_can_not_be_updated_to_placeholder(): void
|
||||
{
|
||||
// Arrange
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
$this->actingAs($user);
|
||||
|
||||
$user->currentTeam->users()->attach(
|
||||
$otherUser = User::factory()->create(), ['role' => 'admin']
|
||||
);
|
||||
|
||||
// Act
|
||||
$response = $this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
|
||||
'role' => 'placeholder',
|
||||
]);
|
||||
|
||||
// Assert
|
||||
$this->assertTrue($otherUser->fresh()->hasTeamRole(
|
||||
$user->currentTeam->fresh(), 'admin'
|
||||
));
|
||||
}
|
||||
|
||||
public function test_team_member_roles_can_be_updated_to_owner_which_changes_ownership(): void
|
||||
{
|
||||
// Arrange
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
$this->actingAs($user);
|
||||
$otherUser = User::factory()->create();
|
||||
$user->currentTeam->users()->attach($otherUser, ['role' => 'admin']);
|
||||
|
||||
// Act
|
||||
$response = $this->withoutExceptionHandling()->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->getKey(), [
|
||||
'role' => Role::Owner->value,
|
||||
]);
|
||||
|
||||
// Assert
|
||||
$this->assertTrue($otherUser->fresh()->hasTeamRole(
|
||||
$user->currentTeam->fresh(), Role::Owner->value
|
||||
));
|
||||
$this->assertSame($user->currentTeam->fresh()->user_id, $otherUser->getKey());
|
||||
}
|
||||
|
||||
public function test_only_team_owner_can_update_team_member_roles(): void
|
||||
{
|
||||
// Arrange
|
||||
$user = User::factory()->withPersonalOrganization()->create();
|
||||
|
||||
$user->currentTeam->users()->attach(
|
||||
$otherUser = User::factory()->create(), ['role' => 'admin']
|
||||
);
|
||||
|
||||
$this->actingAs($otherUser);
|
||||
|
||||
// Act
|
||||
$response = $this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
|
||||
'role' => Role::Employee->value,
|
||||
]);
|
||||
|
||||
// Assert
|
||||
$response->assertStatus(403);
|
||||
$this->assertTrue($otherUser->fresh()->hasTeamRole(
|
||||
$user->currentTeam->fresh(), 'admin'
|
||||
));
|
||||
$response->assertSee('Moved to API');
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user