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

Jump to bottom

Add new tests #114

Merged
merged 1 commit into from
Sep 22, 2024
Merged

Add new tests #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion public/admin/santaAdmin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ <h5 class="modal-title">
<option selected value="">Choose...</option>
</select>
<label for="forbiddenUser2"
>Will never be paired with (and vice-versa):</label
>Will never be paired with (and vice versa):</label
>
<select class="form-select" id="forbiddenUser2" required>
<option selected value="">Choose...</option>
Expand Down
2 changes: 1 addition & 1 deletion public/chat/message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<span data-name="chatTo"></span>
<div class="">
<button
data-name="msgDelete"
data-name="deleteChatMessage"
type="button"
class="btn-close align-self-top w-25 h-25"
data-bs-toggle="modal"
Expand Down
4 changes: 2 additions & 2 deletions public/chat/santaChat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ $(async function () {
.text(`From: ${item.from || 'Anonymous'}`);

$(chatElement)
.find('[data-name="msgDelete"]')
.find('[data-name="deleteChatMessage"]')
.on('click', function () {
chatId = item._id;
chatEl = chatElement;
Expand Down Expand Up @@ -93,7 +93,7 @@ $(async function () {
$(chatElement).find('[data-name="chatFrom"]').text('From: you');

$(chatElement)
.find('[data-name="msgDelete"]')
.find('[data-name="deleteChatMessage"]')
.on('click', function () {
chatId = response.insertedId;
chatEl = chatElement;
Expand Down
2 changes: 1 addition & 1 deletion routers/admin-router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ adminRouter.post('/api/user', async (req, res) => {
}

const response = {
success: `User '${req.body.email}' invited to the group: ${activeGroup._id}`,
success: `User '${req.body.email}' invited to the group: ${activeGroup.name}`,
userId: userId,
};
if (activeGroup.userAddedNotification === true) {
Expand Down
56 changes: 55 additions & 1 deletion tests/admin.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { createNewGroup, createDraftedGroup } from './helpers/setup.js';
test.describe('admin tests', () => {
test.describe('group settings tests', () => {
test('admin can change group settings', async ({ page }) => {
const groupData = await createDraftedGroup(page.request);
const groupData = await createNewGroup(page.request);
await login(
page.request,
groupData.users.admin.email,
Expand Down Expand Up @@ -43,6 +43,60 @@ test.describe('admin tests', () => {
});
});

test.describe('user group tests', () => {
test('admin can invite a non existing user to the group', async ({
page,
}) => {
const groupData = await createNewGroup(page.request);
await login(
page.request,
groupData.users.admin.email,
groupData.users.admin.password
);
await page.goto('/admin');

await page.getByRole('button', { name: 'Invite new users' }).click();

const email = faker.internet.email();
await page.getByLabel('Email address').fill(email);
await page.getByRole('button', { name: 'Invite', exact: true }).click();

await expect(
page.locator('[data-name="userEmail"]').getByText(email)
).toBeVisible();
await expect(page.locator('#footerAlert')).toHaveText(
`User '${email}' invited to the group: ${groupData.group.name}`
);
});

test('admin can invite an existing user to the group', async ({ page }) => {
const groupData = await createNewGroup(page.request);
const user = {
email: faker.internet.email(),
password: faker.internet.password(),
};
await registerUser(page.request, user);
await login(
page.request,
groupData.users.admin.email,
groupData.users.admin.password
);
await page.goto('/admin');

await page.getByRole('button', { name: 'Invite new users' }).click();

await page.getByLabel('Email address').fill(user.email);
await page.getByRole('button', { name: 'Invite', exact: true }).click();

await expect(
page.locator('[data-name="userEmail"]').getByText(user.email)
).toBeVisible();
await expect(page.locator('#footerAlert')).toHaveText(
`User '${user.email}' invited to the group: ${groupData.group.name}`
);
});
});

test.describe('drafting pairs tests', () => {
test('admin can draft pairs', async ({ page }) => {
const adminUser = {
Expand Down
37 changes: 37 additions & 0 deletions tests/chat.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
);
await page.goto('/chat');

await expect(page.locator('[data-name="chatTo"]')).toContainText(

Check failure on line 56 in tests/chat.spec.js

View workflow job for this annotation

GitHub Actions / build

[chromium] › chat.spec.js:36:3 › chat tests › user can see received messages 

  1) [chromium] › chat.spec.js:36:3 › chat tests › user can see received messages ──────────────────
    Error: expect.toContainText: Error: strict mode violation: locator('[data-name="chatTo"]') resolved to 2 elements:
        1) <span data-name="chatTo">To: Jay Roberts</span> aka getByText('To: Jay Roberts').first()
        2) <span data-name="chatTo">To: Jay Roberts</span> aka getByText('To: Jay Roberts').nth(1)

    Call log:
      - expect.toContainText with timeout 5000ms
      - waiting for locator('[data-name="chatTo"]')


      54 |     await page.goto('/chat');
      55 |
    > 56 |     await expect(page.locator('[data-name="chatTo"]')).toContainText(
         |                                                        ^
      57 |       groupData.users.user2.name
      58 |     );
      59 |     await expect(page.locator('[data-name="chatMessage"]')).toHaveText(

        at /home/runner/work/secretsanta/secretsanta/tests/chat.spec.js:56:56
groupData.users.user2.name
);
await expect(page.locator('[data-name="chatMessage"]')).toHaveText(
Expand All @@ -64,6 +64,43 @@
);
});

test('user/admin cannot/can delete a message', async ({ page }) => {
await login(
page.request,
groupData.users.user1.email,
groupData.users.user1.password
);
const message = {
userId: groupData.users.user2.id,
email: groupData.users.user2.email,
message: faker.word.words(10),
};
await sendMessage(page.request, message);

await login(
page.request,
groupData.users.user2.email,
groupData.users.user2.password
);
await page.goto('/chat');
await page.locator('[data-name="deleteChatMessage"]').click();

Check failure on line 86 in tests/chat.spec.js

View workflow job for this annotation

GitHub Actions / build

[chromium] › chat.spec.js:67:3 › chat tests › user/admin cannot/can delete a message 

  2) [chromium] › chat.spec.js:67:3 › chat tests › user/admin cannot/can delete a message ──────────
    Error: locator.click: Error: strict mode violation: locator('[data-name="deleteChatMessage"]') resolved to 2 elements:
        1) <button type="button" data-bs-toggle="modal" data-name="deleteChatMessage" data-bs-target="#confirmationDialog" class="btn-close align-self-top w-25 h-25"></button> aka locator('#chat div').filter({ hasText: 'To: Bob Legros braid finally' }).getByRole('button')
        2) <button type="button" data-bs-toggle="modal" data-name="deleteChatMessage" data-bs-target="#confirmationDialog" class="btn-close align-self-top w-25 h-25"></button> aka locator('#chat div').filter({ hasText: 'To: Bob Legros step until' }).getByRole('button')

    Call log:
      - waiting for locator('[data-name="deleteChatMessage"]')


      84 |     );
      85 |     await page.goto('/chat');
    > 86 |     await page.locator('[data-name="deleteChatMessage"]').click();
         |                                                           ^
      87 |     await page.getByRole('button', { name: 'Delete message' }).click();
      88 |     await expect(page.locator('#footerAlert')).toHaveText(
      89 |       'User not allowed to delete messages!'

        at /home/runner/work/secretsanta/secretsanta/tests/chat.spec.js:86:59
await page.getByRole('button', { name: 'Delete message' }).click();
await expect(page.locator('#footerAlert')).toHaveText(
'User not allowed to delete messages!'
);
await login(
page.request,
groupData.users.admin.email,
groupData.users.admin.password
);
await page.goto('/chat');
await page.locator('[data-name="deleteChatMessage"]').click();
await page.getByRole('button', { name: 'Delete message' }).click();
await expect(page.locator('#footerAlert')).toHaveText(
'The message was successfully deleted'
);
});

test('user with no group cannot access chat page', async ({ page }) => {
const user = {
email: faker.internet.email(),
Expand Down
84 changes: 2 additions & 82 deletions tests/email.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,47 +122,7 @@ test.describe('email tests', () => {

test.describe('chat tests', () => {
test('user should receive a chat email', async ({ page }) => {
const defaultData = {
users: {
admin: {
email: faker.internet.email(),
password: 'test',
name: faker.person.fullName(),
address: {
street: faker.location.street(),
city: faker.location.city(),
postalCode: faker.location.zipCode(),
state: faker.location.state(),
},
},
user1: {
email: faker.internet.email(),
password: 'test',
name: faker.person.fullName(),
address: {
street: faker.location.street(),
city: faker.location.city(),
postalCode: faker.location.zipCode(),
state: faker.location.state(),
},
},
user2: {
email: faker.internet.email(),
password: 'test',
name: faker.person.fullName(),
address: {
street: faker.location.street(),
city: faker.location.city(),
postalCode: faker.location.zipCode(),
state: faker.location.state(),
},
},
},
group: {
name: faker.word.noun(),
},
};
const groupData = await createDraftedGroup(page.request, defaultData);
const groupData = await createDraftedGroup(page.request);
const updatedGroupData = {
name: groupData.group.name,
userAddedNotification: false,
Expand Down Expand Up @@ -196,47 +156,7 @@ test.describe('chat tests', () => {
});

test('user should not receives a chat email', async ({ page }) => {
const defaultData = {
users: {
admin: {
email: faker.internet.email(),
password: 'test',
name: faker.person.fullName(),
address: {
street: faker.location.street(),
city: faker.location.city(),
postalCode: faker.location.zipCode(),
state: faker.location.state(),
},
},
user1: {
email: faker.internet.email(),
password: 'test',
name: faker.person.fullName(),
address: {
street: faker.location.street(),
city: faker.location.city(),
postalCode: faker.location.zipCode(),
state: faker.location.state(),
},
},
user2: {
email: faker.internet.email(),
password: 'test',
name: faker.person.fullName(),
address: {
street: faker.location.street(),
city: faker.location.city(),
postalCode: faker.location.zipCode(),
state: faker.location.state(),
},
},
},
group: {
name: faker.word.noun(),
},
};
const groupData = await createNewGroup(page.request, defaultData);
const groupData = await createNewGroup(page.request);
await login(
page.request,
groupData.users.user2.email,
Expand Down
Loading