fixed issue with test environment. Now you can use test environment as test and ci

Author: dmitriy

Diff for: .circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
       - run:
           name: Start container and verify it's working
           command: |
-            make start-ci
+            make start-test
 
       - run:
           name: Wait for DB container is running and initialize DB

Diff for: .dockerignore

@@ -11,6 +11,6 @@ bootstrap/cache
 Dockerfile
 _ide_helper.php
 docker-compose.yml
-docker-compose-ci.yml
+docker-compose-test-ci.yml
 docker-compose-prod.yml
 Makefile

Diff for: .env.local renamed to .env.dev

@@ -1,5 +1,5 @@
 APP_NAME=Laravel
-APP_ENV=local
+APP_ENV=dev
 APP_KEY=base64:KgeWah2LwOk5HLjCYuIZjaQQwX59ASqUjCKZMD6H4Ew=
 APP_DEBUG=true
 APP_URL=http://localhost

Diff for: .env.prod

@@ -1,5 +1,5 @@
 APP_NAME=Laravel
-APP_ENV=production
+APP_ENV=prod
 APP_KEY=
 APP_DEBUG=false
 APP_URL=http://localhost

Diff for: .env.testing renamed to .env.test

@@ -1,5 +1,5 @@
 APP_NAME=Laravel
-APP_ENV=testing
+APP_ENV=test
 APP_KEY=base64:KgeWah2LwOk5HLjCYuIZjaQQwX59ASqUjCKZMD6H4Ew=
 APP_DEBUG=false
 APP_URL=http://localhost

Diff for: .env.example renamed to .env.test-ci

@@ -1,16 +1,17 @@
+# by default test environment using .env.test. So all tests will use the same database. If you need to separate it, just use make env-test-ci command and then run migrations and seed.
 APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
+APP_ENV=test
+APP_KEY=base64:KgeWah2LwOk5HLjCYuIZjaQQwX59ASqUjCKZMD6H4Ew=
+APP_DEBUG=false
 APP_URL=http://localhost
 
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=mysql
 DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
+DB_DATABASE=laravel
+DB_USERNAME=root
 DB_PASSWORD=secret
 
 BROADCAST_DRIVER=log

Diff for: Dockerfile

@@ -3,17 +3,16 @@ FROM php:7.3-fpm
 # set main params
 ARG BUILD_ARGUMENT_DEBUG_ENABLED=false
 ENV DEBUG_ENABLED=$BUILD_ARGUMENT_DEBUG_ENABLED
-ARG BUILD_ARGUMENT_APP_ENV=development
-ENV APP_ENV=$BUILD_ARGUMENT_APP_ENV
-ARG BUILD_ARGUMENT_ENV_FILE=.env.local
-ENV ENV_FILE=$BUILD_ARGUMENT_ENV_FILE
+ARG BUILD_ARGUMENT_ENV=dev
+ENV ENV=$BUILD_ARGUMENT_ENV
 ENV APP_HOME /var/www/html
 
 # check environment
-RUN if [ "$BUILD_ARGUMENT_APP_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_APP_ENV in docker build-args like --build-arg BUILD_ARGUMENT_APP_ENV=development" && exit 2; \
-    elif [ "$BUILD_ARGUMENT_APP_ENV" = "development" ]; then echo "Building development environment."; \
-    elif [ "$BUILD_ARGUMENT_APP_ENV" = "production" ]; then echo "Building production environment."; \
-    else echo "Set correct BUILD_ARGUMENT_APP_ENV in docker build-args like --build-arg BUILD_ARGUMENT_APP_ENV=development. Available choices are development,production." && exit 2; \
+RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev" && exit 2; \
+    elif [ "$BUILD_ARGUMENT_ENV" = "dev" ]; then echo "Building development environment."; \
+    elif [ "$BUILD_ARGUMENT_ENV" = "test" ]; then echo "Building test environment."; \
+    elif [ "$BUILD_ARGUMENT_ENV" = "prod" ]; then echo "Building production environment."; \
+    else echo "Set correct BUILD_ARGUMENT_ENV in docker build-args like --build-arg BUILD_ARGUMENT_ENV=dev. Available choices are dev,test,prod." && exit 2; \
     fi
 
 # install all the dependencies and enable PHP modules
@@ -47,13 +46,13 @@ RUN mkdir -p $APP_HOME/public
 RUN chown -R www-data:www-data $APP_HOME
 
 # put php config for Laravel
-COPY ./docker/$BUILD_ARGUMENT_APP_ENV/www.conf /usr/local/etc/php-fpm.d/www.conf
-COPY ./docker/$BUILD_ARGUMENT_APP_ENV/php.ini /usr/local/etc/php/php.ini
+COPY ./docker/$BUILD_ARGUMENT_ENV/www.conf /usr/local/etc/php-fpm.d/www.conf
+COPY ./docker/$BUILD_ARGUMENT_ENV/php.ini /usr/local/etc/php/php.ini
 
 # install Xdebug in case development environment
 COPY ./docker/other/do_we_need_xdebug.sh /tmp/
-COPY ./docker/development/xdebug.ini /tmp/
-RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh $BUILD_ARGUMENT_APP_ENV
+COPY ./docker/dev/xdebug.ini /tmp/
+RUN chmod u+x /tmp/do_we_need_xdebug.sh && /tmp/do_we_need_xdebug.sh
 
 # install composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
@@ -74,10 +73,10 @@ USER www-data
 
 # copy source files and config file
 COPY --chown=www-data:www-data . $APP_HOME/
-COPY --chown=www-data:www-data $ENV_FILE $APP_HOME/.env
+COPY --chown=www-data:www-data .env.$ENV $APP_HOME/.env
 
 # install all PHP dependencies
-RUN if [ "$BUILD_ARGUMENT_APP_ENV" = "development" ]; then composer install --no-interaction --no-progress; \
+RUN if [ "$BUILD_ARGUMENT_ENV" = "dev" ] || [ "$BUILD_ARGUMENT_ENV" = "test" ]; then composer install --no-interaction --no-progress; \
     else composer install --no-interaction --no-progress --no-dev; \
     fi
 

Diff for: Makefile

@@ -1,35 +1,31 @@
-ENV=local
 dir=${CURDIR}
 project=-p laravel
 service=laravel:latest
 
 start:
 	@docker-compose -f docker-compose.yml $(project) up -d
 
-start-ci:
-	@docker-compose -f docker-compose-ci.yml $(project) up -d
+start-test:
+	@docker-compose -f docker-compose-test-ci.yml $(project) up -d
 
 start-prod:
 	@docker-compose -f docker-compose-prod.yml $(project) up -d
 
 stop:
 	@docker-compose -f docker-compose.yml $(project) down
 
-stop-ci:
-	@docker-compose -f docker-compose-ci.yml $(project) down
+stop-test:
+	@docker-compose -f docker-compose-test-ci.yml $(project) down
 
 stop-prod:
 	@docker-compose -f docker-compose-prod.yml $(project) down
 
 restart: stop start
-restart-ci: stop-ci start-ci
+restart-test: stop-test start-test
 restart-prod: stop-prod start-prod
 
-env-local:
-	cp ./.env.local ./.env
-
-env-prod:
-	cp ./.env.prod ./.env
+env-test-ci:
+	@make exec cmd="cp ./.env.test-ci ./.env"
 
 ssh:
 	@docker-compose $(project) exec laravel bash
@@ -41,11 +37,10 @@ exec:
 	@docker-compose $(project) exec laravel $$cmd
 
 clean:
-	rm -rf $(dir)/reports
+	rm -rf $(dir)/reports/*
 
 prepare:
-	mkdir $(dir)/reports
-	mkdir $(dir)/reports/coverage
+	mkdir -p $(dir)/reports/coverage
 
 wait-for-db:
 	@make exec cmd="php artisan db:wait"
@@ -65,11 +60,14 @@ info:
 
 drop-migrate:
 	@make exec cmd="php artisan migrate:fresh"
-	@make exec cmd="php artisan migrate:fresh --env=testing"
+	@make exec cmd="php artisan migrate:fresh --env=test"
+
+migrate-prod:
+	@make exec cmd="php artisan migrate --force"
 
 migrate:
 	@make exec cmd="php artisan migrate --force"
-	@make exec cmd="php artisan migrate --force --env=testing"
+	@make exec cmd="php artisan migrate --force --env=test"
 
 seed:
 	@make exec cmd="php artisan db:seed --force"

Diff for: app/Console/Commands/DbWaitDatabase.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace App\Console\Commands;
 
 use DB;
@@ -7,6 +9,11 @@
 
 class DbWaitDatabase extends Command
 {
+    /**
+     * Wait sleep time for db connection in seconds
+     *
+     * @var int
+     */
     const WAIT_SLEEP_TIME = 2;
 
     /**
@@ -30,18 +37,26 @@ class DbWaitDatabase extends Command
      *
      * @return integer
      */
-    public function handle(DB $db)
+    public function handle(DB $db): int
     {
         for ($i = 0; $i < 60; $i += self::WAIT_SLEEP_TIME) {
+
             try {
                 $db::select('SHOW TABLES');
+                $this->info('Connection to the database is ok!');
+
                 return 0;
             } catch (QueryException $e) {
+                $this->comment('Trying to connect to the database seconds:' . $i);
                 sleep(self::WAIT_SLEEP_TIME);
+
                 continue;
             }
+
         }
 
+        $this->error('Can not connect to the database');
+
         return 1;
     }
 }