Merge branch 'development' into master

VirtualFlyBrain · May 22, 2018 · f1bac1c · f1bac1c
2 parents 1714009 + de1c8f0
commit f1bac1c
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 27 deletions.
diff --git a/tests/casperjs/control-panel-tests.js b/tests/casperjs/control-panel-tests.js
@@ -1,5 +1,10 @@
-var DASHBOARD_URL = "http://127.0.0.1:8080/org.geppetto.frontend/";
-var PROJECT_URL = "http://127.0.0.1:8080/org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
+var urlBase = casper.cli.get('host');
+if(urlBase==null || urlBase==undefined){
+    urlBase = "http://127.0.0.1:8080/";
+}
+
+var DASHBOARD_URL = urlBase + "org.geppetto.frontend/";
+var PROJECT_URL = urlBase + "org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
 
 casper.test.begin('VFB control panel tests', 7, function suite(test) {
     casper.options.viewportSize = {
@@ -25,27 +30,19 @@ casper.test.begin('VFB control panel tests', 7, function suite(test) {
     });
 
     // open dashboard
-    casper.start(DASHBOARD_URL, function () {
-        this.waitForSelector('div#logo', function () {
+    casper.start(PROJECT_URL, function () {
+	this.echo("Loading project at URL: " + PROJECT_URL);
+        this.waitForSelector('div#geppettologo', function () {
             this.echo("I waited for the logo to load.");
             test.assertTitle("geppetto's home", "geppetto's homepage title is the one expected");
             test.assertExists('div#logo', "logo is found");
         }, null, 120000);
     });
 
-    // open project, check for items in control panel + instances
-    casper.thenOpen(PROJECT_URL, function () {
-        this.echo("Loading project at URL: " + PROJECT_URL);
-
-        casper.then(function(){
-            this.waitForText('VFB_00017894', function () {
-                this.echo("Element JFRC2_template appeared in popup");
-            	test.assertVisible('div[id=Popup1_VFB_00017894_metadata_el_1]', 'Term info correctly populated  for JFRC2_template after load');
-		test.assertExists('button[id=VFB_00017894_zoom_buttonBar_btn]', 'Term info button bar button created');
-	    }, null, 30000);
-
-
-        });
+    // check for items in control panel + instances
+    casper.then(function () {
+	test.assertExists('div#Popup1_VFB_00017894_metadata_el_1', 'Term info correctly populated  for JFRC2_template after load');
+	test.assertExists('button[id=VFB_00017894_zoom_buttonBar_btn]', 'Term info button bar button created');
     });
 
     // open control panel, check it's visible
@@ -75,8 +72,8 @@ casper.test.begin('VFB control panel tests', 7, function suite(test) {
 	        casper.mouseEvent('click', 'button[id=VFB_00017894_select_ctrlPanel_btn]', 'Clicking selection button on JFRC2_template');
 
 	        // wait for text to appear in the term info widget
-	        casper.waitForSelector('div[id=Popup1_VFB_00017894_metadata_el_0]', function () {
-	            test.assertExists('div[id=Popup1_VFB_00017894_metadata_el_0]', 'Term info correctly populated  for JFRC2_template after control panel selection click');
+	        casper.waitForSelector('div#Popup1_VFB_00017894_metadata_el_0', function () {
+	            test.assertExists('div#Popup1_VFB_00017894_metadata_el_0', 'Term info correctly populated  for JFRC2_template after control panel selection click');
 	        }, null, 10000);
 		});
 

diff --git a/tests/casperjs/query-tests.js b/tests/casperjs/query-tests.js
@@ -1,5 +1,10 @@
-var DASHBOARD_URL = "http://127.0.0.1:8080/org.geppetto.frontend/";
-var PROJECT_URL = "http://127.0.0.1:8080/org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
+var urlBase = casper.cli.get('host');
+if(urlBase==null || urlBase==undefined){
+    urlBase = "http://127.0.0.1:8080/";
+}
+
+var DASHBOARD_URL = urlBase + "org.geppetto.frontend/";
+var PROJECT_URL = urlBase + "org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
 
 casper.test.begin('VFB query component tests', function suite(test) {
     casper.options.viewportSize = {

diff --git a/tests/casperjs/spotlight-tests.js b/tests/casperjs/spotlight-tests.js
@@ -1,5 +1,10 @@
-var DASHBOARD_URL = "http://127.0.0.1:8080/org.geppetto.frontend/";
-var PROJECT_URL = "http://127.0.0.1:8080/org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
+var urlBase = casper.cli.get('host');
+if(urlBase==null || urlBase==undefined){
+    urlBase = "http://127.0.0.1:8080/";
+}
+
+var DASHBOARD_URL = urlBase + "org.geppetto.frontend/";
+var PROJECT_URL = urlBase + "org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
 
 casper.test.begin('VFB Spotlight tests', function suite(test) {
     casper.options.viewportSize = {

diff --git a/tests/casperjs/stack-viewer-tests.js b/tests/casperjs/stack-viewer-tests.js
@@ -1,5 +1,10 @@
-var DASHBOARD_URL = "http://127.0.0.1:8080/org.geppetto.frontend/";
-var PROJECT_URL = "http://127.0.0.1:8080/org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
+var urlBase = casper.cli.get('host');
+if(urlBase==null || urlBase==undefined){
+    urlBase = "http://127.0.0.1:8080/";
+}
+
+var DASHBOARD_URL = urlBase + "org.geppetto.frontend/";
+var PROJECT_URL = urlBase + "org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
 
 casper.test.begin('VFB StackViewer tests', function suite(test) {
     casper.options.viewportSize = {

diff --git a/tests/casperjs/term-info-tests.js b/tests/casperjs/term-info-tests.js
@@ -1,5 +1,10 @@
-var DASHBOARD_URL = "http://127.0.0.1:8080/org.geppetto.frontend/";
-var PROJECT_URL = "http://127.0.0.1:8080/org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
+var urlBase = casper.cli.get('host');
+if(urlBase==null || urlBase==undefined){
+    urlBase = "http://127.0.0.1:8080/";
+}
+
+var DASHBOARD_URL = urlBase + "org.geppetto.frontend/";
+var PROJECT_URL = urlBase + "org.geppetto.frontend/geppetto?load_project_from_url=http://v2.virtualflybrain.org/conf/vfb.json";
 
 casper.test.begin('VFB Term Info tests', 5, function suite(test) {
     casper.options.viewportSize = {