Merge pull request #343

plotly · Feb 14, 2018 · 8cfc195 · 8cfc195
2 parents 1925f7f + bbc28bd
commit 8cfc195
Show file tree

Hide file tree

Showing 10 changed files with 2,349 additions and 523 deletions.
diff --git a/package.json b/package.json
@@ -10,6 +10,8 @@
     "heroku-postbuild": "yarn run build-headless && yarn run build-web",
     "build-renderer": "cross-env NODE_ENV=production node -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.production.js --profile --colors",
     "build-web": "cross-env NODE_ENV=production node -r babel-register ./node_modules/webpack/bin/webpack --config webpack.config.web.js --profile --colors",
+    "docker:elasticsearch:build": "docker build test/docker/elasticsearch -f test/docker/elasticsearch/Dockerfile-v5 -t falcon-test-elasticsearch --no-cache",
+    "docker:elasticsearch:start": "docker run --rm -ti -p 9200:9200 -p 9300:9300 -e \"discovery.type=single-node\" -e \"xpack.security.enabled=false\" falcon-test-elasticsearch",
     "docker:db2:build": "docker build test/docker/ibmdb2/ -t pdc-db2 --build-arg LICENSE=accept --build-arg DB2INST1_PASSWORD=${DB2INST1_PASSWORD} --build-arg DB2USER1_PASSWORD=${DB2USER1_PASSWORD} --no-cache",
     "docker:db2:start": "docker run --rm -ti -p 50000:50000 pdc-db2",
     "docker:falcon:build": "docker build -t falcon-sql-client:local .",
@@ -26,7 +28,11 @@
     "test-unit-all-watch": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --bail --full-trace --timeout 90000  --compilers js:babel-register --recursive test/**/*.spec.js --watch",
     "test-unit-watch": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --bail --full-trace --timeout 90000  --watch --compilers js:babel-register ",
     "test-unit-certificates": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/certificates.spec.js",
+    "test-unit-datastores": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/Datastores.spec.js",
     "test-unit-dataworld": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/datastores.dataworld.spec.js",
+    "test-unit-elasticsearch": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/datastores.elasticsearch.spec.js",
+    "test-unit-elasticsearch-v2": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/datastores.elasticsearch-v2.spec.js",
+    "test-unit-elasticsearch-v5": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/datastores.elasticsearch-v5.spec.js",
     "test-unit-ibmdb": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/datastores.ibmdb.spec.js",
     "test-unit-impala": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/datastores.impala.spec.js",
     "test-unit-livy": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 electron-mocha --full-trace --timeout 90000 --compilers js:babel-register test/backend/datastores.livy.spec.js",
@@ -142,7 +148,7 @@
     "babel-register": "^6.26.0",
     "babel-runtime": "^6.26.0",
     "bunyan": "^1.8.12",
-    "chai": "^3.5.0",
+    "chai": "^4.1.2",
     "chai-spies": "^0.7.1",
     "chromedriver": "^2.33.2",
     "classnames": "^2.2.5",