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

Attempt at fixing FLP randomly failing tests #1815

Merged
merged 3 commits into from
Dec 11, 2024
Merged

Attempt at fixing FLP randomly failing tests #1815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a95222
Attempt at fixing FLP randomly failing tests
martinboulais Dec 3, 2024
620919d
Fix lint
martinboulais Dec 11, 2024
0f09619
Uniformize tests
martinboulais Dec 11, 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
7 changes: 1 addition & 6 deletions lib/public/components/Pagination/amountSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,7 @@ const perPageAmountInputComponent = (onCustomChoiceConfirm, paginationModel) =>
oninput: ({ target }) => {
paginationModel.customItemsPerPage = target.value;
},
onkeyup: ({ key }) => {
if (key === 'Enter') {
onCustomChoiceConfirm();
}
},
onblur: onCustomChoiceConfirm,
onchange: onCustomChoiceConfirm,
});

/**
Expand Down
2 changes: 0 additions & 2 deletions test/public/flps/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@
*/

const OverviewSuite = require('./overview.test');
// eslint-disable-next-line capitalized-comments
const DetailSuite = require('./detail.test');

module.exports = () => {
describe('Overview Page', OverviewSuite);
// eslint-disable-next-line capitalized-comments
describe('Detail Page', DetailSuite);
};
39 changes: 14 additions & 25 deletions test/public/flps/overview.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const {
waitForTableLength,
goToPage,
getInnerText,
fillInput,
} = require('../defaults.js');
const { resetDatabaseContent } = require('../../utilities/resetDatabaseContent.js');

Expand All @@ -33,6 +34,9 @@ module.exports = () => {
let table;
let firstRowId;

const amountSelectorSelector = '#amountSelector';
const amountSelectorButtonSelector = `${amountSelectorSelector} button`;

before(async () => {
[page, browser] = await defaultBefore(page, browser);
await page.setViewport({
Expand Down Expand Up @@ -108,8 +112,6 @@ module.exports = () => {
await page.waitForSelector('table tbody tr:nth-child(2)');
expect(await page.$(`table tbody tr:nth-child(${INFINITE_SCROLL_CHUNK})`)).to.be.null;

const amountSelectorButtonSelector = '#amountSelector button';

// Expect the dropdown options to be visible when it is selected
await pressElement(page, amountSelectorButtonSelector);

Expand All @@ -133,23 +135,19 @@ module.exports = () => {

it('can set how many flps are available per page', async () => {
// Expect the amount selector to currently be set to Infinite (after the previous test)
const amountSelectorId = '#amountSelector';
await expectInnerText(page, `${amountSelectorId} button`, 'Rows per page: Infinite ');
await expectInnerText(page, `${amountSelectorSelector} button`, 'Rows per page: Infinite ');

await pressElement(page, `${amountSelectorId} button`);
await page.waitForSelector(`${amountSelectorId} .dropup-menu`);
await pressElement(page, `${amountSelectorSelector} button`);
await page.waitForSelector(`${amountSelectorSelector} .dropup-menu`);

// Expect the amount of visible flps to reduce when the first option (5) is selected
await pressElement(page, `${amountSelectorId} .dropup-menu .menu-item`);
await pressElement(page, `${amountSelectorSelector} .dropup-menu .menu-item`);
await waitForTableLength(page, 5);
});

it('dynamically switches between visible pages in the page selector', async () => {
// Override the amount of flps visible per page manually
await page.evaluate(() => {
// eslint-disable-next-line no-undef
model.flps.pagination.itemsPerPage = 1;
});
await pressElement(page, amountSelectorButtonSelector);
await fillInput(page, `${amountSelectorSelector} input`, '1', ['input', 'change']);
await waitForTableLength(page, 1);

// Expect the page five button to now be visible, but no more than that
Expand All @@ -164,22 +162,13 @@ module.exports = () => {
});

it('notifies if table loading returned an error', async () => {
/*
* As an example, override the amount of flps visible per page manually
* We know the limit is 100 as specified by the Dto
*/
await page.evaluate(() => {
// eslint-disable-next-line no-undef
model.flps.pagination.itemsPerPage = 200;
});
await pressElement(page, amountSelectorButtonSelector);
await fillInput(page, `${amountSelectorSelector} input`, '200', ['input', 'change']);

// We expect there to be a fitting error message
await expectInnerText(page, '.alert-danger', 'Invalid Attribute: "query.page.limit" must be less than or equal to 100');

// Revert changes for next test
await page.evaluate(() => {
// eslint-disable-next-line no-undef
model.flps.pagination.itemsPerPage = 10;
});
await pressElement(page, amountSelectorButtonSelector);
await fillInput(page, `${amountSelectorSelector} input`, '10', ['input', 'change']);
});
};
Loading