Fix CE codeception fixtures

Signed-off-by: Anton Fedurtsya <[email protected]>
OXID-eSales · Nov 10, 2023 · 06c820d · 06c820d
1 parent c06ee76
commit 06c820d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -114,19 +114,19 @@ jobs:
 
       - name: Install module
         run: |
-          docker-compose exec -T \
+          docker compose exec -T \
             php composer config repositories.${{ env.PACKAGE_NAME }} \
             --json '{"type":"path", "url":"./test-module", "options": {"symlink": true}}'
-          docker-compose exec -T \
+          docker compose exec -T \
             php composer require ${{ env.PACKAGE_NAME }}:* --no-interaction --no-update
 
       - name: Install dependencies and reset shop
         run: |
-          docker-compose exec -T php composer update --no-interaction
-          docker-compose exec -T php bin/oe-console oe:database:reset \
+          docker compose exec -T php composer update --no-interaction
+          docker compose exec -T php bin/oe-console oe:database:reset \
             --db-host=mysql --db-port=3306 --db-name=example --db-user=root --db-password=root --force
-          docker-compose exec -T php bin/oe-console oe:module:activate oe_graphql_base
-          docker-compose exec -T php bin/oe-console oe:module:activate oe_graphql_configuration_access
+          docker compose exec -T php bin/oe-console oe:module:activate oe_graphql_base
+          docker compose exec -T php bin/oe-console oe:module:activate oe_graphql_configuration_access
 
       - name: Stop containers
         run: |
@@ -136,15 +136,15 @@ jobs:
       - name: Show docker log
         if: always()
         run: |
-          docker-compose logs
+          docker compose logs
 
       - name: Upload configuration artifacts
         if: always()
         uses: actions/upload-artifact@v3
         with:
           name: Configs-${{ inputs.php }}-${{ inputs.mysql }}-${{ inputs.template_engine }}
           path: |
-            docker-compose.yml
+            docker compose.yml
             source/composer.json
             source/composer.lock
             source/source/config.inc.php
@@ -171,29 +171,29 @@ jobs:
 
       - name: Install module dependencies
         run: |
-          docker-compose exec -T \
+          docker compose exec -T \
             --workdir=/var/www/test-module \
             php composer install
 
       - name: Run phpstan
         id: phpstan
         if: always()
         run: |
-          docker-compose exec -Tw /var/www/test-module \
+          docker compose exec -Tw /var/www/test-module \
             php bash -c "composer phpstan-report; composer phpstan"
 
       - name: Run phpmd
         id: phpmd
         if: always()
         continue-on-error: true
         run: |
-          docker-compose exec -Tw /var/www/test-module \
+          docker compose exec -Tw /var/www/test-module \
             php bash -c "composer phpmd-report; composer phpmd"
 
       - name: Run phpcs
         if: always()
         run: |
-          docker-compose exec -T \
+          docker compose exec -T \
             --workdir=/var/www/test-module \
             php composer phpcs
 
@@ -240,7 +240,7 @@ jobs:
 
       - name: Run tests
         run: |
-          docker-compose exec -T \
+          docker compose exec -T \
             -e XDEBUG_MODE=coverage \
             php php vendor/bin/phpunit \
               -c /var/www/vendor/${{ env.PACKAGE_NAME }}/tests/phpunit.xml \
@@ -296,14 +296,14 @@ jobs:
 
       - name: Install twig template engine and twig theme
         run: |
-          docker-compose exec -T php composer require oxid-esales/twig-component:dev-b-7.0.x --no-update
-          docker-compose exec -T php composer require oxid-esales/twig-admin-theme:dev-b-7.0.x --no-update
-          docker-compose exec -T php composer require oxid-esales/apex-theme:dev-b-7.0.x --no-update
-          docker-compose exec -T php composer update --no-interaction
+          docker compose exec -T php composer require oxid-esales/twig-component:dev-b-7.0.x --no-update
+          docker compose exec -T php composer require oxid-esales/twig-admin-theme:dev-b-7.0.x --no-update
+          docker compose exec -T php composer require oxid-esales/apex-theme:dev-b-7.0.x --no-update
+          docker compose exec -T php composer update --no-interaction
 
       - name: Run tests
         run: |
-          docker-compose exec -Tw /var/www/test-module \
+          docker compose exec -Tw /var/www/test-module \
             php composer codeception -- -g ${{ inputs.module_codecept_test_group }}
 
       - name: Upload log artifact
@@ -312,7 +312,7 @@ jobs:
         with:
           name: ModuleCodeceptionTestsLog-${{ inputs.php }}-${{ inputs.mysql }}-${{ inputs.template_engine }}
           path: |
-            docker-compose.yml
+            docker compose.yml
             source/composer.json
             source/composer.lock
             source/source/config.inc.php

diff --git a/tests/Fixtures/testdemodata_ce.sql b/tests/Fixtures/testdemodata_ce.sql
@@ -1,12 +1,12 @@
 SET @@session.sql_mode = '';
 
-REPLACE INTO `oxuser` (`OXID`, `OXACTIVE`, `OXRIGHTS`, `OXSHOPID`, `OXUSERNAME`, `OXPASSWORD`, `OXPASSSALT`, `OXCUSTNR`, `OXUSTID`, `OXUSTIDSTATUS`, `OXCOMPANY`, `OXFNAME`, `OXLNAME`, `OXSTREET`, `OXSTREETNR`, `OXADDINFO`, `OXCITY`, `OXCOUNTRYID`, `OXSTATEID`, `OXZIP`, `OXFON`, `OXFAX`, `OXSAL`, `OXBONI`, `OXCREATE`, `OXREGISTER`, `OXPRIVFON`, `OXMOBFON`, `OXBIRTHDATE`, `OXURL`, `OXWRONGLOGINS`, `OXUPDATEKEY`, `OXUPDATEEXP`, `OXPOINTS`, `OXTIMESTAMP`) VALUES
-('4d7a345d24356293cc79b426e6d2c2a6',	1,	'malladmin',	1,	'[email protected]',	'$2y$10$2JhjaEzBWE1/CbPtgW8CDuXw0pRllIhd50PjFNWsSmGXbh7lrOty6',	'',	1,	'',	0,	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	0,	'0000-00-00 00:00:00',	'0000-00-00 00:00:00',	'',	'',	'0000-00-00',	'',	0,	'',	0,	0,	'2023-09-13 14:33:18'),
-('01ba0f60-bd8e-4c01-bcf6-aa457bcb',	1,	'user',	1,	'[email protected]',	'$2y$10$xHmv1FlZeE655s8FlZK47ekriYyj81dpq0lrYxVIFLGH2YzovWTXq',	'',	2,	'',	0,	'Omni Realty',	'Janvier',	'Jaimes',	'Wilkinson Street',	'2215',	'',	'Springfield',	'8f241f11096877ac0.98748826',	'',	'37172',	'615-384-2150',	'',	'MR',	1000,	'2023-03-15 08:53:42',	'2023-03-15 08:53:42',	'',	'',	'1998-06-17',	'',	0,	'',	0,	0,	'2023-03-15 08:55:52');
+REPLACE INTO `oxuser` (`OXID`, `OXACTIVE`, `OXRIGHTS`, `OXSHOPID`, `OXUSERNAME`, `OXPASSWORD`, `OXPASSSALT`, `OXCUSTNR`, `OXUSTID`, `OXCOMPANY`, `OXFNAME`, `OXLNAME`, `OXSTREET`, `OXSTREETNR`, `OXADDINFO`, `OXCITY`, `OXCOUNTRYID`, `OXSTATEID`, `OXZIP`, `OXFON`, `OXFAX`, `OXSAL`, `OXBONI`, `OXCREATE`, `OXREGISTER`, `OXPRIVFON`, `OXMOBFON`, `OXBIRTHDATE`, `OXURL`, `OXUPDATEKEY`, `OXUPDATEEXP`, `OXPOINTS`) VALUES
+('4d7a345d24356293cc79b426e6d2c2a6',	1,	'malladmin',	1,	'[email protected]',	'$2y$10$2JhjaEzBWE1/CbPtgW8CDuXw0pRllIhd50PjFNWsSmGXbh7lrOty6',	'',	1,	'','',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	'',	0,	'2023-03-15 08:53:42',	'2023-03-15 08:53:42',	'',	'',	'1998-06-17',	'',	'',	0,	0),
+('01ba0f60-bd8e-4c01-bcf6-aa457bcb',	1,	'user',	1,	'[email protected]',	'$2y$10$xHmv1FlZeE655s8FlZK47ekriYyj81dpq0lrYxVIFLGH2YzovWTXq',	'',	2,	'','Omni Realty',	'Janvier',	'Jaimes',	'Wilkinson Street',	'2215',	'',	'Springfield',	'8f241f11096877ac0.98748826',	'',	'37172',	'615-384-2150',	'',	'MR',	1000,	'2023-03-15 08:53:42',	'2023-03-15 08:53:42',	'',	'',	'1998-06-17',	'',	'',	0,	0);
 
-REPLACE INTO `oxgroups` (`OXID`, `OXRRID`, `OXACTIVE`, `OXTITLE`, `OXTITLE_1`, `OXTITLE_2`, `OXTITLE_3`, `OXTIMESTAMP`) VALUES
-('oxidadmin',	9,	1,	'Shop-Admin',	'Store Administrator',	'',	'',	'2023-04-26 10:13:29'),
-('oxidcustomer',	14,	1,	'Kunde',	'Customer',	'',	'',	'2023-04-26 10:13:29');
+REPLACE INTO `oxgroups` (`OXID`, `OXACTIVE`, `OXTITLE`, `OXTITLE_1`, `OXTITLE_2`, `OXTITLE_3`, `OXTIMESTAMP`) VALUES
+('oxidadmin',	9,	'Shop-Admin',	'Store Administrator',	'',	'',	'2023-04-26 10:13:29'),
+('oxidcustomer',	14,	'Kunde',	'Customer',	'',	'',	'2023-04-26 10:13:29');
 
 REPLACE INTO `oxobject2group` (`OXID`, `OXSHOPID`, `OXOBJECTID`, `OXGROUPSID`, `OXTIMESTAMP`) VALUES
 ('d687174433046c8b3b9bf114c3aa0830',	1,	'4d7a345d24356293cc79b426e6d2c2a6',	'oxidadmin',	'2023-09-27 14:40:01'),