From 98894039bff77d1249809c6cb7c396c5ce113a39 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 4 Feb 2021 19:54:15 +1100
Subject: [PATCH] Fixes for tests

---
 .env.ci                       |  4 ++--
 .github/workflows/phpunit.yml | 32 +++++++++++++++-----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.env.ci b/.env.ci
index 2578a5c57993..bff7690eba6c 100644
--- a/.env.ci
+++ b/.env.ci
@@ -7,11 +7,11 @@ MULTI_DB_ENABLED=false
 # database
 DB_CONNECTION=db-ninja-01
 DB_DATABASE1=ninja
-DB_USERNAME1=ninja
+DB_USERNAME1=root
 DB_PASSWORD1=ninja
 DB_HOST1=127.0.0.1
 DB_DATABASE=ninja
-DB_USERNAME=ninja
+DB_USERNAME=room
 DB_PASSWORD=ninja
 DB_HOST=127.0.0.1
 NINJA_ENVIRONMENT=hosted
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 702ea130e7cd..0ca585f477d8 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,11 +1,11 @@
-on:
+on: 
   push:
     branches:
       - v5-develop
   pull_request:
-    branches:
+    branches: 
       - v5-develop
-
+      
 name: phpunit
 jobs:
   run:
@@ -13,18 +13,18 @@ jobs:
     strategy:
       matrix:
         operating-system: ['ubuntu-18.04', 'ubuntu-20.04']
-        php-versions: ['7.4']
+        php-versions: ['7.3', '7.4']
         phpunit-versions: ['latest']
 
     env:
       DB_DATABASE1: ninja
-      DB_USERNAME1: ninja
+      DB_USERNAME1: root
       DB_PASSWORD1: ninja
       DB_HOST1: '127.0.0.1'
       DB_DATABASE: ninja
-      DB_USERNAME: ninja
+      DB_USERNAME: root
       DB_PASSWORD: ninja
-      DB_HOST: '127.0.0.1'
+      DB_HOST: '127.0.0.1'  
       BROADCAST_DRIVER: log
       CACHE_DRIVER: file
       QUEUE_CONNECTION: sync
@@ -47,12 +47,12 @@ jobs:
           MYSQL_DATABASE: ninja
           MYSQL_ROOT_PASSWORD: ninja
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
+        
     steps:
     - name: Start mysql service
       run: |
         sudo /etc/init.d/mysql start
-
+    
     - name: Verify MariaDB connection
       env:
         DB_PORT: ${{ job.services.mariadb.ports[3306] }}
@@ -62,13 +62,13 @@ jobs:
         while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do
           sleep 1
         done
-
+    
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: mysql, mysqlnd, sqlite3, bcmath, gmp, gd, curl, zip, openssl, mbstring, xml
-
+        
     - uses: actions/checkout@v1
       with:
         ref: v5-develop
@@ -77,33 +77,31 @@ jobs:
     - name: Copy .env
       run: |
         cp .env.ci .env
-
+        
     - name: Install composer dependencies
       run: |
         composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
         composer install
-
     - name: Prepare Laravel Application
       run: |
         php artisan key:generate
         php artisan optimize
         php artisan cache:clear
         php artisan config:cache
-
+        
     - name: Create DB and schemas
       run: |
         mkdir -p database
         touch database/database.sqlite
-
+        
     - name: Migrate Database
       run: |
         php artisan migrate:fresh --seed --force && php artisan db:seed --force
-
     - name: Prepare JS/CSS assets
       run: |
         npm i
         npm run production
-
+        
     - name: Run Testsuite
       run: |
         cat .env