Merge pull request #571 from VirtualFlyBrain/development

latest from Development
VirtualFlyBrain · May 28, 2020 · c88dd34 · c88dd34
2 parents 5f8ac59 + b44d4d6
commit c88dd34
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,34 +50,22 @@ script:
   - travis_wait 50 docker run -t -dit --name=$CONTAINER_NAME -p 8080:8080 $REPO:$TAG || travis_terminate 1
   - echo -e "travis_fold:end:Docker_Build" || true
   - echo -e "travis_fold:start:Startup_Server1" || true
-  - sleep 60;
-  - bash $TRAVIS_BUILD_DIR/tests/casperjs/utilities/test_geppetto_server.sh
-  - docker logs $CONTAINER_NAME || true
-  - sleep 60
+  - export iterations=1
+  - Test () { export http_status=$(curl -s -i $LANDING_PAGE | grep HTTP/1.1 | awk {'print $2'}); echo "Returned status \"$http_status\""; if [ "$http_status" != "200" ]; then echo "Waiting for docker to finish building..."; iterations=$((iterations+1)); if [ "$iterations" != "100" ]; then sleep 1; Test; fi; else echo "$(date) - connected successfully"; fi; }
+  - Test
   - echo -e "travis_fold:end:Startup_Server1" || true
-  - echo -e "travis_fold:start:Startup_Server2" || true
-  - bash $TRAVIS_BUILD_DIR/tests/casperjs/utilities/test_geppetto_server.sh
-  - sleep 30
-  - echo -e "travis_fold:end:Startup_Server2" || true
   - echo -e "travis_fold:start:Startup_Server3" || true
-  - http_status=$(curl -s -I $1 $LANDING_PAGE | grep HTTP/1.1 | awk {'print $2'})
   - echo "$http_status"
-  - while [ "$http_status" == "404" ]; do
-      echo "Restart run. Printing logs for debugging purposes";
+  - while [ "$http_status" != "200" ]; do
+      echo "Printing logs for debugging purposes";
       sudo docker cp $CONTAINER_NAME:/home/developer/virgo/serviceability/logs/log.log /etc;
-      tail -n 200 /etc/log.log;
+      tail /etc/log.log;
       docker stop $(docker ps -a -q);
-      sleep 10;
-      docker rm $(docker ps -a -q);
-      sleep 10;
-      travis_wait 50 docker run  -t -dit --name=$CONTAINER_NAME -p 8080:8080 $IMAGE_NAME;
-      travis_wait 50 bash $TRAVIS_BUILD_DIR/tests/casperjs/utilities/test_geppetto_server.sh;
-      sleep 60;
-      http_status=$(curl -s -I $1 $LANDING_PAGE | grep HTTP/1.1 | awk {'print $2'});
-      echo "Done restarting $http_status";
+      echo "Docker container failed to start!";
+      travis_terminate 1;
     done;
   - echo -e "travis_fold:end:Startup_Server3" || true
-  - travis_wait 30 npm test -- --verbose --colors
+  - travis_wait 40 npm test -- --verbose --colors --maxConcurrency=2 --forceExit
   - echo -e "travis_fold:start:Deploy" || true
   - docker ps -a
   - sudo docker cp $CONTAINER_NAME:/home/developer/virgo/serviceability/logs/log.log /etc

diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ ARG geppettoDatasourceRelease=development
 ARG geppettoModelSwcRelease=v1.0.1
 ARG geppettoFrontendRelease=VFBv2.1.0.3
 ARG geppettoClientRelease=VFBv2.1.0.6
-ARG ukAcVfbGeppettoRelease=v2.1.0.3-rc1
+ARG ukAcVfbGeppettoRelease=v2.1.0.3
 
 ARG mvnOpt="-Dhttps.protocols=TLSv1.2 -DskipTests --quiet -Pmaster"
 

diff --git a/tests/jest/vfb/3d-viewer-tests.js b/tests/jest/vfb/3d-viewer-tests.js
@@ -39,13 +39,13 @@ describe('VFB 3D Viewer Component Tests', () => {
 		})
 
 		it('Term info component created after load', async () => {
-			await wait4selector(page, 'div#VFBTermInfo_el_1_component', { visible: true })
+			await wait4selector(page, 'div#VFBTermInfo_el_0_component', { visible: true })
 		})
 
-		it('Hide Quick Help Modal Window', async () => {
-			closeModalWindow(page);
-			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
-		})
+//		it('Hide Quick Help Modal Window', async () => {
+//			closeModalWindow(page);
+//			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
+//		})
 
 		it('Term info component correctly populated at startup', async () => {
 			// Checks name in Term Info is present and correct

diff --git a/tests/jest/vfb/menu-component-tests.js b/tests/jest/vfb/menu-component-tests.js
@@ -41,10 +41,10 @@ describe('VFB Menu Component Tests', () => {
 			await page.waitForFunction('document.getElementById("VFBTermInfo_el_0_component").innerText.startsWith("adult brain template JFRC2 (VFB_00017894)")', {timeout : 120000});
 		})
 
-		it('Hide Quick Help Modal Window', async () => {
-			closeModalWindow(page);
-			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
-		})
+//		it('Hide Quick Help Modal Window', async () => {
+//			closeModalWindow(page);
+//			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
+//		})
 	})
 
 	//Tests Menu Components for About and Help Work

diff --git a/tests/jest/vfb/query-tests.js b/tests/jest/vfb/query-tests.js
@@ -42,13 +42,13 @@ describe('VFB Query Component Tests', () => {
 		})
 
 		it('Term info component created after load', async () => {
-			await wait4selector(page, 'div#VFBTermInfo_el_1_component', { visible: true })
+			await wait4selector(page, 'div#VFBTermInfo_el_0_component', { visible: true })
 		})
 
-		it('Hide Quick Help Modal Window', async () => {
-			closeModalWindow(page);
-			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
-		})
+//		it('Hide Quick Help Modal Window', async () => {
+//			closeModalWindow(page);
+//			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
+//		})
 
 		it('Term info component correctly populated at startup', async () => {
 			await page.waitForFunction('document.getElementById("VFBTermInfo_el_0_component").innerText.startsWith("adult brain template JFRC2 (VFB_00017894)")');

diff --git a/tests/jest/vfb/slice-viewer-tests.js b/tests/jest/vfb/slice-viewer-tests.js
@@ -43,10 +43,10 @@ describe('VFB Slice Viewer Component Tests', () => {
 			await wait4selector(page, 'div#VFBTermInfo_el_1_component', { visible: true })
 		})
 
-		it('Hide Quick Help Modal Window', async () => {
-			closeModalWindow(page);
-			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
-		})
+//		it('Hide Quick Help Modal Window', async () => {
+//			closeModalWindow(page);
+//			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
+//		})
 
 		it('Term info component correctly populated at startup', async () => {
 			await page.waitForFunction('document.getElementById("VFBTermInfo_el_0_component").innerText.startsWith("adult brain template JFRC2 (VFB_00017894)")');

diff --git a/tests/jest/vfb/spotlight-tests.js b/tests/jest/vfb/spotlight-tests.js
@@ -71,17 +71,27 @@ describe('VFB Spotlight Tests', () => {
 			await wait4selector(page, ST.SPOT_LIGHT_SELECTOR, {visible: true});
 		});
 
-		it('Spotlight visible, perform Instance search', async () => {
-			await page.keyboard.type('fru-M-200266');
-			await page.waitFor(15000);
-			await page.evaluate(async () => document.querySelector("#paperResults").querySelectorAll(".MuiListItem-button")[0].click());
+		it('Spotlight button exists', async () => {
+			await page.focus(ST.SPOT_LIGHT_SEARCH_INPUT_SELECTOR);
+			await page.keyboard.type('VFB_00000001 (fru-M-200266)');
+			await page.waitFor(3000);
+			await page.keyboard.press('Enter')
+		});;
+
+		it('Spotlight Add Scene button exists', async () => {
+			await page.waitForSelector('button[id=buttonOne]', {visible: true, timeout : 10000});			
 		});
 
-		it('New Instance Added to Scene, Term Info Updated', async () => {
-			await wait4selector(page, '#VFB_00000001_deselect_buttonBar_btn', { visible: true , timeout : 180000});
+		it('Add scene button visible', async () => {
+			await click(page, 'button[id=buttonOne]');
+			await wait4selector(page, '#VFB_00000001_deselect_buttonBar_btn', { visible: true , timeout : 10000})
 			await page.waitForFunction('document.getElementById("VFBTermInfo_el_0_component").innerText.startsWith("fru-M-200266")');
 		});
 
+		it('Close spotlight', async () => {
+			await page.evaluate(async selector => $(selector).hide(), ST.SPOT_LIGHT_SELECTOR);
+		})
+
 		it('VFB_00017894.VFB_00017894_obj visibility correct after adding it through spotlight', async () => {
 			expect(
 					await page.evaluate(async () => CanvasContainer.engine.getRealMeshesForInstancePath('VFB_00017894.VFB_00017894_obj')[0].visible)

diff --git a/tests/jest/vfb/term-info-tests.js b/tests/jest/vfb/term-info-tests.js
@@ -22,8 +22,6 @@ describe('VFB Term Info Component Tests', () => {
 	describe('Test landing page', () => {
 		it('Loading spinner goes away', async () => {
 			await wait4selector(page, ST.SPINNER_SELECTOR, { hidden: true, timeout : 120000 })
-			// Close tutorial window
-			closeModalWindow(page);
 		})
 
 		it('VFB Title shows up', async () => {
@@ -48,10 +46,10 @@ describe('VFB Term Info Component Tests', () => {
 			await wait4selector(page, 'div#VFBTermInfo_el_1_component', { visible: true , timeout : 400000})
 		})
 
-		it('Hide Quick Help Modal Window', async () => {
-			closeModalWindow(page);
-			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
-		})
+//		it('Hide Quick Help Modal Window', async () => {
+//			closeModalWindow(page);
+//			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
+//		})
 
 		it('Term info component name correctly populated at startup', async () => {
 			await page.waitForFunction('document.getElementById("VFBTermInfo_el_0_component").innerText.startsWith("medulla on adult brain template JFRC2 (VFB_00030624)")');

diff --git a/tests/jest/vfb/tree-browser-tests.js b/tests/jest/vfb/tree-browser-tests.js
@@ -36,10 +36,10 @@ describe('VFB Tree Browser Component Tests', () => {
 			await wait4selector(page, 'div#VFBTermInfo_el_1_component', { visible: true , timeout : 120000})
 		})
 
-		it('Hide Quick Help Modal Window', async () => {
-			closeModalWindow(page);
-			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
-		})
+//		it('Hide Quick Help Modal Window', async () => {
+//			closeModalWindow(page);
+//			await wait4selector(page, 'div#quick_help_modal', { hidden : true })
+//		})
 
 		// Waits for Term info to populate, this is done to make sure project finishes loading before continuing
 		it('Term info component correctly populated at startup', async () => {
@@ -84,9 +84,9 @@ describe('VFB Tree Browser Component Tests', () => {
 		})
 
 		it('Click on "eye" icon to render "adult cerebral ganglion" mesh', async () => {
-			await click(page, 'i.fa-eye');
+			await click(page, '#VFBTree_component i.fa-eye');
 			// Wait for 'color picker' selector to show, this is the sign that the click on the eye button worked and the mesh was rendered
-			await wait4selector(page, 'i.fa-tint', { visible: true, timeout : 240000 })
+			await wait4selector(page, 'i.fa-tint', { visible: true, timeout : 500000 })
 		})
 
 		it('Mesh for "adult cerebral ganglion" rendered in canvas after clicking on eye icon next to node', async () => {

diff --git a/tests/jest/vfb/utils.js b/tests/jest/vfb/utils.js
@@ -19,10 +19,10 @@ export const wait4selector = async (page, selector, settings = {}) => {
 
 
 export const click = async (page, selector) => {
-  await wait4selector(page, selector, { visible: true });
+  await wait4selector(page, selector, { visible: true, timeout: 1000});
   let success = undefined;
   try {
-    await page.click(selector);
+    await page.evaluate((selector) => document.querySelector(selector).click(), selector);
     success = true
   } catch (error){
     // console.log(`ERROR clicking on selector   --->   ${selector} failed.`)