Correct page view button in e2e tests (#772)

ral-facilities · Sep 3, 2021 · d282562 · d282562
1 parent 2e6b6d3
commit d282562
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 17 deletions.
diff --git a/packages/datagateway-dataview/cypress/integration/card/datasets.spec.ts b/packages/datagateway-dataview/cypress/integration/card/datasets.spec.ts
@@ -7,9 +7,11 @@ describe('Datasets Cards', () => {
       ['@getDatasetsCount', '@getDatasetsOrder', '@getDatasetsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="page-view"]').click().wait(['@getDatasetsOrder'], {
-      timeout: 10000,
-    });
+    cy.get('[aria-label="page-view Display as cards"]')
+      .click()
+      .wait(['@getDatasetsOrder'], {
+        timeout: 10000,
+      });
   });
 
   it('should load correctly', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/card/dls/datasets.spec.ts b/packages/datagateway-dataview/cypress/integration/card/dls/datasets.spec.ts
@@ -9,9 +9,11 @@ describe('DLS - Datasets Cards', () => {
         timeout: 10000,
       }
     );
-    cy.get('[aria-label="page-view"]').click().wait(['@getDatasetsOrder'], {
-      timeout: 10000,
-    });
+    cy.get('[aria-label="page-view Display as cards"]')
+      .click()
+      .wait(['@getDatasetsOrder'], {
+        timeout: 10000,
+      });
   });
 
   it('should load correctly', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/card/dls/proposals.spec.ts b/packages/datagateway-dataview/cypress/integration/card/dls/proposals.spec.ts
@@ -8,7 +8,7 @@ describe('DLS - Proposals Cards', () => {
       ['@getInvestigationsCount', '@getInvestigationsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="page-view"]')
+    cy.get('[aria-label="page-view Display as cards"]')
       .click()
       .wait(['@getInvestigationsOrder'], {
         timeout: 10000,

diff --git a/packages/datagateway-dataview/cypress/integration/card/dls/visits.spec.ts b/packages/datagateway-dataview/cypress/integration/card/dls/visits.spec.ts
@@ -8,7 +8,7 @@ describe('DLS - Visits Cards', () => {
       ['@getInvestigationsCount', '@getInvestigationsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="page-view"]')
+    cy.get('[aria-label="page-view Display as cards"]')
       .click()
       .wait(['@getInvestigationsOrder'], {
         timeout: 10000,

diff --git a/packages/datagateway-dataview/cypress/integration/card/investigations.spec.ts b/packages/datagateway-dataview/cypress/integration/card/investigations.spec.ts
@@ -12,7 +12,7 @@ describe('Investigations Cards', () => {
       ],
       { timeout: 15000 }
     );
-    cy.get('[aria-label="page-view"]').click();
+    cy.get('[aria-label="page-view Display as cards"]').click();
   });
 
   it('should load correctly', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/card/isis/datasets.spec.ts b/packages/datagateway-dataview/cypress/integration/card/isis/datasets.spec.ts
@@ -8,9 +8,11 @@ describe('ISIS - Datasets Cards', () => {
     ).wait(['@getDatasetsCount', '@getDatasetsOrder', '@getDatasetsOrder'], {
       timeout: 10000,
     });
-    cy.get('[aria-label="page-view"]').click().wait(['@getDatasetsOrder'], {
-      timeout: 10000,
-    });
+    cy.get('[aria-label="page-view Display as cards"]')
+      .click()
+      .wait(['@getDatasetsOrder'], {
+        timeout: 10000,
+      });
   });
 
   it('should load correctly', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/card/isis/instruments.spec.ts b/packages/datagateway-dataview/cypress/integration/card/isis/instruments.spec.ts
@@ -8,7 +8,7 @@ describe('ISIS - Instruments Cards', () => {
       ['@getInstrumentsCount', '@getInstrumentsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="page-view"]').click();
+    cy.get('[aria-label="page-view Display as cards"]').click();
   });
 
   it('should load correctly', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/card/isis/investigations.spec.ts b/packages/datagateway-dataview/cypress/integration/card/isis/investigations.spec.ts
@@ -8,7 +8,7 @@ describe('ISIS - Investigations Cards', () => {
       ['@getInvestigationsCount', '@getInvestigationsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="page-view"]').click();
+    cy.get('[aria-label="page-view Display as cards"]').click();
   });
 
   it('should load correctly', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/card/isis/studies.spec.ts b/packages/datagateway-dataview/cypress/integration/card/isis/studies.spec.ts
@@ -7,7 +7,7 @@ describe('ISIS - Studies Cards', () => {
       ['@getStudiesCount', '@getStudiesOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="page-view"]').click();
+    cy.get('[aria-label="page-view Display as cards"]').click();
   });
 
   it('should load correctly', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/card/pageContainer.spec.ts b/packages/datagateway-dataview/cypress/integration/card/pageContainer.spec.ts
@@ -27,7 +27,7 @@ describe('PageContainer Component', () => {
 
     cy.get('[aria-label="view-cart"]').should('exist');
 
-    cy.get('[aria-label="page-view"]').should('exist');
+    cy.get('[aria-label="page-view Display as cards"]').should('exist');
   });
 
   it('should display correct entity count', () => {

diff --git a/packages/datagateway-dataview/cypress/integration/table/pageContainer.spec.ts b/packages/datagateway-dataview/cypress/integration/table/pageContainer.spec.ts
@@ -16,7 +16,7 @@ describe('PageContainer Component', () => {
 
     cy.get('[aria-label="view-cart"]').should('exist');
 
-    cy.get('[aria-label="page-view"]').should('exist');
+    cy.get('[aria-label="page-view Display as cards"]').should('exist');
   });
 
   it('should display correct entity count', () => {