Merge pull request #9 from senseyeio/smotes/mountebank-v2.0

mountebank v2.0

.travis.yml

@@ -1,21 +1,20 @@
 sudo: required
 
 services:
-    - docker
+  - docker
 
 language: go
 
 go:
-    - 1.9
-    - "1.10"
-    - "1.11"
-    - "1.12"
+  - "1.10"
+  - "1.11"
+  - "1.12"
 
-before_install:
-    - make pull
-    - make tools
+script: make unit && make integration
 
-script:
-    - make errcheck
-    - make lint
-    - make integration
+jobs:
+  include:
+    - stage: check
+      install: go get golang.org/x/lint/golint github.com/kisielk/errcheck
+      script: make lint && make errcheck
+      go: "1.12" # only run source code analysis tools on latest version of Go

Makefile

@@ -1,29 +1,24 @@
-GOPACKAGES := $(shell go list github.com/senseyeio/mbgo/...)
+GOPACKAGES := $(shell go list ./...)
+
+.PHONY: default
+default: fmt lint unit
 
 .PHONY: errcheck
 errcheck:
 	@errcheck -asserts -blank -ignore 'io:[cC]lose' $(GOPACKAGES)
 
 .PHONY: fmt
 fmt:
-	@for pkg in $(GOPACKAGES); do go fmt $$pkg; done
+	@go fmt $(PACKAGES)
+
+.PHONY: integration
+integration:
+	@sh ./scripts/integration_test.sh $(GOPACKAGES)
 
 .PHONY: lint
 lint:
 	@golint -set_exit_status $(GOPACKAGES)
 
-.PHONY: pull
-pull:
-	@docker pull andyrbell/mountebank:1.16.0
-
 .PHONY: unit
 unit:
-	@go test -cover -short $(GOPACKAGES)
-
-.PHONY: integration
-integration:
-	@go test -cover -cpu=1,2 -tags integration $(GOPACKAGES)
-
-.PHONY: tools
-tools:
-	@go get -u golang.org/x/lint/golint github.com/kisielk/errcheck
+	@go test -cover -timeout=1s $(GOPACKAGES)

README.md

@@ -19,7 +19,9 @@ $ make unit
 $ make integration
 ```
 
-The integration test client points to a local Docker container at port 2525, with the additional ports 8080-8083 exposed for communication with test imposters. Currently tested against a mountebank v1.16.0 instance.
+The integration tests expect Docker to be available on the host, using it to run a local mountebank container at 
+`localhost:2525`, with the additional ports 8080-8081 exposed for test imposters. Currently tested against a mountebank 
+v2.0.0 instance using the [andyrbell/mountebank](https://hub.docker.com/r/andyrbell/mountebank) image on DockerHub.
 
 ## Contributing