Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Improve Cypress setup and use Cypress commands.js #169

Merged
merged 23 commits into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
384e09f
add data-testid
dvflorianengertsberger Nov 30, 2021
e464ad3
add id for dataset searchbox
dvvanessastoiber Dec 13, 2021
5879b89
add data-testid to react select components
dvflorianengertsberger Jan 4, 2022
5a31382
Merge remote-tracking branch 'origin/develop' into cypress-testing
dvvanessastoiber Jan 17, 2022
452b83e
fix lint
dvvanessastoiber Jan 17, 2022
d81f7a9
fix react select error
dvflorianengertsberger Jan 18, 2022
5a28b07
Merge remote-tracking branch 'origin/develop' into cypress-testing
dvvanessastoiber Mar 22, 2022
761c42f
update dist
dvvanessastoiber Mar 22, 2022
d22cb38
Merge remote-tracking branch 'origin/develop' into cypress-testing
dvvanessastoiber May 30, 2022
caec0d4
update dist
dvvanessastoiber May 30, 2022
e71f24e
rename for constistency
dvvanessastoiber Jun 7, 2022
617bc8c
Merge remote-tracking branch 'origin/develop' into cypress-testing
dvvanessastoiber Jun 21, 2022
3946d4e
update dist
dvvanessastoiber Jun 21, 2022
b944ee0
Merge remote-tracking branch 'origin/develop' into cypress-testing
dvvanessastoiber Jun 30, 2022
ee11bbc
Fix typings
thinkh Jun 30, 2022
fbc855a
add index.js
dvvanessastoiber Jul 19, 2022
2867237
fix setup
dvvanessastoiber Jul 19, 2022
e0d7459
update imports and function calls
dvvanessastoiber Jul 20, 2022
2fd228f
update video
dvvanessastoiber Jul 22, 2022
fff954f
Merge remote-tracking branch 'origin/develop' into cypress-testing
dvvanessastoiber Aug 4, 2022
eb3e1e4
update dist
dvvanessastoiber Aug 4, 2022
0dd51a0
Merge branch 'develop' into cypress-testing
thinkh Aug 8, 2022
d217877
Merge remote-tracking branch 'origin/develop' into cypress-testing
thinkh Aug 11, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update imports and function calls
  • Loading branch information
dvvanessastoiber committed Jul 20, 2022
commit e0d7459193828255e477fce56e44655d4bf9c795
19 changes: 8 additions & 11 deletions cypress/integration/long-running-score.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import {scrollElementIntoCenter, formSelect, select2SingleSelect} from 'tdp_core/dist/cypress/utils';
import {waitLineupReadyOrdino, checkScoreColLoadedOrdino} from 'ordino/dist/cypress/utils';

// https://www.youtube.com/watch?v=JZIIf-k852g&t=1s
it('Long Running Score', function() {
cy.visit(Cypress.env('host'));
Expand All @@ -10,7 +7,7 @@ it('Long Running Score', function() {
cy.login(); // use Cypress command registerd in Ordino app

// Show you can select single genes if you wanted
scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
// wait intentionally a few seconds
cy.wait(2000)
Expand All @@ -23,24 +20,24 @@ it('Long Running Score', function() {
cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click();
cy.wait('@gene_desc');
cy.wait('@human_genes');
waitLineupReadyOrdino(0)
cy.waitLineupReadyOrdino(0)

// Add column
cy.get('[data-testid=add-column-button]').click();
cy.wait(2000);
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click();
select2SingleSelect("data-type", "Relative Copy Number")
formSelect("aggregation", "Boxplot")
cy.select2SingleSelect("data-type", "Relative Copy Number")
cy.formSelect("aggregation", "Boxplot")
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 9)
cy.checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 9)

// Add column
cy.get('[data-testid=add-column-button]').click();
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click();
formSelect("aggregation", "Frequency")
formSelect("comparison-operator", "> greater than")
cy.formSelect("aggregation", "Frequency")
cy.formSelect("comparison-operator", "> greater than")
cy.get(':nth-child(5) > .form-control').clear();
cy.get(':nth-child(5) > .form-control').type('4');
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['Frequency > 4'], 10)
cy.checkScoreColLoadedOrdino(0, ['Frequency > 4'], 10)
})
76 changes: 37 additions & 39 deletions cypress/integration/ordino-video-test.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { cy, it, Cypress } from 'local-cypress';
import { waitLineupReadyOrdino, checkScoreColLoadedOrdino} from 'ordino/dist/cypress/utils';
import { scrollElementIntoCenter, select2MultiSelect, formSelect, select2SingleSelect, waitTdpNotBusy} from 'tdp_core/dist/cypress/utils';

// https://www.youtube.com/watch?v=JZIIf-k852g&t=1s
it('ordino video', function() {
Expand All @@ -11,7 +9,7 @@ it('ordino video', function() {
cy.login(); // use Cypress command registerd in Ordino app

// Show you can select single genes if you wanted
scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
// wait intentionally a few seconds
cy.wait(2000)
Expand All @@ -24,15 +22,15 @@ it('ordino video', function() {
cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click();
cy.wait('@gene_desc');
cy.wait('@human_genes');
waitLineupReadyOrdino(0)
cy.waitLineupReadyOrdino(0)

// Add column
cy.get('[data-testid=add-column-button]').click();
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click();
select2MultiSelect("cell-line", "HCC1954")
select2MultiSelect("data-type", "Relative Copy Number")
cy.select2MultiSelect("cell-line", "HCC1954")
cy.select2MultiSelect("data-type", "Relative Copy Number")
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['HCC1954', 'Relative Copy Number'], 9);
cy.checkScoreColLoadedOrdino(0, ['HCC1954', 'Relative Copy Number'], 9);

// Sort by column
// cy.get('[data-draginfo="Merge"] > .lu-toolbar > .lu-action-sort').click();
Expand All @@ -47,18 +45,18 @@ it('ordino video', function() {
// Add column
cy.get('[data-testid=add-column-button]').click();
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click();
select2MultiSelect("cell-line", "HCC1954")
select2MultiSelect("data-type", "Normalized Gene Expression (TPM Values)")
cy.select2MultiSelect("cell-line", "HCC1954")
cy.select2MultiSelect("data-type", "Normalized Gene Expression (TPM Values)")
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['HCC1954', 'Normalized Gene Expression (TPM Values)'], 10)
cy.checkScoreColLoadedOrdino(0, ['HCC1954', 'Normalized Gene Expression (TPM Values)'], 10)

// Add column
cy.get('[data-testid=add-column-button]').click();
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(5) > span').click();
select2MultiSelect("cell-line", "HCC1954")
select2MultiSelect("data-type", "DRIVE RSA (ER McDonald III et al., Cell, 2017)")
cy.select2MultiSelect("cell-line", "HCC1954")
cy.select2MultiSelect("data-type", "DRIVE RSA (ER McDonald III et al., Cell, 2017)")
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['HCC1954', 'DRIVE RSA (ER McDonald III et al., Cell, 2017)'], 11)
cy.checkScoreColLoadedOrdino(0, ['HCC1954', 'DRIVE RSA (ER McDonald III et al., Cell, 2017)'], 11)

// Invert column
// Here the title should be used. For some reason cypress has problmes, because there is a " character in the title. For now I use the data-id
Expand All @@ -70,53 +68,53 @@ it('ordino video', function() {
// Add column
cy.get('[data-testid=add-column-button]').click();
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click();
formSelect("row-1", "Tumor Type")
select2MultiSelect("row-1", "breast carcinoma")
select2SingleSelect("data-type", "Normalized Gene Expression (TPM Values)")
cy.formSelect("row-1", "Tumor Type")
cy.select2MultiSelect("row-1", "breast carcinoma")
cy.select2SingleSelect("data-type", "Normalized Gene Expression (TPM Values)")
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['Tumor Type', 'breast carcinoma', 'Normalized Gene Expression (TPM Values)'], 12)
cy.checkScoreColLoadedOrdino(0, ['Tumor Type', 'breast carcinoma', 'Normalized Gene Expression (TPM Values)'], 12)

// Add column
cy.get('[data-testid=add-column-button]').click();
cy.wait(2000);
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click();
select2SingleSelect("data-type", "Relative Copy Number")
formSelect("aggregation", "Boxplot")
cy.select2SingleSelect("data-type", "Relative Copy Number")
cy.formSelect("aggregation", "Boxplot")
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 13)
cy.checkScoreColLoadedOrdino(0, ['Relative Copy Number', 'Boxplot'], 13)

// Add column
cy.get('[data-testid=add-column-button]').click();
cy.get('[data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(2) > span').click();
formSelect("aggregation", "Frequency")
formSelect("comparison-operator", "> greater than")
cy.formSelect("aggregation", "Frequency")
cy.formSelect("comparison-operator", "> greater than")
cy.get(':nth-child(5) > .form-control').clear();
cy.get(':nth-child(5) > .form-control').type('4');
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(0, ['Frequency > 4'], 14)
cy.checkScoreColLoadedOrdino(0, ['Frequency > 4'], 14)

// Select elements and click on detail views
waitLineupReadyOrdino(0)
cy.waitLineupReadyOrdino(0)
cy.get('[data-index="0"] > .lu-renderer-selection').click();
cy.get('[data-testid=celllinedb_expression_vs_copynumber]').click();
waitTdpNotBusy()
waitLineupReadyOrdino(0)
cy.waitTdpNotBusy()
cy.waitLineupReadyOrdino(0)
cy.wait(2000)
cy.get('[data-index="6"] > .lu-renderer-selection').click();
waitTdpNotBusy()
waitLineupReadyOrdino(0)
cy.waitTdpNotBusy()
cy.waitLineupReadyOrdino(0)
cy.wait(2000)
cy.get('[data-index="6"] > .lu-renderer-selection').click();
waitTdpNotBusy()
cy.waitTdpNotBusy()
cy.wait(2000)
cy.get('[data-testid=targetvalidation]').click();
waitTdpNotBusy()
cy.waitTdpNotBusy()
cy.wait(2000)
cy.get('[data-testid=ensembl_org]').click();
waitTdpNotBusy()
cy.waitTdpNotBusy()
cy.wait(2000)
cy.get('[data-testid=copynumbertable]').click();
waitTdpNotBusy()
cy.waitTdpNotBusy()
cy.wait(2000)

// Sort and filter columns
Expand All @@ -131,22 +129,22 @@ it('ordino video', function() {
// Add column
cy.get('[data-testid=viewWrapper-1] [data-testid=side-panel-wrapper] [data-testid=lu-adder-div] [data-testid=add-column-button]').click();
cy.get('[data-testid=viewWrapper-1] > .view > .inner > .tdp-view > [data-testid=side-panel-wrapper] > .panel-header > :nth-child(2) > [data-testid=lu-adder-div] > .lu-search > .lu-search-list > :nth-child(2) > ul > :nth-child(1) > span').click();
select2MultiSelect("gene-symbol", ["BRCA1", "BRCA2"])
select2MultiSelect("data-type", "AA Mutated")
cy.select2MultiSelect("gene-symbol", ["BRCA1", "BRCA2"])
cy.select2MultiSelect("data-type", "AA Mutated")
cy.get('[data-testid=primary-dialog-button]').click();
checkScoreColLoadedOrdino(1, ['BRCA1', 'AA Mutated'], 10)
checkScoreColLoadedOrdino(1, ['BRCA2', 'AA Mutated'], 10)
cy.checkScoreColLoadedOrdino(1, ['BRCA1', 'AA Mutated'], 10)
cy.checkScoreColLoadedOrdino(1, ['BRCA2', 'AA Mutated'], 10)

waitLineupReadyOrdino(1)
cy.waitLineupReadyOrdino(1)
cy.get('[data-testid=viewWrapper-1] [data-index="0"] > .lu-renderer-selection').click();
cy.get('[data-testid=viewWrapper-1] [data-index="1"] > .lu-renderer-selection').click();
cy.get('[data-testid=cosmic]').click();
// Intentionally wait 2 seconds
waitTdpNotBusy()
cy.waitTdpNotBusy()
cy.wait(2000)
cy.get('[data-testid=show] [data-testid=form-select]').select('907046');
// Intentionally wait 2 seconds
waitTdpNotBusy()
cy.waitTdpNotBusy()
cy.wait(2000)
cy.get('[data-testid=ordino_sessions_shortcut-link]').click();
cy.get('[data-testid=current-session-sessionscard] [data-testid=ordino0] [data-testid=save-button]').click();
Expand Down
7 changes: 2 additions & 5 deletions cypress/integration/session_all_celllines.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils';
import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils';

it('Load all Celllines', function() {
cy.visit(Cypress.env('host'));

Expand All @@ -10,7 +7,7 @@ it('Load all Celllines', function() {
cy.login(); // use Cypress command registerd in Ordino app

// Show you can select single genes if you wanted
scrollElementIntoCenter('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.scrollElementIntoCenter('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.get('[data-testid=dataset-card-cellline-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
// wait intentionally a few seconds
cy.wait(2000)
Expand All @@ -23,5 +20,5 @@ it('Load all Celllines', function() {
cy.get('[data-testid=ccle-button]').click();
cy.wait('@cellline_desc');
cy.wait('@human_cellline');
waitLineupReadyOrdino(0)
cy.waitLineupReadyOrdino(0)
});
7 changes: 2 additions & 5 deletions cypress/integration/session_all_genes.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils';
import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils';

it('Load all Genes', function() {
cy.visit(Cypress.env('host'));

Expand All @@ -10,7 +7,7 @@ it('Load all Genes', function() {
cy.login(); // use Cypress command registerd in Ordino app

// Show you can select single genes if you wanted
scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.scrollElementIntoCenter('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.get('[data-testid=dataset-card-genes-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
// wait intentionally a few seconds
cy.wait(2000)
Expand All @@ -23,5 +20,5 @@ it('Load all Genes', function() {
cy.get('[data-testid=normal-chromosome-protein-coding-human-genes-button]').click();
cy.wait('@gene_desc');
cy.wait('@human_genes');
waitLineupReadyOrdino(0)
cy.waitLineupReadyOrdino(0)
});
7 changes: 2 additions & 5 deletions cypress/integration/session_all_tissues.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import {scrollElementIntoCenter} from 'tdp_core/dist/cypress/utils';
import {waitLineupReadyOrdino} from 'ordino/dist/cypress/utils';

it('Load all Tissues', function() {
cy.visit(Cypress.env('host'));

Expand All @@ -10,7 +7,7 @@ it('Load all Tissues', function() {
cy.login(); // use Cypress command registerd in Ordino app

// Show you can select single genes if you wanted
scrollElementIntoCenter('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.scrollElementIntoCenter('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
cy.get('[data-testid=dataset-card-tissue-dataset] [data-testid=human-tab] [data-testid=ordino-dataset-searchbox] [data-testid=async-paginate-input]').click()
// wait intentionally a few seconds
cy.wait(2000)
Expand All @@ -23,5 +20,5 @@ it('Load all Tissues', function() {
cy.get('[data-testid=tcga-normals-button]').click();
cy.wait('@tissue_desc');
cy.wait('@human_tissue');
waitLineupReadyOrdino(0)
cy.waitLineupReadyOrdino(0)
});