feat(!!): update lib and code to make the tests pass again

Author: rande

.gitignore

@@ -3,7 +3,7 @@ explorer/node_modules
 explorer/dist
 dist/*
 app/assets/bindata.go
-data
+data/*
 admin/build
 admin/node_modules
 vendor

.travis.yml

@@ -14,9 +14,6 @@ matrix:
 #      env: TEST_FRONTEND=on TRAVIS_NODE_VERSION="0.12"
 
 before_script:
-  - curl https://dl.influxdata.com/influxdb/releases/influxdb-0.13.0_linux_amd64.tar.gz | tar xvzf -
-  - ./influxdb-0.13.0-1/usr/bin/influxd &
-  - sleep 2
   - if [ "$TEST_BACKEND" = "on" ]; then
         psql -c 'create database travis_ci_test;' -U postgres;
         cp -f test/config_travis.toml test/config_test.toml;

Makefile

@@ -4,42 +4,34 @@ PID = .pid
 GO_FILES = $(shell find . -type f -name "*.go")
 GONODE_MODULES = $(shell ls -d ./modules/* | grep -v go)
 GONODE_CORE = $(shell ls -d ./core/* | grep -v go)
-GO_PATH = $(shell go env GOPATH)
-
-help:     ## Display this help
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-define back
-    $(call docker,back,$(1))
-endef
-
-define docker
-    if [ ! -f /.dockerenv ]; then \
-        docker-compose run $(1) /bin/bash -c "$(2)"; \
-    else \
-        /bin/bash -c "$(2)"; \
-    fi
-endef
-
-shell:
-	docker-compose run back /bin/bash
+GOPATH = $(shell go env GOPATH)
 
 install:
 	$(call back,glide install)
 	$(call back,go get github.com/wadey/gocovmerge && go get golang.org/x/tools/cmd/cover && go get golang.org/x/tools/cmd/goimports && go get -u github.com/jteeuwen/go-bindata/...)
 
 test:
-	$(call back,./app/assets/bindata.sh && go test -v $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
-	$(call back,go vet $(GONODE_CORE) $(GONODE_MODULES) ./test/modules/)
+	./app/assets/bindata.sh
+	echo "mode: atomic" > data/coverage.out
+	mkdir -p data
 
-format:
-	$(call back,gofmt -w $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
-	$(call back,go fix $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
-	$(call back,go vet $(GONODE_CORE) $(GONODE_MODULES) ./test/modules)
+	GONODE_TEST_OFFLINE=true GOPATH=${GOPATH} go test -v -failfast -covermode=atomic -coverprofile=data/coverage_core.out $(GONODE_CORE)
+	GOPATH=${GOPATH} go test -v -failfast -covermode=atomic -coverprofile=data/coverage_modules.out $(GONODE_MODULES)
+	GOPATH=${GOPATH} go test -v -failfast -covermode=atomic -coverpkg ./... -coverprofile=data/coverage_integration.out ./test/modules
+	go vet $(GONODE_CORE) $(GONODE_MODULES) ./test/modules/
+
+	tail -n +2 data/coverage_core.out >> data/coverage.out
+	tail -n +2 data/coverage_modules.out >> data/coverage.out
+	tail -n +2 data/coverage_integration.out >> data/coverage.out
+	go tool cover -html data/coverage.out -o data/coverage.html
 
 run:
-	docker-compose kill
-	docker-compose up
+	GOPATH=${GOPATH} `go env GOPATH`/bin/modd
+
+format:
+	gofmt -w $(GONODE_CORE) $(GONODE_MODULES) ./test/modules
+	go fix $(GONODE_CORE) $(GONODE_MODULES) ./test/modules
+	go vet $(GONODE_CORE) $(GONODE_MODULES) ./test/modules
 
 load:    ## Load fixtures
 	curl -XPOST http://localhost:2508/setup/uninstall && exit 0

app/assets/bindata.sh

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 
+GOPATH=`go env GOPATH`
 GO_BINDATA_PATHS="${GOPATH}/src/github.com/rande/gonode/modules/..."
 GO_BINDATA_IGNORE="(.*)\.(go|DS_Store)"
 GO_BINDATA_OUTPUT="${GOPATH}/src/github.com/rande/gonode/app/assets/bindata.go"
 GO_BINDATA_PACKAGE="assets"
 
 echo "Generating bindata file..."
-cd ${GOPATH}/src && go-bindata -dev -prefix ${GOPATH}/src -o ${GO_BINDATA_OUTPUT} -pkg ${GO_BINDATA_PACKAGE} -ignore ${GO_BINDATA_IGNORE} ${GO_BINDATA_PATHS}
+cd ${GOPATH}/src && ${GOPATH}/bin/go-bindata -dev -prefix ${GOPATH}/src -o ${GO_BINDATA_OUTPUT} -pkg ${GO_BINDATA_PACKAGE} -ignore ${GO_BINDATA_IGNORE} ${GO_BINDATA_PATHS}
 
 echo "Done!"

app/main.go

@@ -8,7 +8,6 @@ package main
 import (
 	"os"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/mitchellh/cli"
 	"github.com/rande/goapp"
 	"github.com/rande/gonode/app/assets"
@@ -30,6 +29,7 @@ import (
 	"github.com/rande/gonode/modules/search"
 	"github.com/rande/gonode/modules/setup"
 	"github.com/rande/gonode/modules/user"
+	log "github.com/sirupsen/logrus"
 )
 
 func Configure(configFile string) *goapp.Lifecycle {

app/server.toml.dist

@@ -4,7 +4,7 @@ test= true
 
 [databases.master]
 type    = "master"
-dsn     = "postgres://postgres:gonode@database/gonode?sslmode=disable"
+dsn     = "postgres://postgres:gonode@localhost/gonode?sslmode=disable"
 enabled = true
 prefix  = "prod"
 

core/bindata/bindata_app.go

@@ -6,10 +6,10 @@
 package bindata
 
 import (
-	log "github.com/Sirupsen/logrus"
 	"github.com/flosch/pongo2"
 	"github.com/rande/goapp"
 	"github.com/rande/gonode/core/config"
+	log "github.com/sirupsen/logrus"
 	"github.com/zenazn/goji/web"
 )
 
@@ -27,7 +27,6 @@ func Configure(l *goapp.Lifecycle, conf *config.Config) {
 	})
 
 	l.Prepare(func(app *goapp.App) error {
-
 		if !app.Has("goji.mux") {
 			return nil
 		}

core/bindata/bindata_asset.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/zenazn/goji/web"
 )
 
@@ -88,7 +88,5 @@ func ConfigureBinDataMux(mux *web.Mux, Asset func(name string) ([]byte, error),
 
 		res.WriteHeader(404)
 		res.Write([]byte("<html><head><title>Page not found</title></head><body><h1>Page not found</h1></body></html>"))
-
-		return
 	})
 }

core/commands/cli.go

@@ -9,10 +9,10 @@ import (
 	"flag"
 	"net/http"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/mitchellh/cli"
 	"github.com/rande/goapp"
 	"github.com/rande/gonode/core/config"
+	log "github.com/sirupsen/logrus"
 	"github.com/zenazn/goji/bind"
 	"github.com/zenazn/goji/graceful"
 	"github.com/zenazn/goji/web"

core/commands/cli_app.go

@@ -10,13 +10,13 @@ import (
 	"net/http"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
-	sq "github.com/lann/squirrel"
+	sq "github.com/Masterminds/squirrel"
 	"github.com/lib/pq"
 	"github.com/rande/goapp"
 	"github.com/rande/gonode/core/config"
 	"github.com/rande/gonode/core/vault"
 	"github.com/rande/gonode/modules/base"
+	log "github.com/sirupsen/logrus"
 	"github.com/zenazn/goji/web"
 	"github.com/zenazn/goji/web/middleware"
 )