further extend test

Author: NarrowsProjects

test/public/Filters/FilteringModel.test.js

@@ -30,7 +30,8 @@ module.exports = () => {
         [page, browser] = await defaultBefore();
     });
 
-    // Not all filters for the pages will be checked, as many of them are identical.
+    // Not all filters for the pages will be checked, as many of them are identical between pages.
+    // Environments is not checked at all because it has no filter implementations not allready covered by other pages
     const runSelectionFiltersChecks = {
         'tags': [{ count: 1, selector: '#tag-dropdown-option-FOOD' }, { count: 0, selector: '#tag-dropdown-option-CTP' }, { count: 1, selector: '#tag-filter-combination-operator-radio-button-or' }],
         'beam mode': [{ count: 1, selector: '#beam-mode-dropdown-option-NO\\ BEAM' }, { count: 2, selector: '#beam-mode-dropdown-option-UNSTABLE\\ BEAMS' }],
@@ -42,15 +43,18 @@ module.exports = () => {
         'magnets': [{ count: 1, selector: '#l3-dipole-current-dropdown-option-20003kA\\/0kA' }, { count: 3, selector: '#l3-dipole-current-dropdown-option-30003kA\\/0kA' }],
     };
 
-    it('should undo filters if the user presses go-back on the runs page', async () => {
-        await goToPage(page, 'run-overview');
-
-        const startPopoverSelector = await getPopoverSelector(await page.$('.timeO2Start-filter .popover-trigger'));
+    const logSelectionFiltersChecks = {
+        'tags': [{ count: 1, selector: '#tag-dropdown-option-DPG' }, { count: 0, selector: '#tag-dropdown-option-FOOD' }, { count: 3, selector: '#tag-filter-combination-operator-radio-button-or' } ],
+    };
 
-        const { fromDateSelector, fromTimeSelector } = getPeriodInputsSelectors(startPopoverSelector);
+    const lhcFillsSelectionFiltersChecks = {
+        'hasStableBeams': [{ count: 6, selector: '.switch > input' }],
+        'beamTypes': [{ count: 1, selector: '#beam-types-checkbox-p-p' }, { count: 2, selector: '#beam-types-checkbox-p-Pb' }]
+    };
 
-        for (const checks of Object.values(runSelectionFiltersChecks)) {
-            await waitForTableTotalRowsCountToEqual(page, 109);
+    const checkSelectionFilters = async (selectionFilterObject, baseRowCount) => {
+        for (const [_key, checks] of Object.entries(selectionFilterObject)) {
+            await waitForTableTotalRowsCountToEqual(page, baseRowCount);
 
             for (const { count, selector } of checks) {
                 await pressElement(page, selector, true);
@@ -62,8 +66,18 @@ module.exports = () => {
                 await page.goBack();
             }
 
-            await waitForTableTotalRowsCountToEqual(page, 109);
+            await waitForTableTotalRowsCountToEqual(page, baseRowCount);
         }
+    };
+
+    it('should undo filters if the user presses go-back on the runs page', async () => {
+        await goToPage(page, 'run-overview');
+        const baseRowCount = 109;
+        const startPopoverSelector = await getPopoverSelector(await page.$('.timeO2Start-filter .popover-trigger'));
+
+        const { fromDateSelector, fromTimeSelector } = getPeriodInputsSelectors(startPopoverSelector);
+
+        await checkSelectionFilters(runSelectionFiltersChecks, baseRowCount);
 
         // Run duration
         await page.select('#duration-operator', '>');
@@ -74,7 +88,7 @@ module.exports = () => {
         await page.goBack();
         await waitForTableTotalRowsCountToEqual(page, 8);
         await page.goBack();
-        await waitForTableTotalRowsCountToEqual(page, 109);
+        await waitForTableTotalRowsCountToEqual(page, baseRowCount);
 
         // EorReason filter
         await page.select('#eorCategories', 'DETECTORS');
@@ -88,7 +102,7 @@ module.exports = () => {
         await page.goBack();
         await waitForTableTotalRowsCountToEqual(page, 3);
         await page.goBack();
-        await waitForTableTotalRowsCountToEqual(page, 109);
+        await waitForTableTotalRowsCountToEqual(page, baseRowCount);
 
         // O2 Start Filter:
         await fillInput(page, fromTimeSelector, '11:11', ['change']);
@@ -99,7 +113,44 @@ module.exports = () => {
         await page.goBack();
         await waitForTableTotalRowsCountToEqual(page, 1);
         await page.goBack();
-        await waitForTableTotalRowsCountToEqual(page, 109);
+        await waitForTableTotalRowsCountToEqual(page, baseRowCount);
+    });
+
+    it('should undo filters if the user presses go-back on the LHC fills page', async () => {
+        await goToPage(page, 'lhc-fill-overview');
+        await checkSelectionFilters(lhcFillsSelectionFiltersChecks, 5)
+    });
+
+    it('should undo filters if the user presses go-back on the logs page', async () => {
+        await goToPage(page, 'log-overview');
+        await waitForTableTotalRowsCountToEqual(page, 119);
+        
+        // AuthorFilter
+        await pressElement(page, '.author-filter .switch input', true);
+        await waitForTableTotalRowsCountToEqual(page, 117);
+        await fillInput(page, '#authorFilterText', '!Anonymous,John', ['change']);
+        await waitForTableTotalRowsCountToEqual(page, 5);
+        await page.goBack();
+        await waitForTableTotalRowsCountToEqual(page, 117);
+        await page.goBack();
+        await waitForTableTotalRowsCountToEqual(page, 119);
+
+        await checkSelectionFilters(logSelectionFiltersChecks, 119);
+    });
+
+    it('should undo filters if the user presses go-back on the lhc periods page', async () => {
+        await goToPage(page, 'lhc-period-overview');
+        await waitForTableTotalRowsCountToEqual(page, 3);
+        
+        // Name
+        await fillInput(page, '.name-filter input', 'LHC23f');
+        await waitForTableTotalRowsCountToEqual(page, 1);
+        await fillInput(page, '.name-filter input', 'bogus');
+        await waitForTableTotalRowsCountToEqual(page, 0);
+        await page.goBack();
+        await waitForTableTotalRowsCountToEqual(page, 1);
+        await page.goBack();
+        await waitForTableTotalRowsCountToEqual(page, 3);
     });
 
     after(async () => await defaultAfter(page, browser));

test/public/defaults.js

@@ -198,14 +198,15 @@ module.exports.waitForTableLength = waitForTableToLength;
  * Wait for the total number of elements to be the expected one
  *
  * @param {puppeteer.Page} page The puppeteer page where the table is located
- * @param {number} amount the expected amount of items
+ * @param {number} amount the expected amount of items. If amount is 0 it is converted to undefined, as empty tables don't display a row count
  * @return {Promise<void>} resolves once the expected amount is present
  */
 module.exports.waitForTableTotalRowsCountToEqual = async (page, amount) => {
     try {
+        amount = amount === 0 ? undefined : `${amount}`;
         await page.waitForSelector('#totalRowsCount');
         await page.waitForFunction(
-            (amount) => document.querySelector('#totalRowsCount').innerText === `${amount}`,
+            (amount) => document.querySelector('#totalRowsCount')?.innerText === amount,
             {},
             amount,
         );