Skip to content

Commit

Permalink
Unskip and revert tests back to old data #782
Browse files Browse the repository at this point in the history
  • Loading branch information
@MRichards99
MRichards99 committed Aug 11, 2021
1 parent 56b415e commit 1ae72fd
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 34 deletions.
5 changes: 2 additions & 3 deletions packages/datagateway-dataview/cypress/integration/card/dls/datasets.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,15 @@ describe('DLS - Datasets Cards', () => {
cy.get('#card').should('not.exist');
});

// TODO: Data mismatch issue (#782)
it.skip('should be able to expand "More Information"', () => {
it('should be able to expand "More Information"', () => {
cy.get('#card').contains('More Information').click({ force: true });
cy.get('#card')
.get('[aria-label="card-more-information"]')
.contains('DATASET 1');
cy.get('#calculate-size-btn').click({ force: true });
cy.get('#card')
.get('[aria-label="card-more-information"]')
.contains('5.36 GB', { timeout: 10000 });
.contains('4.24 GB', { timeout: 10000 });

cy.get('#dataset-type-tab').click({ force: true });
cy.get('#card')
Expand Down
5 changes: 2 additions & 3 deletions packages/datagateway-dataview/cypress/integration/card/dls/visits.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,15 @@ describe('DLS - Visits Cards', () => {
cy.get('#card').should('not.exist');
});

// TODO: Data mismatch issue (#782)
it.skip('should be able to expand "More Information"', () => {
it('should be able to expand "More Information"', () => {
cy.get('#card').contains('More Information').click({ force: true });
cy.get('#card')
.get('[aria-label="card-more-information"]')
.contains('INVESTIGATION 1');
cy.get('#calculate-size-btn').click({ force: true });
cy.get('#card')
.get('[aria-label="card-more-information"]')
.contains('10.8 GB', { timeout: 10000 });
.contains('10.25 GB', { timeout: 10000 });
cy.get('#visit-users-tab').click({ force: true });
cy.get('#card')
.get('[aria-label="card-more-information"]')
Expand Down
12 changes: 5 additions & 7 deletions packages/datagateway-dataview/cypress/integration/card/isis/studies.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@ describe('ISIS - Studies Cards', () => {
);
});

// TODO: Data mismatch issue (#782)
it.skip('should be able to sort by one field', () => {
it('should be able to sort by one field', () => {
cy.contains('[role="button"]', 'Start Date')
.click()
.wait('@getStudiesOrder', {
timeout: 10000,
});
cy.contains('[role="button"]', 'asc').should('exist');
cy.contains('[role="button"]', 'desc').should('not.exist');
cy.get('#card').contains('STUDY 4');
cy.get('#card').contains('STUDY 325');

cy.contains('[role="button"]', 'Start Date')
.click()
Expand All @@ -57,16 +56,15 @@ describe('ISIS - Studies Cards', () => {
cy.get('#card').contains('STUDY 4');
});

// TODO: Data mismatch issue (#782)
it.skip('should be able to sort by multiple fields', () => {
it('should be able to sort by multiple fields', () => {
cy.contains('[role="button"]', 'Start Date')
.click()
.wait('@getStudiesOrder', {
timeout: 10000,
});
cy.contains('[role="button"]', 'asc').should('exist');
cy.contains('[role="button"]', 'desc').should('not.exist');
cy.get('#card').contains('STUDY 4');
cy.get('#card').contains('STUDY 325');

cy.contains('[role="button"]', 'End Date')
.click()
Expand All @@ -75,7 +73,7 @@ describe('ISIS - Studies Cards', () => {
});
cy.contains('[role="button"]', 'asc').should('exist');
cy.contains('[role="button"]', 'desc').should('not.exist');
cy.get('#card').contains('STUDY 4');
cy.get('#card').contains('STUDY 325');
});

it('should be able to filter by multiple fields', () => {
Expand Down
5 changes: 2 additions & 3 deletions packages/datagateway-dataview/cypress/integration/table/dls/datasets.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,7 @@ describe('DLS - Datasets Table', () => {
.should('be.visible');
});

// TODO: Data mismatch issue (#782)
it.skip('and then calculate file size', () => {
it('and then calculate file size', () => {
// need to wait for counts to finish, otherwise cypress might interact with the details panel
// too quickly and it rerenders during the test
cy.contains('[aria-rowindex="1"] [aria-colindex="4"]', '55').should(
Expand All @@ -255,7 +254,7 @@ describe('DLS - Datasets Table', () => {
cy.contains('#calculate-size-btn', 'Calculate')
.should('exist')
.click({ force: true });
cy.contains('5.36 GB', { timeout: 10000 }).should('be.visible');
cy.contains('4.24 GB', { timeout: 10000 }).should('be.visible');
});

it('and view the dataset type panel', () => {
Expand Down
5 changes: 2 additions & 3 deletions packages/datagateway-dataview/cypress/integration/table/dls/visits.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ describe('DLS - Visits Table', () => {
cy.get('[aria-label="Hide details"]').should('exist');
});

// TODO: Data mismatch issue (#782)
it.skip('and then calculate file size', () => {
it('and then calculate file size', () => {
// We need to wait for counts to finish, otherwise cypress
// might interact with the details panel too quickly and
// it re-renders during the test.
Expand All @@ -213,7 +212,7 @@ describe('DLS - Visits Table', () => {
cy.contains('#calculate-size-btn', 'Calculate')
.should('exist')
.click({ force: true });
cy.contains('10.8 GB', { timeout: 10000 }).should('be.visible');
cy.contains('10.25 GB', { timeout: 10000 }).should('be.visible');
});

// TODO: Since we only have one investigation, we cannot test
Expand Down
7 changes: 3 additions & 4 deletions packages/datagateway-dataview/cypress/integration/table/isis/datasets.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,15 @@ describe('ISIS - Datasets Table', () => {
});
});

// TODO: Data mismatch issue (#782)
describe.skip('should be able to view details', () => {
describe('should be able to view details', () => {
beforeEach(() => {
// Check that we have received the size from the API as this will produce
// a re-render which can prevent the click.
cy.contains('[aria-rowindex="1"] [aria-colindex="4"]', '4.79 GB').should(
cy.contains('[aria-rowindex="1"] [aria-colindex="4"]', '5.78 GB').should(
'exist'
);

cy.contains('[aria-rowindex="2"] [aria-colindex="4"]', '6.07 GB').should(
cy.contains('[aria-rowindex="2"] [aria-colindex="4"]', '5.15 GB').should(
'exist'
);
});
Expand Down
15 changes: 7 additions & 8 deletions packages/datagateway-dataview/cypress/integration/table/isis/facilityCycles.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,14 @@ describe('ISIS - FacilityCycles Table', () => {
});
});

// TODO: Data mismatch issue (#782)
describe.skip('should be able to sort by', () => {
describe('should be able to sort by', () => {
it('ascending order', () => {
cy.contains('[role="button"]', 'Name').click();

cy.get('[aria-sort="ascending"]').should('exist');
cy.get('.MuiTableSortLabel-iconDirectionAsc').should('be.visible');
cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
'2000-04-02 00:00:00+01:00'
'2000-04-02 00:00:00+00:00'
);
});

Expand All @@ -113,7 +112,7 @@ describe('ISIS - FacilityCycles Table', () => {
'0'
);
cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
'2019-08-04 00:00:00+01:00'
'2019-08-04 00:00:00+00:00'
);
});

Expand All @@ -131,7 +130,7 @@ describe('ISIS - FacilityCycles Table', () => {
'0'
);
cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
'2000-04-02 00:00:00+01:00'
'2000-04-02 00:00:00+00:00'
);
});

Expand All @@ -140,7 +139,7 @@ describe('ISIS - FacilityCycles Table', () => {
cy.contains('[role="button"]', 'Name').click();

cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
'2000-04-02 00:00:00+01:00'
'2000-04-02 00:00:00+00:00'
);
});
});
Expand All @@ -154,7 +153,7 @@ describe('ISIS - FacilityCycles Table', () => {

cy.get('[aria-rowcount="2"]').should('exist');
cy.get('[aria-rowindex="2"] [aria-colindex="2"]').contains(
'2010-08-04 00:00:00+01:00'
'2010-08-04 00:00:00+00:00'
);
});

Expand All @@ -180,7 +179,7 @@ describe('ISIS - FacilityCycles Table', () => {

cy.get('[aria-rowcount="19"]').should('exist');
cy.get('[aria-rowindex="1"] [aria-colindex="2"]').contains(
'2010-06-03 00:00:00+01:00'
'2010-06-03 00:00:00+00:00'
);
});

Expand Down
5 changes: 2 additions & 3 deletions packages/datagateway-dataview/cypress/integration/table/isis/investigations.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,11 @@ describe('ISIS - Investigations Table', () => {
});
});

// TODO: Data mismatch issue (#782)
describe.skip('should be able to view details', () => {
describe('should be able to view details', () => {
beforeEach(() => {
// Check that we have received the size from the API as this will produce
// a re-render which can prevent the click.
cy.contains('[aria-rowindex="1"] [aria-colindex="6"]', '10.27 GB').should(
cy.contains('[aria-rowindex="1"] [aria-colindex="6"]', '10.2 GB').should(
'exist'
);
});
Expand Down

0 comments on commit 1ae72fd

Please sign in to comment.