From fbb433ea18c189a47c0aab696f9598d6379c671e Mon Sep 17 00:00:00 2001 From: chgibb Date: Sat, 16 Nov 2019 16:20:16 -0500 Subject: [PATCH] fixed genome builder smoke test --- src/guiTests/6viewAlignCoverage.ts | 6 ++- .../createHPV16Figure.ts | 2 +- .../expandHPV16FigureList.ts | 41 +++++++++++++++++++ ...resDropdown.ts => toggleFiguresOverlay.ts} | 6 +-- .../containers/genomeBuilderAppBar.tsx | 1 + .../overlays/figureSelectOverlay.tsx | 3 +- 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 src/guiTests/req/circularGenomeBuilder/expandHPV16FigureList.ts rename src/guiTests/req/circularGenomeBuilder/{toggleFiguresDropdown.ts => toggleFiguresOverlay.ts} (77%) diff --git a/src/guiTests/6viewAlignCoverage.ts b/src/guiTests/6viewAlignCoverage.ts index cd2c88d9d..d725ae2eb 100644 --- a/src/guiTests/6viewAlignCoverage.ts +++ b/src/guiTests/6viewAlignCoverage.ts @@ -5,9 +5,10 @@ logMainProcessErrors(); import {openProjectsView} from "./req/projectSelection/openProjectsView"; import {openFirstProject} from "./req/projectSelection/openFirstProject"; import {openCircularGenomeBuilderWindow} from "./req/circularGenomeBuilder/openCircularGenomeBuilderWindow"; -import {toggleFiguresDropdown} from "./req/circularGenomeBuilder/toggleFiguresDropdown"; +import {toggleFiguresOverlay} from "./req/circularGenomeBuilder/toggleFiguresOverlay"; import {createHPV16Figure} from "./req/circularGenomeBuilder/createHPV16Figure"; import {closeToolBar} from "./req/closeToolBar"; +import { expandHPV16FigureList } from './req/circularGenomeBuilder/expandHPV16FigureList'; async function runTest() : Promise { @@ -15,7 +16,8 @@ async function runTest() : Promise await openFirstProject(); await openCircularGenomeBuilderWindow(); - await toggleFiguresDropdown(); + await toggleFiguresOverlay(); + await expandHPV16FigureList(); await createHPV16Figure(); await closeToolBar(); diff --git a/src/guiTests/req/circularGenomeBuilder/createHPV16Figure.ts b/src/guiTests/req/circularGenomeBuilder/createHPV16Figure.ts index 021d7b487..cd1ea8458 100644 --- a/src/guiTests/req/circularGenomeBuilder/createHPV16Figure.ts +++ b/src/guiTests/req/circularGenomeBuilder/createHPV16Figure.ts @@ -30,7 +30,7 @@ export async function createHPV16Figure() : Promise if(fastas[i].alias == "HPV16ref_genomes.fasta") { genomeBuilder[0].executeJavaScript(` - document.getElementById("${fastas[i].uuid}NewFigure").click(); + document.getElementById("${fastas[i].uuid}NewFigure").children[0].click(); `); return resolve(); } diff --git a/src/guiTests/req/circularGenomeBuilder/expandHPV16FigureList.ts b/src/guiTests/req/circularGenomeBuilder/expandHPV16FigureList.ts new file mode 100644 index 000000000..0629e42bd --- /dev/null +++ b/src/guiTests/req/circularGenomeBuilder/expandHPV16FigureList.ts @@ -0,0 +1,41 @@ +import * as winMgr from "./../../../req/main/winMgr"; +import * as dataMgr from "./../../../req/main/dataMgr"; +import {Fasta} from "./../../../req/fasta"; + +/** + * Expands HPV16 figure list + * + * @export + * @returns {Promise} + */ +export async function expandHPV16FigureList() : Promise +{ + return new Promise((resolve,reject) => + { + setTimeout(function() + { + console.log("expanding figure list for hpv16"); + + let genomeBuilder = winMgr.getFreeWebContents(); + if(!genomeBuilder || genomeBuilder.length == 0) + { + console.log("Failed to open genomeBuilder window"); + process.exit(1); + } + + let fastas = new Array(); + fastas = dataMgr.getKey("input","fastaInputs"); + for(let i = 0; i != fastas.length; ++i) + { + if(fastas[i].alias == "HPV16ref_genomes.fasta") + { + genomeBuilder[0].executeJavaScript(` + document.getElementById("${fastas[i].uuid}ExpandTree").children[0].click(); + `); + return resolve(); + } + } + return reject(); + },1000); + }); +} \ No newline at end of file diff --git a/src/guiTests/req/circularGenomeBuilder/toggleFiguresDropdown.ts b/src/guiTests/req/circularGenomeBuilder/toggleFiguresOverlay.ts similarity index 77% rename from src/guiTests/req/circularGenomeBuilder/toggleFiguresDropdown.ts rename to src/guiTests/req/circularGenomeBuilder/toggleFiguresOverlay.ts index a04526bb1..cadc4e6e9 100644 --- a/src/guiTests/req/circularGenomeBuilder/toggleFiguresDropdown.ts +++ b/src/guiTests/req/circularGenomeBuilder/toggleFiguresOverlay.ts @@ -6,13 +6,13 @@ import * as winMgr from "./../../../req/main/winMgr"; * @export * @returns {Promise} */ -export async function toggleFiguresDropdown() : Promise +export async function toggleFiguresOverlay() : Promise { return new Promise((resolve,reject) => { setTimeout(function() { - console.log("toggling figures dropdown"); + console.log("toggling figures overlay"); let genomeBuilder = winMgr.getFreeWebContents(); if(!genomeBuilder || genomeBuilder.length == 0) @@ -22,7 +22,7 @@ export async function toggleFiguresDropdown() : Promise } genomeBuilder[0].executeJavaScript(` - document.getElementById("figuresDropdownToggle").click(); + document.getElementById("figuresOverlayToggle").click(); `); resolve(); },500); diff --git a/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderAppBar.tsx b/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderAppBar.tsx index 9085acb7e..a61755d86 100644 --- a/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderAppBar.tsx +++ b/src/req/renderer/views/circularGenomeBuilderView/containers/genomeBuilderAppBar.tsx @@ -26,6 +26,7 @@ export function GenomeBuilderAppBar(this: CircularGenomeBuilderView, props: { fi { diff --git a/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/figureSelectOverlay.tsx b/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/figureSelectOverlay.tsx index afe274437..8fdef9e27 100644 --- a/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/figureSelectOverlay.tsx +++ b/src/req/renderer/views/circularGenomeBuilderView/containers/overlays/figureSelectOverlay.tsx @@ -50,7 +50,7 @@ export function FigureSelectOverlay(props: FigureSelectOverlayProps): JSX.Elemen props.builder.props.fastas.map((fasta,fastaIndex) => { return ( - + { props.builder.props.figures.map((figure,figureIndex) => { @@ -74,6 +74,7 @@ export function FigureSelectOverlay(props: FigureSelectOverlayProps): JSX.Elemen }) }