Merge branch 'release/v0.3.0'

takama · Apr 18, 2018 · 5f07753 · 5f07753
2 parents 0781523 + 82b379c
commit 5f07753
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 9 deletions.
diff --git a/.env b/.env
@@ -3,7 +3,7 @@ APP=backfriend
 REGISTRY=takama
 
 # Service version
-RELEASE=v0.2.0
+RELEASE=v0.3.0
 
 # service infrastructure
 # Namespace: dev, prod, release, cte, username ...

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -35,4 +35,4 @@
 
 [[constraint]]
   name = "github.com/takama/backer"
-  version = "v0.3.9"
+  version = "v0.4.0"
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ REGISTRY?=takama
 CA_DIR?=certs
 
 # Use the v0.0.0 tag for testing, it shouldn't clobber any release builds
-RELEASE?=v0.2.0
+RELEASE?=v0.3.0
 GOOS?=linux
 GOARCH?=amd64
 

diff --git a/README.md b/README.md
@@ -7,6 +7,20 @@
 
 Back a friend service: used [backer](https://github.com/takama/backer) package/library
 
+## Installation
+
+Build and run
+
+```sh
+make run
+```
+
+Or pull from docker registry and run
+
+```sh
+docker-compose up -d
+```
+
 ## Known restrictions
 
 1. A several verifications of input attributes skipped due to complicating the task

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,4 +1,11 @@
-# Version v0.2.0
+# Version v0.3.0
+
+## v0.3.0
+
+### Codebase changes in v0.3.0
+
+- Added tournament handlers and test interactions with players ([#16](https://github.com/takama/back-friend/issues/16), [@takama](https://github.com/takama))
+- Integrated backer package and added player handlers ([#15](https://github.com/takama/back-friend/issues/15), [@takama](https://github.com/takama))
 
 ## v0.2.0
 

diff --git a/pkg/handlers/tournament_test.go b/pkg/handlers/tournament_test.go
@@ -235,7 +235,7 @@ func TestTournamentResult(t *testing.T) {
 	testHandlerWithParams(t,
 		map[string]string{":id": "1", "data": `{"player": "p1"}`},
 		h, h.TournamentJoin,
-		http.StatusOK, `{"id":1,"deposit":300,"is_finished":false,"bidders":[{"id":"p1","winner":false,"prize":0,"backers":null}]}`)
+		http.StatusOK, `{"id":1,"deposit":300,"is_finished":false,"bidders":[{"id":"p1","winner":false,"prize":0,"backers":[]}]}`)
 
 	stub.ErrFind = append(stub.ErrFind, ErrTestError, nil)
 	testHandlerWithParams(t,
@@ -258,7 +258,7 @@ func TestTournamentResult(t *testing.T) {
 	testHandlerWithParams(t,
 		map[string]string{":id": "1", "data": `{"winners": [{"player": "p1", "prize": 300}]}`},
 		h, h.TournamentResult,
-		http.StatusOK, `{"id":1,"deposit":300,"is_finished":true,"bidders":[{"id":"p1","winner":true,"prize":300,"backers":null}]}`)
+		http.StatusOK, `{"id":1,"deposit":300,"is_finished":true,"bidders":[{"id":"p1","winner":true,"prize":300,"backers":[]}]}`)
 
 	testHandlerWithParams(t,
 		map[string]string{":id": "1", "data": `{"winners": [{"player": "p1", "prize": 300}]}`},