Skip to content
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.

Sign up for GitHub

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

✨Public and restricted doc editable #357

Merged
merged 2 commits into from
Oct 23, 2024
Merged

✨Public and restricted doc editable #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4754720
♻️(frontend) minor components update
AntoLC Oct 21, 2024
9c901b5
✨(frontend) increase doc visibility options
AntoLC Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to

- 📝Contributing.md #352
- 🌐(frontend) add localization to editor #268
- ✨Public and restricted doc editable #357

## Fixed

Expand Down
35 changes: 9 additions & 26 deletions src/frontend/apps/e2e/__tests__/app-impress/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ export const keyCloakSignIn = async (page: Page, browserName: string) => {
const login = `user-e2e-${browserName}`;
const password = `password-e2e-${browserName}`;

if (await page.getByLabel('Restart login').isVisible()) {
await page.getByRole('textbox', { name: 'password' }).fill(password);

await page.click('input[type="submit"]', { force: true });
} else {
await page.getByRole('textbox', { name: 'username' }).fill(login);

await page.getByRole('textbox', { name: 'password' }).fill(password);
await expect(
page.locator('.login-pf-page-header').getByText('impress'),
).toBeVisible();

await page.click('input[type="submit"]', { force: true });
if (await page.getByLabel('Restart login').isVisible()) {
await page.getByLabel('Restart login').click();
}

await page.getByRole('textbox', { name: 'username' }).fill(login);
await page.getByRole('textbox', { name: 'password' }).fill(password);
await page.click('input[type="submit"]', { force: true });
};

export const randomName = (name: string, browserName: string, length: number) =>
Expand All @@ -27,7 +27,6 @@ export const createDoc = async (
docName: string,
browserName: string,
length: number,
isPublic: boolean = false,
) => {
const randomDocs = randomName(docName, browserName, length);

Expand All @@ -44,22 +43,6 @@ export const createDoc = async (
await page.getByRole('heading', { name: 'Untitled document' }).click();
await page.keyboard.type(randomDocs[i]);
await page.getByText('Created at ').click();

if (isPublic) {
await page.getByRole('button', { name: 'Share' }).click();
await page.getByText('Doc private').click();

await page.locator('.c__modal__backdrop').click({
position: { x: 0, y: 0 },
force: true,
});

await expect(
page
.getByLabel('It is the card information about the document.')
.getByText('Public'),
).toBeVisible();
}
}

return randomDocs;
Expand Down
18 changes: 15 additions & 3 deletions src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,11 @@ test.describe('Doc Header', () => {

const shareModal = page.getByLabel('Share modal');

await expect(shareModal.getByLabel('Doc private')).toBeEnabled();
await expect(
shareModal.getByRole('combobox', {
name: 'Visibility',
}),
).not.toHaveAttribute('disabled');
await expect(shareModal.getByText('Search by email')).toBeVisible();

const invitationCard = shareModal.getByLabel('List invitation card');
Expand Down Expand Up @@ -284,7 +288,11 @@ test.describe('Doc Header', () => {

const shareModal = page.getByLabel('Share modal');

await expect(shareModal.getByLabel('Doc private')).toBeDisabled();
await expect(
shareModal.getByRole('combobox', {
name: 'Visibility',
}),
).toHaveAttribute('disabled');
await expect(shareModal.getByText('Search by email')).toBeHidden();

const invitationCard = shareModal.getByLabel('List invitation card');
Expand Down Expand Up @@ -357,7 +365,11 @@ test.describe('Doc Header', () => {

const shareModal = page.getByLabel('Share modal');

await expect(shareModal.getByLabel('Doc private')).toBeDisabled();
await expect(
shareModal.getByRole('combobox', {
name: 'Visibility',
}),
).toHaveAttribute('disabled');
await expect(shareModal.getByText('Search by email')).toBeHidden();

const invitationCard = shareModal.getByLabel('List invitation card');
Expand Down
12 changes: 10 additions & 2 deletions src/frontend/apps/e2e/__tests__/app-impress/doc-member-list.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,22 @@ test.describe('Document list members', () => {
const shareModal = page.getByLabel('Share modal');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests to know if restrictions should be shown or not based on visibility


// Admin still have the right to share
await expect(shareModal.getByLabel('Doc private')).toBeEnabled();
await expect(
shareModal.getByRole('combobox', {
name: 'Visibility',
}),
).not.toHaveAttribute('disabled');

await SelectRoleCurrentUser.click();
await page.getByRole('option', { name: 'Reader' }).click();
await expect(page.getByText('The role has been updated')).toBeVisible();

// Reader does not have the right to share
await expect(shareModal.getByLabel('Doc private')).toBeDisabled();
await expect(
shareModal.getByRole('combobox', {
name: 'Visibility',
}),
).toHaveAttribute('disabled');
});

test('it checks the delete members', async ({ page, browserName }) => {
Expand Down
Loading
Loading