Merge branch 'creme332:main' into teststore

steamysips · May 18, 2024 · 27c39ad · 27c39ad
2 parents 985dfe2 + 95f5f76
commit 27c39ad
Show file tree

Hide file tree

Showing 30 changed files with 1,865 additions and 300 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,6 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      TEST_DB_NAME: cafe_test
       DB_USER: root # do not change
       DB_PASSWORD: root # do not change
 
@@ -34,8 +33,8 @@ jobs:
         run: |
           mysql -V
           sudo /etc/init.d/mysql start
-          mysql -e "CREATE DATABASE IF NOT EXISTS $TEST_DB_NAME;" -u$DB_USER -p$DB_PASSWORD
-          mysql -D$TEST_DB_NAME -u$DB_USER -p$DB_PASSWORD -hlocalhost -P3306 < "resources/database/dump/cafe.sql"
+          mysql -u$DB_USER -p$DB_PASSWORD -hlocalhost -P3306 < "resources/database/cafe_test_schema.sql"
+          mysql -u$DB_USER -p$DB_PASSWORD -hlocalhost -P3306 -Dcafe_test < "resources/database/cafe_test_data.sql"
           mysql -e "USE cafe_test; SHOW TABLES;" -u$DB_USER -p$DB_PASSWORD
 
       - name: Create .env file

diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
     "ext-mbstring": "*",
     "vlucas/phpdotenv": "^5.6",
     "phpmailer/phpmailer": "^6.9",
-    "opis/json-schema": "^2.3"
+    "opis/json-schema": "^2.3",
+    "nesbot/carbon": "^3.3"
   },
   "scripts": {
     "test": "phpunit tests"