Merge pull request #193 from VirtualFlyBrain/master

Casper fixes

.travis.yml

@@ -53,6 +53,10 @@ script:
 - sed -i 's|"useSsl":.*,|"useSsl":false,|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json
 - sed -i 's|"embedded":.*,|"embedded":false,|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json
 - sed -i 's|"embedderURL":.*,|"embedderURL":"/",|g' $TRAVIS_BUILD_DIR/dockerFiles/GeppettoConfiguration.json 
+- |
+  if [ "$VFBSUB" = "local" ]; then
+    sed -i 's|SOLR_SERVER=/solr/ontology/select|SOLR_SERVER=http://solr.virtualflybrain.org/solr/ontology/select|g' $TRAVIS_BUILD_DIR/Dockerfile   
+  fi
 - echo -e "travis_fold:end:Geppetto-Config"
 - echo -e "travis_fold:start:Docker-Build"
 - docker build -t $REPO:$COMMIT .

Dockerfile

@@ -17,6 +17,8 @@ ENV PATH=/opt/apache-maven-3.3.9/bin/:$PATH
 # Forcing bash:
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh && rm /bin/sh.distrib && ln -s /bin/bash /bin/sh.distrib
 
+#SOLR server:
+ENV SOLR_SERVER=/solr/ontology/select
 
 USER virgo
 # Geppetto:
@@ -45,6 +47,7 @@ git clone https://github.com/openworm/org.geppetto.datasources.git -b $BRANCH_OR
 git clone https://github.com/openworm/org.geppetto.model.swc.git -b $BRANCH_ORG_GEPPETTO_MODEL_SWC && \
 git clone https://github.com/openworm/org.geppetto.simulation.git -b $BRANCH_ORG_GEPPETTO_SIMULATION && \
 git clone https://github.com/VirtualFlyBrain/uk.ac.vfb.geppetto.git -b $BRANCH_UK_AC_VFB_GEPPETTO && \
+sed -i "s|\"/solr/ontology/select|\"${SOLR_SERVER}|g" geppetto-vfb/ComponentsInitialization.js && \
 mv geppetto-vfb org.geppetto.frontend/src/main/webapp/extensions/
 
 #Set GA keys TBD:Check if still needed

tests/casperjs/control-panel-tests.js

@@ -34,9 +34,9 @@ casper.test.begin('VFB control panel tests', 7, function suite(test) {
 	this.echo("Loading project at URL: " + PROJECT_URL);
         this.waitForSelector('div#geppettologo', function () {
             this.echo("I waited for the logo to load.");
-            test.assertTitle("VirtualFlyBrain", "geppetto's homepage title is the one expected");
-            test.assertExists('div#geppettologo', "logo is found");
-        }, null, 10000);
+            test.assertTitle("geppetto's home", "geppetto's homepage title is the one expected");
+            test.assertExists('div#logo', "logo is found");
+        }, null, 120000);
     });
 
     // check for items in control panel + instances

tests/casperjs/query-tests.js

@@ -93,7 +93,7 @@ casper.test.begin('VFB query component tests', function suite(test) {
                         runQueryTests();
                     }, null, 10000);
                 }, null, 10000);
-            }, null, 10000);
+            }, null, 120000);
         });
     };