Тестовое окружение отделено от основного, упрощены билды для контейнеров MariaDB и RabbitMQ, написаны скрипты для быстрого прогона тестов

README.md

@@ -62,10 +62,5 @@ docker-compose restart
 ## Тестирование php бэкэнда
 
 ```sh
-# Прежде чем тестировать, необходимо накатить миграции
+./tests/run-tests.sh
-docker exec -it app php tests/codeception/bin/yii migrate --interactive=0
-# Собрать все тестовые окружения
-docker exec -it app ./vendor/bin/codecept build -c tests
-# И запустить собственно процесс тестирования
-docker exec -it app ./vendor/bin/codecept run -c tests
 ```

composer.json

@@ -46,9 +46,6 @@
         }
     ],
     "scripts": {
-        "build-tests" : "cd tests && codecept build",
-        "test" : "codecept run -c tests",
-        "test-api" : "codecept run -c tests/codeception/api",
         "phploc" : "phploc ./api ./common ./console"
     }
 }

docker-compose.yml

@@ -2,8 +2,6 @@ version: '2'
 services:
     app:
         build: .
-        expose:
-            - "9000"
         links:
             - db
             - redis
@@ -13,9 +11,6 @@ services:
         volumes:
             - ./:/var/www/html/
         env_file: .env
-        environment:
-            ENABLE_ENV_FILE: 1
-            ENABLE_LOCALCONF: 1
 
     web:
         build: ./docker/nginx
@@ -47,14 +42,24 @@ services:
 
     db:
         build: ./docker/mariadb
+        environment:
+            MYSQL_ROOT_PASSWORD: ""
+            MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+            MYSQL_DATABASE: "ely_accounts"
+            MYSQL_USER: "ely_accounts_user"
+            MYSQL_PASSWORD: "ely_accounts_password"
 
     redis:
         image: redis:3.0
 
     rabbitmq:
         build: ./docker/rabbitmq
+        environment:
+            RABBITMQ_DEFAULT_USER: "ely-accounts-app"
+            RABBITMQ_DEFAULT_PASS: "app-password"
+            RABBITMQ_DEFAULT_VHOST: "/account.ely.by"
         ports:
-            - "15672:15672"
+            - "15672:15672" # Manager interface
 
     phpmyadmin:
         build: ./docker/phpmyadmin
@@ -62,7 +67,6 @@ services:
             - PMA_ARBITRARY=1
             - PMA_USER=root
             - PMA_PASSWORD=
-        restart: always
         ports:
             - "8181:80"
         links:

docker/mariadb/Dockerfile

@@ -1,13 +1,3 @@
 FROM mariadb:10.0
 
 COPY mariadb.cnf /etc/mysql/conf.d
-
-# Add script to create default users / vhosts
-ADD init.sh /init.sh
-ADD run.sh /run.sh
-
-# Run rabbitmq, execute init configuration and then shutdown
-RUN chmod +x /init.sh /run.sh \
- && /init.sh
-
-ENTRYPOINT "/run.sh"

docker/mariadb/init.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Копипаста. Я не знаю, что тут происходит
-
-set -e
-set -x
-
-mysql_install_db
-
-# Start the MySQL daemon in the background.
-/usr/sbin/mysqld &
-mysql_pid=$!
-
-until mysqladmin ping &>/dev/null; do
-  echo -n "."; sleep 0.2
-done
-
-# Конец рандомной копипасты
-
-# Устаналиваем беспарольный доступ для рута
-mysql -e "GRANT ALL ON *.* TO root@'%' IDENTIFIED BY '' WITH GRANT OPTION"
-
-# Создаём базу данных для приложения и для тестов
-mysql -e "CREATE DATABASE IF NOT EXISTS ely_accounts CHARACTER SET utf8 COLLATE utf8_general_ci"
-mysql -e "CREATE DATABASE IF NOT EXISTS ely_accounts_test CHARACTER SET utf8 COLLATE utf8_general_ci"
-
-# Tell the MySQL daemon to shutdown.
-mysqladmin shutdown
-
-# Wait for the MySQL daemon to exit.
-wait $mysql_pid
-
-# Сохраняем состояние базы данных
-tar czvf default_mysql.tar.gz /var/lib/mysql

docker/mariadb/run.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-# first, if the /var/lib/mysql directory is empty, unpack it from our predefined db
-[ "$(ls -A /var/lib/mysql)" ] && echo "Running with existing database in /var/lib/mysql" || ( echo 'Populate initial db'; tar xpzvf default_mysql.tar.gz )
-
-/usr/sbin/mysqld

docker/rabbitmq/Dockerfile

@@ -3,8 +3,3 @@ FROM rabbitmq:3.6
 RUN rabbitmq-plugins enable rabbitmq_management \
  && rabbitmq-plugins enable rabbitmq_web_stomp \
  && rabbitmq-plugins enable rabbitmq_mqtt
-
-# Add script to create default users / vhosts
-ADD init.sh /init.sh
-
-RUN chmod +x /init.sh

docker/rabbitmq/init.sh

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-#( sleep 10 ; \
-#
-## Create users
-#rabbitmqctl add_user ely-accounts-app app-password ; \
-#rabbitmqctl add_user ely-accounts-tester tester-password ; \
-#
-## Set user rights
-#rabbitmqctl set_user_tags ely-accounts-app administrator ; \
-#rabbitmqctl set_user_tags ely-accounts-tester administrator ; \
-#
-## Create vhosts
-#rabbitmqctl add_vhost /account.ely.by ; \
-#rabbitmqctl add_vhost /account.ely.by/tests ; \
-#
-## Set vhost permissions
-#rabbitmqctl set_permissions -p /account.ely.by ely-accounts-app ".*" ".*" ".*" ; \
-#rabbitmqctl set_permissions -p /account.ely.by/tests ely-accounts-tester ".*" ".*" ".*" ; \
-#) &
-#rabbitmq-server $@
-
-#service rabbitmq-server start
-
-# Create users
-rabbitmqctl add_user ely-accounts-app app-password
-rabbitmqctl add_user ely-accounts-tester tester-password
-
-# Set user rights
-rabbitmqctl set_user_tags ely-accounts-app administrator
-rabbitmqctl set_user_tags ely-accounts-tester administrator
-
-# Create vhosts
-rabbitmqctl add_vhost /account.ely.by
-rabbitmqctl add_vhost /account.ely.by/tests
-
-# Set vhost permissions
-rabbitmqctl set_permissions -p /account.ely.by ely-accounts-app ".*" ".*" ".*"
-rabbitmqctl set_permissions -p /account.ely.by/tests ely-accounts-tester ".*" ".*" ".*"
-
-#service rabbitmq-server stop
-
-# Сохраняем состояние рэбита
-#tar czvf default_rabbitmq.tar.gz /var/lib/rabbitmq/mnesia

docker/rabbitmq/run.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-[ "$(ls -A /var/lib/rabbitmq/mnesia)" ] && echo "Running with existing rabbitmq in /var/lib/rabbitmq" || ( echo 'Populate initial rabbitmq'; tar xpzvf default_rabbitmq.tar.gz )
-
-rabbitmq-server

docker/wait-for-it.sh

@@ -1,18 +1,15 @@
 #!/usr/bin/env bash
 #   Use this script to test if a given TCP host/port are available
+# https://github.com/jlordiales/wait-for-it (fork of original source)
 
 cmdname=$(basename $0)
 
 echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
 
-usage()
+usage() {
-{
     cat << USAGE >&2
 Usage:
     $cmdname host:port [-s] [-t timeout] [-- command args]
-    -h HOST | --host=HOST       Host or IP under test
-    -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
     -s | --strict               Only execute subcommand if the test succeeds
     -q | --quiet                Don't output any status messages
     -t TIMEOUT | --timeout=TIMEOUT
@@ -22,21 +19,22 @@ USAGE
     exit 1
 }
 
-wait_for()
+wait_for() {
-{
+    local wait_host=$1
+    local wait_port=$2
     if [[ $TIMEOUT -gt 0 ]]; then
-        echoerr "$cmdname: waiting $TIMEOUT seconds for $HOST:$PORT"
+        echoerr "$cmdname: waiting $TIMEOUT seconds for $wait_host:$wait_port"
     else
-        echoerr "$cmdname: waiting for $HOST:$PORT without a timeout"
+        echoerr "$cmdname: waiting for $wait_host:$wait_port without a timeout"
     fi
-    start_ts=$(date +%s)
+    local start_ts=$(date +%s)
     while :
     do
-        (echo > /dev/tcp/$HOST/$PORT) >/dev/null 2>&1
+        (echo > /dev/tcp/$wait_host/$wait_port) >/dev/null 2>&1
-        result=$?
+        local result=$?
         if [[ $result -eq 0 ]]; then
-            end_ts=$(date +%s)
+            local end_ts=$(date +%s)
-            echoerr "$cmdname: $HOST:$PORT is available after $((end_ts - start_ts)) seconds"
+            echoerr "$cmdname: $wait_host:$wait_port is available after $((end_ts - start_ts)) seconds"
             break
         fi
         sleep 1
@@ -44,32 +42,34 @@ wait_for()
     return $result
 }
 
-wait_for_wrapper()
+wait_for_wrapper() {
-{
+    local wait_host=$1
+    local wait_port=$2
     # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
     if [[ $QUIET -eq 1 ]]; then
-        timeout $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+        timeout $TIMEOUT $0 $wait_host:$wait_port --quiet --child --timeout=$TIMEOUT &
     else
-        timeout $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+        timeout $TIMEOUT $0 $wait_host:$wait_port --child --timeout=$TIMEOUT &
     fi
     PID=$!
     trap "kill -INT -$PID" INT
     wait $PID
     RESULT=$?
     if [[ $RESULT -ne 0 ]]; then
-        echoerr "$cmdname: timeout occurred after waiting $TIMEOUT seconds for $HOST:$PORT"
+        echoerr "$cmdname: timeout occurred after waiting $TIMEOUT seconds for $wait_host:$wait_port"
     fi
     return $RESULT
 }
 
-# process arguments
+parse_arguments() {
-while [[ $# -gt 0 ]]
+  local index=0
-do
+  while [[ $# -gt 0 ]]
+  do
       case "$1" in
           *:* )
           hostport=(${1//:/ })
-        HOST=${hostport[0]}
+          HOST[$index]=${hostport[0]}
-        PORT=${hostport[1]}
+          PORT[$index]=${hostport[1]}
           shift 1
           ;;
           --child)
@@ -84,24 +84,6 @@ do
           STRICT=1
           shift 1
           ;;
-        -h)
-        HOST="$2"
-        if [[ $HOST == "" ]]; then break; fi
-        shift 2
-        ;;
-        --host=*)
-        HOST="${1#*=}"
-        shift 1
-        ;;
-        -p)
-        PORT="$2"
-        if [[ $PORT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --port=*)
-        PORT="${1#*=}"
-        shift 1
-        ;;
           -t)
           TIMEOUT="$2"
           if [[ $TIMEOUT == "" ]]; then break; fi
@@ -124,31 +106,45 @@ do
           usage
           ;;
       esac
-done
+      let index+=1
-
+  done
-if [[ "$HOST" == "" || "$PORT" == "" ]]; then
+  if [[ ${#HOST[@]} -eq 0 || ${#PORT[@]} -eq 0 ]]; then
       echoerr "Error: you need to provide a host and port to test."
       usage
-fi
-
-TIMEOUT=${TIMEOUT:-15}
-STRICT=${STRICT:-0}
-CHILD=${CHILD:-0}
-QUIET=${QUIET:-0}
-
-if [[ $CHILD -gt 0 ]]; then
-    wait_for
-    RESULT=$?
-    exit $RESULT
-else
-    if [[ $TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        RESULT=$?
-    else
-        wait_for
-        RESULT=$?
   fi
-fi
+}
+
+iterate_hosts() {
+  local result=0
+  local index=0
+  local wait_function=$1
+  while [[ $result -eq 0 && $index -lt ${#HOST[@]} ]]; do
+    ($wait_function ${HOST[$index]} ${PORT[$index]})
+    result=$?
+    let index+=1
+  done
+  echo $result
+}
+
+wait_for_services() {
+  TIMEOUT=${TIMEOUT:-15}
+  STRICT=${STRICT:-0}
+  CHILD=${CHILD:-0}
+  QUIET=${QUIET:-0}
+
+  if [[ $CHILD -gt 0 ]]; then
+      exit $(iterate_hosts wait_for)
+  else
+      if [[ $TIMEOUT -gt 0 ]]; then
+          RESULT=$(iterate_hosts wait_for_wrapper)
+      else
+          RESULT=$(iterate_hosts wait_for)
+      fi
+  fi
+}
+
+parse_arguments "$@"
+wait_for_services
 
 if [[ $CLI != "" ]]; then
     if [[ $RESULT -ne 0 && $STRICT -eq 1 ]]; then

environments/docker/common/config/main-local.php

@@ -3,8 +3,8 @@ return [
     'components' => [
         'db' => [
             'dsn' => 'mysql:host=db;dbname=ely_accounts',
-            'username' => 'root',
+            'username' => 'ely_accounts_user',
-            'password' => '',
+            'password' => 'ely_accounts_password',
         ],
         'mailer' => [
             'useFileTransport' => true,

tests/README.md

@@ -1,58 +0,0 @@
-This directory contains various tests for the advanced applications.
-
-Tests in `codeception` directory are developed with [Codeception PHP Testing Framework](http://codeception.com/).
-
-After creating and setting up the advanced application, follow these steps to prepare for the tests:
-
-1. Install Codeception if it's not yet installed:
-
-   ```
-   composer global require "codeception/codeception=2.0.*" "codeception/specify=*" "codeception/verify=*"
-   ```
-
-   If you've never used Composer for global packages run `composer global status`. It should output:
-
-   ```
-   Changed current directory to <directory>
-   ```
-
-   Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now you're able to use `codecept` from command
-   line globally.
-
-2. Install faker extension by running the following from template root directory where `composer.json` is:
-
-   ```
-   composer require --dev yiisoft/yii2-faker:*
-   ```
-
-3. Create `yii2_advanced_tests` database then update it by applying migrations:
-
-   ```
-   codeception/bin/yii migrate
-   ```
-
-4. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in
-   webserver. In the root directory where `common`, `frontend` etc. are execute the following:
-
-   ```
-   php -S localhost:8080
-   ```
-
-5. Now you can run the tests with the following commands, assuming you are in the `tests/codeception` directory:
-
-   ```
-   # frontend tests
-   cd frontend
-   codecept build
-   codecept run
-   
-   # backend tests
-   
-   cd backend
-   codecept build
-   codecept run
-    
-   # etc.
-   ```
-
-  If you already have run `codecept build` for each application, you can skip that step and run all tests by a single `codecept run`.

tests/codeception/api/_bootstrap.php

@@ -21,6 +21,4 @@ $_SERVER['SERVER_NAME'] =  parse_url(\Codeception\Configuration::config()['confi
 $_SERVER['SERVER_PORT'] =  parse_url(\Codeception\Configuration::config()['config']['test_entry_url'], PHP_URL_PORT) ?: '80';
 
 Yii::setAlias('@tests', dirname(dirname(__DIR__)));
-
-// disable deep cloning of properties inside specify block
 \Codeception\Specify\Config::setDeepClone(false);

tests/codeception/api/functional.suite.yml

@@ -12,11 +12,11 @@ modules:
         Yii2:
             configFile: '../config/api/functional.php'
         Redis:
-            host: redis
+            host: testredis
             port: 6379
-            database: 1
+            database: 0
         AMQP:
-            host: rabbitmq
+            host: testrabbit
             port: 5672
             username: 'ely-accounts-tester'
             password: 'tester-password'

tests/codeception/config/config.php

@@ -1,7 +1,4 @@
 <?php
-/**
- * Application configuration shared by all applications and test types
- */
 return [
     'language' => 'en-US',
     'controllerMap' => [
@@ -14,7 +11,9 @@ return [
     ],
     'components' => [
         'db' => [
-            'dsn' => 'mysql:host=db;dbname=ely_accounts_test',
+            'dsn' => 'mysql:host=testdb;dbname=ely_accounts_test',
+            'username' => 'ely_accounts_tester',
+            'password' => 'ely_accounts_tester_password',
         ],
         'mailer' => [
             'useFileTransport' => true,
@@ -23,9 +22,10 @@ return [
             'showScriptName' => true,
         ],
         'redis' => [
-            'database' => 1,
+            'hostname' => 'testredis',
         ],
         'amqp' => [
+            'host' => 'testrabbit',
             'user' => 'ely-accounts-tester',
             'password' => 'tester-password',
             'vhost' => '/account.ely.by/tests',

tests/codeception/console/_bootstrap.php

@@ -14,3 +14,4 @@ $_SERVER['SERVER_NAME'] = 'localhost';
 $_SERVER['SERVER_PORT'] = '80';
 
 Yii::setAlias('@tests', dirname(dirname(__DIR__)));
+\Codeception\Specify\Config::setDeepClone(false);

tests/docker-compose.yml

@@ -0,0 +1,30 @@
+version: '2'
+services:
+    testphp:
+        build: ./..
+        links:
+            - testdb
+            - testredis
+            - testrabbit
+        volumes:
+            - ./../:/var/www/html/
+        env_file: ./../.env
+
+    testdb:
+        build: ./../docker/mariadb
+        environment:
+            MYSQL_ROOT_PASSWORD: ""
+            MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+            MYSQL_DATABASE: "ely_accounts_test"
+            MYSQL_USER: "ely_accounts_tester"
+            MYSQL_PASSWORD: "ely_accounts_tester_password"
+
+    testredis:
+        image: redis:3.0
+
+    testrabbit:
+        build: ./../docker/rabbitmq
+        environment:
+            RABBITMQ_DEFAULT_USER: "ely-accounts-tester"
+            RABBITMQ_DEFAULT_PASS: "tester-password"
+            RABBITMQ_DEFAULT_VHOST: "/account.ely.by/tests"

tests/php.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$0")"
+
+./../vendor/bin/codecept build
+
+./../docker/wait-for-it.sh testdb:3306 testrabbit:5672 -- \
+php codeception/bin/yii migrate/up  --interactive=0 && ./../vendor/bin/codecept run

tests/run-tests.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$0")"
+
+docker-compose run --rm testphp ./tests/php.sh
+docker-compose stop # docker не останавливает зависимые контейнеры после завершения работы главного процесса