Fix e2e tests relating to view button (#718)

ral-facilities · Jul 22, 2021 · 9723be9 · 9723be9
1 parent d1e90f3
commit 9723be9
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 10 deletions.
diff --git a/packages/datagateway-dataview/cypress/integration/card/datasets.spec.ts b/packages/datagateway-dataview/cypress/integration/card/datasets.spec.ts
@@ -7,7 +7,7 @@ describe('Datasets Cards', () => {
       ['@getDatasetsCount', '@getDatasetsOrder', '@getDatasetsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getDatasetsCount', '@getDatasetsOrder'], {
         timeout: 10000,

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,7 +9,7 @@ describe('DLS - Datasets Cards', () => {
         timeout: 10000,
       }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getDatasetsCount', '@getDatasetsOrder'], {
         timeout: 10000,

diff --git a/packages/datagateway-dataview/cypress/integration/card/dls/proposals.spec.ts b/packages/datagateway-dataview/cypress/integration/card/dls/proposals.spec.ts
@@ -7,7 +7,7 @@ describe('DLS - Proposals Cards', () => {
       ['@getInvestigationsCount', '@getInvestigationsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getInvestigationsCount', '@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
@@ -7,7 +7,7 @@ describe('DLS - Visits Cards', () => {
       ['@getInvestigationsCount', '@getInvestigationsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getInvestigationsCount', '@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
@@ -11,7 +11,7 @@ describe('Investigations Cards', () => {
       ],
       { timeout: 15000 }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getInvestigationsCount', '@getInvestigationsOrder'], {
         timeout: 15000,

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,7 +8,7 @@ describe('ISIS - Datasets Cards', () => {
     ).wait(['@getDatasetsCount', '@getDatasetsOrder', '@getDatasetsOrder'], {
       timeout: 10000,
     });
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getDatasetsCount', '@getDatasetsOrder'], {
         timeout: 10000,

diff --git a/packages/datagateway-dataview/cypress/integration/card/isis/instruments.spec.ts b/packages/datagateway-dataview/cypress/integration/card/isis/instruments.spec.ts
@@ -7,7 +7,7 @@ describe('ISIS - Instruments Cards', () => {
       ['@getInstrumentsCount', '@getInstrumentsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getInstrumentsCount', '@getInstrumentsOrder'], {
         timeout: 10000,

diff --git a/packages/datagateway-dataview/cypress/integration/card/isis/investigations.spec.ts b/packages/datagateway-dataview/cypress/integration/card/isis/investigations.spec.ts
@@ -7,7 +7,7 @@ describe('ISIS - Investigations Cards', () => {
       ['@getInvestigationsCount', '@getInvestigationsOrder'],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getInvestigationsCount', '@getInvestigationsOrder'], {
         timeout: 10000,

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="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getStudiesCount', '@getStudiesOrder'], {
         timeout: 10000,

diff --git a/packages/datagateway-dataview/cypress/integration/card/pageContainer.spec.ts b/packages/datagateway-dataview/cypress/integration/card/pageContainer.spec.ts
@@ -11,7 +11,7 @@ describe('PageContainer Component', () => {
       ],
       { timeout: 10000 }
     );
-    cy.get('[aria-label="secondary checkbox"]')
+    cy.get('[aria-label="container-view-button"]')
       .click()
       .wait(['@getInvestigationsCount', '@getInvestigationsOrder'], {
         timeout: 10000,

diff --git a/packages/datagateway-dataview/src/page/pageContainer.component.tsx b/packages/datagateway-dataview/src/page/pageContainer.component.tsx
@@ -256,6 +256,7 @@ const ViewButton = (props: {
   return (
     <Button
       className="tour-dataview-toggle-card"
+      aria-label="container-view-button"
       variant="contained"
       color="primary"
       size="small"