Skip to content
This repository has been archived by the owner on Aug 10, 2022. It is now read-only.

Commit

Permalink
Added docker-compose based tests, env-based configs
Browse files Browse the repository at this point in the history
  • Loading branch information
archdevil666pl committed Feb 8, 2017
1 parent 7b20ee7 commit 8d2cc31
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 14 deletions.
22 changes: 16 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,29 @@ php:
- 7.0

env:
- PHALCON_VERSION="3.0.x"
- PHALCON_VERSION="v3.0.3"
- PHALCON_VERSION="v3.0.2"
- PHALCON_VERSION="v3.0.1"
- PHALCON_VERSION="v3.0.0"
global:
- MONGO_DB_NAME="vegas_test"
- VEGAS_CMF_CORE_MONGO_PORT_27017_TCP_ADDR="localhost"
- VEGAS_CMF_CORE_MONGO_PORT_27017_TCP_PORT=27017
- VEGAS_CMF_CORE_MYSQL_PORT_3306_TCP_ADDR="localhost"
- VEGAS_CMF_CORE_MYSQL_PORT_3306_TCP_PORT=3306
- VEGAS_CMF_CORE_MYSQL_ENV_MYSQL_DATABASE="vegas_test"
- VEGAS_CMF_CORE_MYSQL_ENV_MYSQL_USER="root"
- VEGAS_CMF_CORE_MYSQL_ENV_MYSQL_PASSWORD
matrix:
- PHALCON_VERSION="3.0.x"
- PHALCON_VERSION="v3.0.3"
- PHALCON_VERSION="v3.0.2"
- PHALCON_VERSION="v3.0.1"
- PHALCON_VERSION="v3.0.0"

services:
- mongodb
- memcached

before_install:
- printf "\n" | pecl install mongo &> /dev/null
- mysql -e "CREATE DATABASE IF NOT EXISTS vegas_test;" -uroot
- mysql -e "CREATE DATABASE IF NOT EXISTS ${VEGAS_CMF_CORE_MYSQL_ENV_MYSQL_DATABASE};" -uroot

before_script:
- ./travis/install-php-extension.sh ${PHALCON_VERSION}
Expand Down
35 changes: 35 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
mongo:
image: mongo:3.0.14
container_name: vegas-cmf-core-mongo
command: mongod --smallfiles
expose:
- 27017
- 28017
environment:
- AUTH=no
- TERM=xterm-256color

mysql:
image: mysql:5.7
container_name: vegas-cmf-core-mysql
expose:
- 3306
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_ROOT_PASSWORD
- MYSQL_USER=root
- MYSQL_PASSWORD
- MYSQL_DATABASE=vegas_test

phpunit:
image: amsdard/phalcon:3.x
container_name: vegas-cmf-core-phpunit
command: vendor/bin/phpunit
environment:
- TERM=xterm-256color
- MONGO_DB_NAME=vegas_test
links:
- mongo:vegas-cmf-auth-mongo
- mysql:vegas-cmf-auth-mysql
volumes:
- ./:/opt
2 changes: 1 addition & 1 deletion tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}, true);
$di->set('mongo', function() use ($config) {
$mongo = new \MongoClient();
return $mongo->selectDb($config->mongo->db);
return $mongo->selectDb($config->mongo->dbname);
}, true);
$di->set('modelManager', function() use ($di) {
return new \Phalcon\Mvc\Model\Manager();
Expand Down
17 changes: 10 additions & 7 deletions tests/config.sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,20 @@
],

'mongo' => [
'db' => 'vegas_test',
'dbname' => getenv('MONGO_DB_NAME'),
'host' => getenv('VEGAS_CMF_CORE_MONGO_PORT_27017_TCP_ADDR'),
'port' => getenv('VEGAS_CMF_CORE_MONGO_PORT_27017_TCP_PORT')
],

'db' => [
"adapter" => 'mysql',
"host" => "localhost",
"dbname" => "vegas_test",
"port" => 3306,
"username" => "root",
"options" => [
PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
'host' => getenv('VEGAS_CMF_CORE_MYSQL_PORT_3306_TCP_ADDR'),
'port' => getenv('VEGAS_CMF_CORE_MYSQL_PORT_3306_TCP_PORT'),
'dbname' => getenv('VEGAS_CMF_CORE_MYSQL_ENV_MYSQL_DATABASE'),
'username' => getenv('VEGAS_CMF_CORE_MYSQL_ENV_MYSQL_USER'),
'password' => getenv('VEGAS_CMF_CORE_MYSQL_ENV_MYSQL_PASSWORD'),
'options' => [
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'
]
]
];

0 comments on commit 8d2cc31

Please sign in to comment.