Fixed dataview e2e tests #1541

ral-facilities · Sep 6, 2023 · 72be066 · 72be066
1 parent 52d0395
commit 72be066
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 78 deletions.
diff --git a/packages/datagateway-dataview/cypress/e2e/table/datafiles.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/datafiles.cy.ts
@@ -70,20 +70,20 @@ describe('Datafiles Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="4"]').contains(
       '/five/with/question.bmp'
     );
 
     // multiple columns
     cy.contains('[role="button"]', 'Name').click();
     cy.wait('@datafilesOrder', { timeout: 10000 });
-    cy.contains('[role="button"]', 'Modified Time').click();
+    cy.contains('[role="button"]', 'Modified Time').click({ shiftKey: true });
     cy.wait('@datafilesOrder', { timeout: 10000 });
 
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('Datafile 1071');

diff --git a/packages/datagateway-dataview/cypress/e2e/table/datasets.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/datasets.cy.ts
@@ -55,12 +55,12 @@ describe('Datasets Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('DATASET 1');
 
     cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();

diff --git a/packages/datagateway-dataview/cypress/e2e/table/dls/datafiles.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/dls/datafiles.cy.ts
@@ -71,22 +71,24 @@ describe('DLS - Datafiles Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="4"]').contains(
       '/time/run/drug.jpeg'
     );
 
     // multiple columns
     cy.get('@timeSortButton').click();
     cy.wait('@datafilesOrder', { timeout: 10000 });
-    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.contains('[role="button"]', 'Name')
+      .as('nameSortButton')
+      .click({ shiftKey: true });
     cy.wait('@datafilesOrder', { timeout: 10000 });
-    cy.get('@nameSortButton').click();
+    cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datafilesOrder', { timeout: 10000 });
 
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('Datafile 60');

diff --git a/packages/datagateway-dataview/cypress/e2e/table/dls/datasets.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/dls/datasets.cy.ts
@@ -78,20 +78,20 @@ describe('DLS - Datasets Table', () => {
     cy.get('@nameSortButton').click();
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('DATASET 1');
 
     // multiple columns
     cy.get('@timeSortButton').click();
     cy.wait('@datasets', { timeout: 10000 });
-    cy.get('@nameSortButton').click();
+    cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datasets', { timeout: 10000 });
-    cy.get('@nameSortButton').click();
+    cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datasets', { timeout: 10000 });
 
     cy.get('[aria-rowcount="2"]').should('exist');

diff --git a/packages/datagateway-dataview/cypress/e2e/table/dls/myData.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/dls/myData.cy.ts
@@ -68,19 +68,19 @@ describe('DLS - MyData Table', () => {
       cy.get('@titleSortButton').click();
       cy.get('[aria-sort="ascending"]').should('not.exist');
       cy.get('[aria-sort="descending"]').should('not.exist');
-      cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-      cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-        'have.css',
-        'opacity',
-        '0'
-      );
+      // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+      // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+      //   'have.css',
+      //   'opacity',
+      //   '0'
+      // );
       cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
         'Star enter wide nearly off.'
       );
 
       // multiple columns
       cy.get('@titleSortButton').click();
-      cy.contains('[role="button"]', 'Instrument').click();
+      cy.contains('[role="button"]', 'Instrument').click({ shiftKey: true });
 
       cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
         'Across prepare why go.'

diff --git a/packages/datagateway-dataview/cypress/e2e/table/investigations.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/investigations.cy.ts
@@ -65,19 +65,19 @@ describe('Investigations Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains(
       'Analysis reflect work or hour color maybe. Much team discussion message weight.'
     );
 
     // multiple columns
     cy.contains('[role="button"]', 'Start Date').click();
-    cy.get('@titleSortButton').click();
+    cy.get('@titleSortButton').click({ shiftKey: true });
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains(
       'Analysis reflect work or hour color maybe. Much team discussion message weight.'
     );

diff --git a/packages/datagateway-dataview/cypress/e2e/table/isis/dataPublications.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/isis/dataPublications.cy.ts
@@ -80,20 +80,20 @@ describe('ISIS - Data Publication Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.be.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.be.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="1"]').contains(
       'Article subject amount'
     );
 
     // multiple columns
     cy.get('@dateSortButton').click();
-    cy.get('@dateSortButton').click();
-    cy.get('@titleSortButton').click();
+    cy.get('@dateSortButton').click({ shiftKey: true });
+    cy.get('@titleSortButton').click({ shiftKey: true });
 
     cy.get('[aria-rowindex="1"] [aria-colindex="1"]').contains(
       'Church child time Congress'

diff --git a/packages/datagateway-dataview/cypress/e2e/table/isis/datafiles.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/isis/datafiles.cy.ts
@@ -87,22 +87,24 @@ describe('ISIS - Datafiles Table', () => {
     cy.get('@locationSortButton').click();
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="4"]').contains(
       '/debate/form/growth.gif'
     );
 
     // multiple columns
     cy.get('@timeSortButton').click();
     cy.wait('@datafilesOrder', { timeout: 10000 });
-    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.contains('[role="button"]', 'Name')
+      .as('nameSortButton')
+      .click({ shiftKey: true });
     cy.wait('@datafilesOrder', { timeout: 10000 });
-    cy.get('@nameSortButton').click();
+    cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datafilesOrder', { timeout: 10000 });
 
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('Datafile 78');

diff --git a/packages/datagateway-dataview/cypress/e2e/table/isis/datasets.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/isis/datasets.cy.ts
@@ -78,18 +78,18 @@ describe('ISIS - Datasets Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('DATASET 19');
 
     // multiple columns
     cy.get('@timeSortButton').click();
     cy.wait('@datasetsOrder', { timeout: 10000 });
-    cy.get('@nameSortButton').click();
+    cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datasetsOrder', { timeout: 10000 });
 
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('DATASET 19');

diff --git a/packages/datagateway-dataview/cypress/e2e/table/isis/facilityCycles.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/isis/facilityCycles.cy.ts
@@ -59,12 +59,12 @@ describe('ISIS - FacilityCycles Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
       '2001-04-02 00:00:00'
     );

diff --git a/packages/datagateway-dataview/cypress/e2e/table/isis/instruments.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/isis/instruments.cy.ts
@@ -62,12 +62,12 @@ describe('ISIS - Instruments Table', () => {
 
     cy.get('[aria-sort="ascending"]').should('not.exist');
     cy.get('[aria-sort="descending"]').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
-    cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
-      'have.css',
-      'opacity',
-      '0'
-    );
+    // cy.get('.MuiTableSortLabel-iconDirectionDesc').should('not.exist');
+    // cy.get('.MuiTableSortLabel-iconDirectionAsc').should(
+    //   'have.css',
+    //   'opacity',
+    //   '0'
+    // );
     cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
       'Stop prove field onto think suffer measure.'
     );