tmp commit git diff --cached!

etpinard · etpinard · commit 1179ed187ca3 · 2015-11-16T11:57:42.000-05:00
diff --git a/package.json b/package.json
@@ -49,10 +49,11 @@
     "watch": "node tasks/watch_plotly.js",
     "lint": "cd src && jshint . || true",
     "test-jasmine": "karma start test/jasmine/karma.conf.js",
-    "test-image": "node test/image/compare_pixels_test.js",
+    "test-image": "./tasks/test_image.sh",
     "test": "npm run test-jasmine && npm test-image",
     "start-test_dashboard": "node devtools/test_dashboard/server.js",
-    "start-image_viewer": "node devtools/image_viewer/server.js"
+    "start-image_viewer": "node devtools/image_viewer/server.js",
+    "make-baseline": "./tasks/make_baseline.sh"
   },
   "dependencies": {
     "3d-view": "^2.0.0",
diff --git a/tasks/test_image.sh b/tasks/test_image.sh
@@ -0,0 +1,21 @@
+#! /bin/bash
+#
+# TODO adapt this for Windows
+
+# TODO add package.json config arguments to configure the container name,
+#       ports and imageserver version
+
+CONTAINER_NAME=""
+
+
+docker run -d --name $CONTAINER_NAME \
+    -v $PWD/plotly.js:/var/www/streambed/image_server/plotly.js \
+    -p 9010:9010 -p 2022:22 plotly/imageserver:[version]
+
+docker exec -i $CONTAINER_NAME /bin/bash \
+    -c "cd /var/www/streambed/image_server/plotly.js && \
+        cp -f test/image/index.html ../server_app/index.html && \
+        monit restart nw1 && \
+        sleep 5 && \
+        node test/image/compare_pixels_test.js"
+        
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -1,13 +1,11 @@
-'use strict';
-
 var fs = require('fs');
-var request = require('request');
 var path = require('path');
 
 var constants = require('../../tasks/util/constants');
 var getOptions = require('../../tasks/util/get_image_request_options');
 
 // packages inside the image server docker
+var request = require('request');
 var test = require('tape');
 var gm = require('gm');
 
@@ -72,7 +70,6 @@ function testMock (fileName, t) {
             tolerance: 0.0
         };
 
-	console.log(savedImagePath)
         if(statusCode === 485) {
             console.error(imageFileName, '- skip');
         }
diff --git a/test/image/index.html b/test/image/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<body>
+<!-- this index file gets copied in to the image server docker -->
+<script type="text/javascript" src="../plotly.js/dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
+<script type="text/javascript" src="../plotly.js/dist/plotly.js" charset="utf-8"></script>
+<script type="text/javascript" src="../plotly.js/dist/plotly-geo-assets.js" charset="utf-8"></script>
+<script type="text/javascript" src="./main.js"></script>
+</body>
+</html>
