fixed genome builder smoke test

chgibb · Nov 16, 2019 · fbb433e · fbb433e
1 parent 374a8a9
commit fbb433e
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 7 deletions.
diff --git a/src/guiTests/6viewAlignCoverage.ts b/src/guiTests/6viewAlignCoverage.ts
@@ -5,17 +5,19 @@ 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<void>
 {
     await openProjectsView();
     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
@@ -30,7 +30,7 @@ export async function createHPV16Figure() : Promise<void>
                 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
@@ -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<void>} 
+ */
+export async function expandHPV16FigureList() : Promise<void>
+{
+    return new Promise<void>((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<Fasta>();
+            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);
+    });
+}
diff --git a/...larGenomeBuilder/toggleFiguresDropdown.ts → ...ularGenomeBuilder/toggleFiguresOverlay.ts b/...larGenomeBuilder/toggleFiguresDropdown.ts → ...ularGenomeBuilder/toggleFiguresOverlay.ts
@@ -6,13 +6,13 @@ import * as winMgr from "./../../../req/main/winMgr";
  * @export
  * @returns {Promise<void>} 
  */
-export async function toggleFiguresDropdown() : Promise<void>
+export async function toggleFiguresOverlay() : Promise<void>
 {
     return new Promise<void>((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<void>
             }
 
             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
@@ -26,6 +26,7 @@ export function GenomeBuilderAppBar(this: CircularGenomeBuilderView, props: { fi
                 <IconButton
                     edge="start"
                     color="primary"
+                    id="figuresOverlayToggle"
                     classes={{colorPrimary: white}}
                     onClick={() => 
                     {

diff --git 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 (                                             
-                                                <TreeItem nodeId={`${fastaIndex}`} label={fasta.alias}>
+                                                <TreeItem nodeId={`${fastaIndex}`} label={fasta.alias} id={`${fasta.uuid}ExpandTree`}>
                                                     {
                                                         props.builder.props.figures.map((figure,figureIndex) => 
                                                         {
@@ -74,6 +74,7 @@ export function FigureSelectOverlay(props: FigureSelectOverlayProps): JSX.Elemen
                                                         })
                                                     }
                                                     <TreeItem 
+                                                        id={`${fasta.uuid}NewFigure`}
                                                         nodeId={`${fastaIndex}-new`} 
                                                         label="Create New Figure" 
                                                         icon={