From 04b782e549bcd69e4f5de4aee26b5fa4ab4f4d6f Mon Sep 17 00:00:00 2001 From: "Abeshouse, Adam A./Sloan Kettering Institute" Date: Tue, 21 Jan 2020 11:58:11 -0500 Subject: [PATCH] Take out unused parameter in URL which will cause unnecessary page rerendering and thus flakey e2es Signed-off-by: Abeshouse, Adam A./Sloan Kettering Institute --- end-to-end-test/local/specs/core/querypage.spec.js | 2 +- .../remote/specs/core/coexpression.screenshot.spec.js | 2 +- end-to-end-test/remote/specs/core/mutationTable.spec.js | 2 +- .../remote/specs/core/oncoprint.screenshot.spec.js | 2 +- end-to-end-test/remote/specs/core/results.spec.js | 6 +++--- end-to-end-test/remote/specs/core/screenshot.spec.js | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/end-to-end-test/local/specs/core/querypage.spec.js b/end-to-end-test/local/specs/core/querypage.spec.js index 79411d2de43..ef4ee208095 100644 --- a/end-to-end-test/local/specs/core/querypage.spec.js +++ b/end-to-end-test/local/specs/core/querypage.spec.js @@ -11,7 +11,7 @@ describe('study select page', function() { describe('error messaging for invalid study id(s)', function(){ it('show error alert and query form for single invalid study id',function(){ - var url = `${CBIOPORTAL_URL}/results/oncoprint?Z_SCORE_THRESHOLD=2.0&cancer_study_id=coadread_tcga_pub&cancer_study_list=coadread_tcga_pub&case_ids=&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=KRAS%20NRAS%20BRAF&gene_set_choice=user-defined-list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations`; + var url = `${CBIOPORTAL_URL}/results/oncoprint?Z_SCORE_THRESHOLD=2.0&cancer_study_id=coadread_tcga_pub&cancer_study_list=coadread_tcga_pub&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=KRAS%20NRAS%20BRAF&gene_set_choice=user-defined-list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations`; goToUrlAndSetLocalStorage(url); $('[data-test="StudySelect"]').waitForExist(); assert( $('[data-test="unkown-study-warning"]').$('li=coadread_tcga_pubb') ); diff --git a/end-to-end-test/remote/specs/core/coexpression.screenshot.spec.js b/end-to-end-test/remote/specs/core/coexpression.screenshot.spec.js index 06762c0e253..bc314736055 100644 --- a/end-to-end-test/remote/specs/core/coexpression.screenshot.spec.js +++ b/end-to-end-test/remote/specs/core/coexpression.screenshot.spec.js @@ -19,7 +19,7 @@ describe("coexpression tab screenshot tests", function() { this.retries(2); before(function() { - var url = `${CBIOPORTAL_URL}/results/coexpression?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&case_ids=&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list&Action=Submit`; + var url = `${CBIOPORTAL_URL}/results/coexpression?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list&Action=Submit`; goToUrlAndSetLocalStorage(url); }); it('coexpression tab coadread_tcga_pub initial load', function() { diff --git a/end-to-end-test/remote/specs/core/mutationTable.spec.js b/end-to-end-test/remote/specs/core/mutationTable.spec.js index b9860ef5ca7..00a2d6ef78b 100644 --- a/end-to-end-test/remote/specs/core/mutationTable.spec.js +++ b/end-to-end-test/remote/specs/core/mutationTable.spec.js @@ -18,7 +18,7 @@ describe('Mutation Table', function() { describe('try getting exon and hgvsc info from genome nexus', ()=>{ before(()=>{ - var url = `${CBIOPORTAL_URL}/results/mutations?Action=Submit&Z_SCORE_THRESHOLD=1.0&cancer_study_id=gbm_tcga_pub&cancer_study_list=gbm_tcga_pub&case_ids=&case_set_id=gbm_tcga_pub_sequenced&clinicallist=PROFILED_IN_gbm_tcga_pub_cna_rae&gene_list=TP53%20MDM2%20MDM4&gene_set_choice=user-defined_list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=gbm_tcga_pub_cna_rae&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=gbm_tcga_pub_mutations&show_samples=false`; + var url = `${CBIOPORTAL_URL}/results/mutations?Action=Submit&Z_SCORE_THRESHOLD=1.0&cancer_study_id=gbm_tcga_pub&cancer_study_list=gbm_tcga_pub&case_set_id=gbm_tcga_pub_sequenced&clinicallist=PROFILED_IN_gbm_tcga_pub_cna_rae&gene_list=TP53%20MDM2%20MDM4&gene_set_choice=user-defined_list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=gbm_tcga_pub_cna_rae&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=gbm_tcga_pub_mutations&show_samples=false`; goToUrlAndSetLocalStorage(url); // mutations table should be visiable after oncokb icon shows up, diff --git a/end-to-end-test/remote/specs/core/oncoprint.screenshot.spec.js b/end-to-end-test/remote/specs/core/oncoprint.screenshot.spec.js index a945d3ee69e..d40ebda5d6a 100644 --- a/end-to-end-test/remote/specs/core/oncoprint.screenshot.spec.js +++ b/end-to-end-test/remote/specs/core/oncoprint.screenshot.spec.js @@ -123,7 +123,7 @@ describe("oncoprint screenshot tests", function() { describe("track group headers", function() { beforeEach(function() { - goToUrlAndSetLocalStorage(`${CBIOPORTAL_URL}/results/oncoprint?Z_SCORE_THRESHOLD=2.0&cancer_study_id=coadread_tcga_pub&cancer_study_list=coadread_tcga_pub&case_ids=&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=KRAS%20NRAS%20BRAF&gene_set_choice=user-defined-list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&heatmap_track_groups=coadread_tcga_pub_rna_seq_mrna_median_Zscores%2CKRAS%2CNRAS%2CBRAF%3Bcoadread_tcga_pub_methylation_hm27%2CKRAS%2CNRAS%2CBRAF&show_samples=false`); + goToUrlAndSetLocalStorage(`${CBIOPORTAL_URL}/results/oncoprint?Z_SCORE_THRESHOLD=2.0&cancer_study_id=coadread_tcga_pub&cancer_study_list=coadread_tcga_pub&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=KRAS%20NRAS%20BRAF&gene_set_choice=user-defined-list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&heatmap_track_groups=coadread_tcga_pub_rna_seq_mrna_median_Zscores%2CKRAS%2CNRAS%2CBRAF%3Bcoadread_tcga_pub_methylation_hm27%2CKRAS%2CNRAS%2CBRAF&show_samples=false`); $('.alert-warning').$('button.close').click(); // close dev mode notification so it doesnt intercept clicks waitForOncoprint(ONCOPRINT_TIMEOUT); diff --git a/end-to-end-test/remote/specs/core/results.spec.js b/end-to-end-test/remote/specs/core/results.spec.js index d55a98892e8..03e96259d0a 100644 --- a/end-to-end-test/remote/specs/core/results.spec.js +++ b/end-to-end-test/remote/specs/core/results.spec.js @@ -20,7 +20,7 @@ describe('Results Page', function() { describe('single study query with four genes', ()=>{ before(()=>{ - var url = `${CBIOPORTAL_URL}/results/cancerTypesSummary?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&case_ids=&gene_list=BRAF+KRAS+NRAS&gene_set_choice=user-defined-list&Action=Submit`; + var url = `${CBIOPORTAL_URL}/results/cancerTypesSummary?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=BRAF+KRAS+NRAS&gene_set_choice=user-defined-list&Action=Submit`; goToUrlAndSetLocalStorage(url); browser.waitForVisible('[data-test="cancerTypeSummaryChart"]',10000) }); @@ -133,7 +133,7 @@ describe('Results Page', function() { describe('3D structure visualizer', () => { before(() => { - var url = `${CBIOPORTAL_URL}/results/mutations?tab_index=tab_visualize&cancer_study_list=ov_tcga_pub&cancer_study_id=ov_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ov_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&case_set_id=ov_tcga_pub_3way_complete&case_ids=&gene_list=BRCA1+BRCA2&gene_set_choice=user-defined-list&Action=Submit`; + var url = `${CBIOPORTAL_URL}/results/mutations?tab_index=tab_visualize&cancer_study_list=ov_tcga_pub&cancer_study_id=ov_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ov_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&case_set_id=ov_tcga_pub_3way_complete&gene_list=BRCA1+BRCA2&gene_set_choice=user-defined-list&Action=Submit`; browser.url(url); browser.waitForExist('[data-test=view3DStructure]', 10000); browser.waitForEnabled('[data-test=view3DStructure]', 10000); @@ -150,7 +150,7 @@ describe('Results Page', function() { describe('Lollipop Plot Tracks', () => { before(() => { - var url = `${CBIOPORTAL_URL}/results/mutations?tab_index=tab_visualize&cancer_study_list=ov_tcga_pub&cancer_study_id=ov_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ov_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&case_set_id=ov_tcga_pub_3way_complete&case_ids=&gene_list=TP53+PTEN&gene_set_choice=user-defined-list&Action=Submit`; + var url = `${CBIOPORTAL_URL}/results/mutations?tab_index=tab_visualize&cancer_study_list=ov_tcga_pub&cancer_study_id=ov_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=ov_tcga_pub_mutations&Z_SCORE_THRESHOLD=2.0&case_set_id=ov_tcga_pub_3way_complete&gene_list=TP53+PTEN&gene_set_choice=user-defined-list&Action=Submit`; browser.url(url); browser.waitForExist('[data-test=view3DStructure]', 10000); browser.waitForEnabled('[data-test=view3DStructure]', 10000); diff --git a/end-to-end-test/remote/specs/core/screenshot.spec.js b/end-to-end-test/remote/specs/core/screenshot.spec.js index f03f5c0b7f6..da25ed05595 100644 --- a/end-to-end-test/remote/specs/core/screenshot.spec.js +++ b/end-to-end-test/remote/specs/core/screenshot.spec.js @@ -126,7 +126,7 @@ function runResultsTestSuite(prefix){ describe('result page screenshot tests', function(){ before(function(){ - var url = `${CBIOPORTAL_URL}/index.do?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&case_ids=&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list&Action=Submit&show_samples=false&`; + var url = `${CBIOPORTAL_URL}/index.do?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list&Action=Submit&show_samples=false&`; goToUrlAndSetLocalStorage(url); waitForOncoprint(10000); }); @@ -228,7 +228,7 @@ describe('patient view page screenshot test', function(){ describe("enrichments tab screenshot tests", function() { before(function() { - var url = `${CBIOPORTAL_URL}/results/enrichments?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&case_ids=&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list&Action=Submit`; + var url = `${CBIOPORTAL_URL}/results/enrichments?tab_index=tab_visualize&cancer_study_list=coadread_tcga_pub&cancer_study_id=coadread_tcga_pub&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&Z_SCORE_THRESHOLD=2.0&case_set_id=coadread_tcga_pub_nonhypermut&gene_list=KRAS+NRAS+BRAF&gene_set_choice=user-defined-list&Action=Submit`; goToUrlAndSetLocalStorage(url); }); it('enrichments tab coadread_tcga_pub mRNA profile', function(){ @@ -280,7 +280,7 @@ describe('result page tabs, loading from session id', function(){ describe('error messaging for 400 error', function(){ before(function(){ - var url = `${CBIOPORTAL_URL}/results/oncoprint?Z_SCORE_THRESHOLD=2.0&cancer_study_id=coadread_tcga_pub&cancer_study_list=coadread_tcga_pub&case_ids=&case_set_id=coadread_tcga_pubb_nonhypermut&gene_list=KRAS%20NRAS%20BRAF&gene_set_choice=user-defined-list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations`; + var url = `${CBIOPORTAL_URL}/results/oncoprint?Z_SCORE_THRESHOLD=2.0&cancer_study_id=coadread_tcga_pub&cancer_study_list=coadread_tcga_pub&case_set_id=coadread_tcga_pubb_nonhypermut&gene_list=KRAS%20NRAS%20BRAF&gene_set_choice=user-defined-list&genetic_profile_ids_PROFILE_COPY_NUMBER_ALTERATION=coadread_tcga_pub_gistic&genetic_profile_ids_PROFILE_MUTATION_EXTENDED=coadread_tcga_pub_mutations`; goToUrlAndSetLocalStorage(url); });