Merge origin/ci into ci

Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
This commit is contained in:
paolo
2016-04-27 11:54:20 +02:00
parent 51774021b4
commit 549b0133c2
8 changed files with 577 additions and 134 deletions
+10
View File
@@ -2,6 +2,7 @@ class_name: ApiTester
modules:
enabled:
- \Helper\Api
- Db
- REST:
# API URL
url: http://localhost/build/index.ci.php/api/
@@ -9,3 +10,12 @@ modules:
depends: PhpBrowser
# Limits PhpBrowser to JSON or XML
part: Json
config:
Db:
dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
user: 'fhcomplete'
password: 'fhcomplete'
dump: codeception/_data/dump.sql
populate: true
cleanup: false
reconnect: false