Merge pull request #57 from Progi1984/ppv2

Removed Functional Test `functional:productV2`
PrestaShop · Oct 19, 2023 · ea28202 · ea28202
2 parents e250087 + 3102260
commit ea28202
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -236,5 +236,7 @@ jobs:
             TEST_COMMAND: 'functional:FO:04-07'
           - BASE_BRANCH: develop
             TEST_COMMAND: 'functional:FO:08-12'
+          - BASE_BRANCH: develop
+            TEST_COMMAND: 'functional:productV2'
           - BASE_BRANCH: develop
             TEST_COMMAND: 'sanity:productV2'
diff --git a/.github/workflows/pr_test_one.yml b/.github/workflows/pr_test_one.yml
@@ -177,6 +177,8 @@ jobs:
             TEST_COMMAND: 'functional:FO:04-07'
           - BASE_BRANCH: develop
             TEST_COMMAND: 'functional:FO:08-12'
+          - BASE_BRANCH: develop
+            TEST_COMMAND: 'functional:productV2'
           - BASE_BRANCH: develop
             TEST_COMMAND: 'sanity:productV2'
 
@@ -190,7 +192,7 @@ jobs:
       PS_DIR: 'my_prestashop'
       ## Install PrestaShop & UI Tests
       VERSION: ${{ github.event.inputs.php_version }}-apache
-      PS_INSTALL_AUTO: 1
+      PS_INSTALL_AUTO: ${{ ((matrix.TEST_COMMAND == 'sanity')) && '0' || '1' }}
       DB_PASSWD: prestashop
       DB_NAME: prestashop
       DB_SERVER: mysql
@@ -288,10 +290,11 @@ jobs:
           DISABLE_MAKE: 0
           URL_FO: ${{ ((github.event.inputs.base_branch == '8.0.x') || (github.event.inputs.base_branch == '1.7.8.x')) && 'http://localhost:8001/' || 'https://localhost:8002/' }}
           VERSION: ${{ (github.event.inputs.base_branch == '1.7.8.x') && github.event.inputs.php_version || env.VERSION }}
+          URL_PING: ${{ matrix.TEST_COMMAND == 'sanity' && 'install-dev/' || 'en/' }}
         run: |
           USER_ID=$(id -u) GROUP_ID=$(id -g) \
           docker-compose -f docker-compose.yml up -d --build
-          bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} ${{ env.URL_FO }}en/)" != "200" ]]; do sleep 5; done'
+          bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} ${{ env.URL_FO }}${{ env.URL_PING }})" != "200" ]]; do sleep 5; done'
 
       # UI Tests : Setup, Install & Execute
       - name: Setup Node