From 57ed97c0a108eb74bb4e8b0b7a6bc93e54492cb1 Mon Sep 17 00:00:00 2001
From: Adrien Gallou <adriengallou@gmail.com>
Date: Sun, 9 May 2021 16:50:48 +0200
Subject: [PATCH] correction lancement tests sur CI

---
 .github/workflows/ci.yml                     | 24 --------------------
 Makefile                                     |  2 +-
 tests/behat/features/Admin/AdminSite.feature |  2 ++
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70c40417e..96106c495 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,29 +81,5 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: PHP - Switch
-        run: sudo update-alternatives --set php /usr/bin/php5.6
-
-      - name: Composer - Get Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - uses: actions/cache@v1
-        id: cache-composer
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-php.5.6-${{ github.sha }}
-          restore-keys: composer-php.5.6-
-
-      - name: Composer - Create cache directory
-        run: mkdir -p /home/runner/.composer/cache
-        if: steps.cache-composer.outputs.cache-hit != 'true'
-
-      - name: CS fixer prerequisites
-        run: make configs/application/config.php
-
-      - name: Composer install
-        run: composer install --no-scripts
-
       - name: Tests - Functional
         run: make test-functional
diff --git a/Makefile b/Makefile
index 308defb0d..00cdec44f 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ test:
 	./bin/php-cs-fixer fix --dry-run -vv
 
 
-test-functional: config data
+test-functional: data config
 	CURRENT_UID=$(CURRENT_UID) docker-compose stop dbtest apachephptest
 	CURRENT_UID=$(CURRENT_UID) docker-compose up -d dbtest apachephptest
 	CURRENT_UID=$(CURRENT_UID) docker-compose run --no-deps --rm cliphp ./bin/behat
diff --git a/tests/behat/features/Admin/AdminSite.feature b/tests/behat/features/Admin/AdminSite.feature
index b84ceb62c..797df70b8 100644
--- a/tests/behat/features/Admin/AdminSite.feature
+++ b/tests/behat/features/Admin/AdminSite.feature
@@ -2,6 +2,8 @@ Feature: Administration - Partie Site
 
   @reloadDbWithTestData
   Scenario: Ajout/modification/suppression d'une rubrique
+    Given I am on the homepage
+    Then print last response
     Given I am logged in as admin and on the Administration
     And I follow "Rubriques"
     Then I should see "Liste des rubriques"