-
Notifications
You must be signed in to change notification settings - Fork 7.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: team and org invite e2e tests #12566
Merged
+66
−84
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
import { expect } from "@playwright/test"; | ||
|
||
import { test } from "../lib/fixtures"; | ||
import { getInviteLink } from "../lib/testUtils"; | ||
import { expectInvitationEmailToBeReceived } from "./expects"; | ||
|
||
test.describe.configure({ mode: "parallel" }); | ||
|
||
test.afterEach(async ({ users, emails, clipboard }) => { | ||
clipboard.reset(); | ||
test.afterEach(async ({ users, emails }) => { | ||
await users.deleteAll(); | ||
emails?.deleteAll(); | ||
}); | ||
|
||
test.describe("Organization", () => { | ||
test("Invitation (non verified)", async ({ browser, page, users, emails, clipboard }) => { | ||
test("Invitation (non verified)", async ({ browser, page, users, emails }) => { | ||
const orgOwner = await users.create(undefined, { hasTeam: true, isOrg: true }); | ||
const { team: org } = await orgOwner.getOrgMembership(); | ||
await orgOwner.apiLogin(); | ||
|
@@ -69,9 +69,8 @@ test.describe("Organization", () => { | |
// Get the invite link | ||
await page.locator('button:text("Add")').click(); | ||
await page.locator(`[data-testid="copy-invite-link-button"]`).click(); | ||
const inviteLink = await clipboard.get(); | ||
await page.waitForLoadState("networkidle"); | ||
|
||
const inviteLink = await getInviteLink(page); | ||
// Follow invite link in new window | ||
const context = await browser.newContext(); | ||
const inviteLinkPage = await context.newPage(); | ||
|
@@ -98,7 +97,7 @@ test.describe("Organization", () => { | |
await page.waitForLoadState("networkidle"); | ||
|
||
await test.step("To the organization by email (internal user)", async () => { | ||
const invitedUserEmail = `[email protected]`; | ||
const invitedUserEmail = `rick-${Date.now()}@example.com`; | ||
await page.locator('button:text("Add")').click(); | ||
await page.locator('input[name="inviteUser"]').fill(invitedUserEmail); | ||
await page.locator('button:text("Send invite")').click(); | ||
|
@@ -110,7 +109,7 @@ test.describe("Organization", () => { | |
`${org.name}'s admin invited you to join the organization ${org.name} on Cal.com` | ||
); | ||
|
||
// Check newly invited member exists and is pending | ||
// Check newly invited member exists and is not pending | ||
await expect( | ||
page.locator(`[data-testid="email-${invitedUserEmail.replace("@", "")}-pending"]`) | ||
).toHaveCount(0); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -214,16 +214,17 @@ export async function getTeamWithMembers(args: { | |
|
||
// also returns team | ||
export async function isTeamAdmin(userId: number, teamId: number) { | ||
return ( | ||
(await prisma.membership.findFirst({ | ||
where: { | ||
userId, | ||
teamId, | ||
accepted: true, | ||
OR: [{ role: "ADMIN" }, { role: "OWNER" }], | ||
}, | ||
})) || false | ||
); | ||
const team = await prisma.membership.findFirst({ | ||
where: { | ||
userId, | ||
teamId, | ||
accepted: true, | ||
OR: [{ role: "ADMIN" }, { role: "OWNER" }], | ||
}, | ||
include: { team: true }, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So we don't double query and can reuse the response |
||
}); | ||
if (!team) return false; | ||
return team; | ||
} | ||
|
||
export async function isTeamOwner(userId: number, teamId: number) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We send the fully formed invite link from the server