Finish user templates refacto

Author: mRoca

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
             -   name: Get the version
                 id: vars
                 run: |
-                    echo ::set-output name=BUILD_TAG::$(git describe --tags)
+                    echo ::set-output name=BUILD_TAG::$(git describe --tags --always)
                     echo ::set-output name=CI_COMMIT_REF_SLUG::${GITHUB_REF#refs/*/}
 
             -   name: Pull existing Docker image

.github/workflows/ci.yml

@@ -78,7 +78,7 @@ jobs:
               if: always()
 
             - name: Install composer dependencies
-              run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+              run: composer install --no-progress --prefer-dist --optimize-autoloader
 
             - name: Cache node_modules
               uses: actions/cache@v1

Makefile

@@ -35,14 +35,13 @@ build-prod:
 	docker build -t resop:latest -f docker/php-flex/Dockerfile .
 
 start-db:
-	$(DOCKER_COMPOSE_UP) traefik postgres adminer
+	$(DOCKER_COMPOSE_UP) traefik postgres adminer mailcatcher
 	docker-compose run --rm wait -c postgres:5432
 
 start-php:
 	$(DOCKER_COMPOSE_UP_RECREATE) traefik nginx fpm
 	docker-compose run --rm wait -c fpm:9000,nginx:80
-	@echo -n "\nStack started with success:\nhttp://resop.vcap.me:7500/login => user1@resop.com : 01/01/1990"
-	@echo -n "\nhttp://resop.vcap.me:7500/organizations/login => DT75 : covid19\n"
+	@echo -n "\nStack started with success: http://resop.vcap.me:7500/\nuser102@resop.com : covid19\nadmin101@resop.com : covid19\nsuper_admin1@resop.com : covid19\n"
 
 start: init-db start-php
 
@@ -130,6 +129,7 @@ test-coverage:
 	bin/tools sh -c "COVERAGE=true vendor/bin/behat --format=progress"
 
 move-test-profiler:
+	@echo "You must set 'profiler: { collect: true }' in config/packages/test/web_profiler.yaml in order to use this command"
 	bin/tools sh -c "rm -rf var/cache/dev/profiler && mkdir -p var/cache/dev && cp -R var/cache/test/profiler var/cache/dev/profiler"
 	@echo "Done : http://resop.vcap.me:7500/_profiler/search?limit=10"
 

assets/css/login.scss

@@ -2,16 +2,6 @@
 
 $xs: 380px;
 
-@media (min-width: 360px) and (max-width: map-get($grid-breakpoints, "sm")) {
-  .form-inline {
-    .form-control {
-      display: inline-block;
-      width: auto;
-      vertical-align: middle;
-    }
-  }
-}
-
 body.login {
   .navbar-and-body {
     background-image: url(../img/login-background.jpg);

behat.yml.dist

@@ -2,7 +2,6 @@ default:
     suites:
         default:
             contexts:
-                - Alex\MailCatcher\Behat\MailCatcherContext
                 - App\Tests\Behat\CoverageContext
                 - App\Tests\Behat\DatabaseContext
                 - App\Tests\Behat\FixturesContext
@@ -11,6 +10,7 @@ default:
                 - App\Tests\Behat\SecurityContext
                 - App\Tests\Behat\TraversingContext
                 - App\Tests\Behat\UserPlanningContext
+                - App\Tests\Behat\MailsContext
                 - Behat\MinkExtension\Context\MinkContext
                 - PantherExtension\Context\PantherContext
                 - PantherExtension\Context\WaitContext

composer.json

@@ -26,7 +26,7 @@
     "symfony/form": "5.*",
     "symfony/framework-bundle": "5.*",
     "symfony/intl": "5.*",
-    "symfony/mailer": "5.0.*",
+    "symfony/mailer": "5.*",
     "symfony/monolog-bundle": "^3.5",
     "symfony/security-bundle": "5.*",
     "symfony/serializer-pack": "^1.0",
@@ -41,7 +41,7 @@
     "twig/intl-extra": "^3.0"
   },
   "require-dev": {
-    "alexandresalome/mailcatcher": "dev-master",
+    "alexandresalome/mailcatcher": "^1.3",
     "behat/behat": "^3.6",
     "dama/doctrine-test-bundle": "^6.3",
     "escapestudios/symfony2-coding-standard": "^3.11",