Update testing process

wintercms · Jul 18, 2022 · 5cda479 · 5cda479
1 parent 1bf4af0
commit 5cda479
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,11 +9,19 @@ on:
 jobs:
   phpUnitTests:
     runs-on: ubuntu-latest
-    name: Unit Tests / PHP ${{ matrix.phpVersions }}
+    name: Unit Tests / PHP ${{ matrix.phpVersion }} / Winter ${{ matrix.winterRelease }}
     strategy:
       max-parallel: 6
       matrix:
-        phpVersions: ['7.2', '7.3', '7.4', '8.0']
+        phpVersion: ['8.0', '8.1']
+        winterRelease: ['develop']
+        include:
+          - phpVersion: '7.2'
+            winterRelease: 'v1.1.9'
+          - phpVersion: '7.3'
+            winterRelease: 'v1.1.9'
+          - phpVersion: '7.4'
+            winterRelease: 'v1.1.9'
       fail-fast: false
     env:
       phpExtensions: mbstring, intl, gd, xml, sqlite
@@ -29,7 +37,7 @@ jobs:
         id: extcache
         uses: shivammathur/cache-extensions@v1
         with:
-          php-version: ${{ matrix.phpVersions }}
+          php-version: ${{ matrix.phpVersion }}
           extensions: ${{ env.phpExtensions }}
           key: ${{ env.cacheKey }}
 
@@ -43,19 +51,19 @@ jobs:
       - name: Install PHP and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.phpVersions }}
+          php-version: ${{ matrix.phpVersion }}
           extensions: ${{ env.phpExtensions }}
           tools: composer:v2
           coverage: none
 
       - name: Install Winter CMS
         run: |
-          wget https://github.com/wintercms/winter/archive/${{ env.winterCmsRelease }}.zip
-          unzip ${{ env.winterCmsRelease }}.zip
-          rm ${{ env.winterCmsRelease }}.zip
+          wget https://github.com/wintercms/winter/archive/${{ matrix.winterRelease }}.zip
+          unzip ${{ matrix.winterRelease }}.zip
+          rm ${{ matrix.winterRelease }}.zip
           shopt -s dotglob
-          mv winter-${{ env.winterCmsRelease }}/* ./
-          rmdir winter-${{ env.winterCmsRelease }}
+          mv winter-${{ matrix.winterRelease }}/* ./
+          rmdir winter-${{ matrix.winterRelease }}
           shopt -u dotglob
           cp config/cms.php config/testing/cms.php
           mkdir -p plugins/winter
@@ -79,6 +87,4 @@ jobs:
         run: ./vendor/bin/parallel-lint plugins/winter/user
 
       - name: Run unit tests
-        run: |
-          cd plugins/winter/user
-          ../../../vendor/bin/phpunit
+        run: php artisan winter:test -p Winter.User
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 composer.lock
-vendor
+vendor
+.DS_Store
diff --git a/phpunit.xml b/phpunit.xml
@@ -2,7 +2,6 @@
 <phpunit 
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="../../../tests/bootstrap.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
@@ -15,11 +14,6 @@
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-    </php>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./classes</directory>