From 3e56f45b9029eacf17d89bf4b7a1b98bd966ff51 Mon Sep 17 00:00:00 2001
From: Chris Goller <goller@gmail.com>
Date: Fri, 16 Sep 2016 15:11:00 -0500
Subject: [PATCH] Update circle and makefile to build and test everything.

Signed-off-by: Will Piers <wpiers0405@gmail.com>
---
 Makefile        | 25 +++++++++++++++++++------
 circle.yml      |  1 +
 ui/package.json |  3 ++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a6295a9da6..a8abfa07ca 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ BINARY=mrfusion
 
 default: prepare ${BINARY}
 
+prepare: dev assets
+
 ${BINARY}: $(SOURCES)
 	go build -o ${BINARY} ${LDFLAGS} ./cmd/mr-fusion-server/main.go
 
@@ -19,24 +21,35 @@ docker-${BINARY}: $(SOURCES)
 docker: docker-${BINARY}
 	docker build -t mrfusion .
 
-assets:
-	mkdir -p ui/build
+assets: jsbuild
 	go-bindata -o ui/ui.go -ignore 'map|go' -pkg ui -nocompress=true ui/build/...
 
-dev:
+jsbuild:
+	cd ui && npm run build
+
+dev: jsdev godev
+
+godev:
 	go get github.com/sparrc/gdm
 	gdm restore
 	go get -u github.com/jteeuwen/go-bindata/...
 
-prepare: dev assets
+jsdev:
+	cd ui && npm install 
 
 clean:
 	if [ -f ${BINARY} ] ; then rm ${BINARY} ; fi
+	cd ui && npm run clean
 
-test:
+test: gotest jstest
+
+gotest:
 	go test -race ./...
 
+jstest:
+	cd ui && npm test
+
 run:
 	./mrfusion --port 8888
 
-.PHONY: clean test run
+.PHONY: clean test jstest run
diff --git a/circle.yml b/circle.yml
index 5e70076ceb..5b8d9b0b6e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,6 +9,7 @@ machine:
 
 dependencies:
     pre:
+        - npm install -g node-sass
         - git config --global url."git@github.com:".insteadOf "https://github.com/"
         - mkdir -p ${HOME}/.go_workspace/src/github.com/influxdata
         - ln -sf ${HOME}/mrfusion ${HOME}/.go_workspace/src/github.com/influxdata
diff --git a/ui/package.json b/ui/package.json
index 809ce791a6..f748a94fbf 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -15,7 +15,8 @@
     "test:dev": "testem",
     "test": "mocha --compilers js:babel-core/register --recursive spec/",
     "test:watch": "npm run test:mocha -- --watch",
-    "test:browser": "webpack-dev-server --config webpack/testConfig.js"
+    "test:browser": "webpack-dev-server --config webpack/testConfig.js",
+    "clean": "rm -rf ui/build"
   },
   "author": "",
   "eslintConfig": {