Rel 2.3.0 rc6 (#95)

djdefi · web-flow · commit 091984f941e5 · 2016-06-15T21:21:44.000-07:00
* 2.3 backport (#88) * Version v2.3.0-RC2 * fix DB connect test message (#87) * Rename docker dir to conf, closes #85 * Backport recent image changes to master * Backport recent image changes to master * ignore tests in docker build context * add api test (#93) * Cachet Release v2.3.0-RC6
diff --git a/.dockerignore b/.dockerignore
@@ -8,3 +8,4 @@ Changelog.md
 Makefile
 docker-compose.yml
 .travis.yml
+test
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:jessie
 MAINTAINER Alt Three <support@alt-three.com>
 
 ARG cachet_ver
-ENV cachet_ver v2.3.0-RC5
+ENV cachet_ver v2.3.0-RC6
 
 # Using debian packages instead of compiling from scratch
 RUN DEBIAN_FRONTEND=noninteractive \
diff --git a/test/test.full.bats b/test/test.full.bats
@@ -30,6 +30,11 @@ load "lib/output"
   assert_output -l 0 $'HTTP/1.1 200 OK\r'
 }
 
+@test "[$TEST_FILE] curl API ping" {
+	run curl_container docker_nginx_1 /api/v1/ping
+  assert_output -l 0 $'{"data":"Pong!"}'
+}
+
 @test "[$TEST_FILE] stop all bats containers" {
 	stop_bats_containers
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,11 @@ load "lib/output"`
`30`	`30`	`assert_output -l 0 $'HTTP/1.1 200 OK\r'`
`31`	`31`	`}`
`32`	`32`
	`33`	`+@test "[$TEST_FILE] curl API ping" {`
	`34`	`+ run curl_container docker_nginx_1 /api/v1/ping`
	`35`	`+ assert_output -l 0 $'{"data":"Pong!"}'`
	`36`	`+}`
	`37`	`+`
`33`	`38`	`@test "[$TEST_FILE] stop all bats containers" {`
`34`	`39`	`stop_bats_containers`
`35`	`40`	`}`