Merge pull request #276 from fleetbase/dev-v0.6.58

v0.6.58 Added test coverage; bumped version; removed organizations listing api endpoint

Author: roncodes

.github/workflows/server.yml

@@ -40,5 +40,15 @@ jobs:
     - name: Run Lint
       run: composer lint
 
-    # - name: Run Tests -- Will add tests back after phppest issue https://github.com/pestphp/pest/issues/920 is fixed
-    #   run: composer test:unit
+    - name: Run Tests
+      run: composer test:unit
+
+    - name: Generate Coverage Baseline
+      run: XDEBUG_MODE=coverage composer coverage:baseline
+
+    - name: Upload Coverage Baseline
+      uses: actions/upload-artifact@v4
+      with:
+        name: fleetops-coverage-clover
+        path: coverage/clover.xml
+        if-no-files-found: error

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.57",
+    "version": "0.6.58",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -86,10 +86,17 @@
         }
     },
     "scripts": {
+        "coverage:baseline": [
+            "@test:coverage:clover",
+            "@coverage:summary"
+        ],
+        "coverage:summary": "php scripts/coverage-summary.php coverage/clover.xml",
         "lint": "php-cs-fixer fix -v",
         "test:lint": "php-cs-fixer fix -v --dry-run",
+        "test:coverage": "php scripts/coverage-runner.php --coverage --coverage-text --colors=always",
+        "test:coverage:clover": "mkdir -p coverage && php scripts/coverage-runner.php --coverage-clover=coverage/clover.xml --colors=always",
         "test:types": "phpstan analyse --ansi --memory-limit=4G",
-        "test:unit": "pest --colors=always",
+        "test:unit": "php scripts/pest-file-runner.php --colors=always",
         "test": [
             "@test:lint",
             "@test:types",

extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.57",
+    "version": "0.6.58",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.57",
+    "version": "0.6.58",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -45,7 +45,7 @@
     "dependencies": {
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.3.24",
-        "@fleetbase/ember-ui": "^0.3.39",
+        "@fleetbase/ember-ui": "^0.3.41",
         "@fleetbase/fleetops-data": "^0.1.40",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",

phpunit.xml.dist

@@ -8,9 +8,9 @@
             <directory suffix=".php">./server/tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <source>
+        <include>
             <directory suffix=".php">./server/src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </source>
 </phpunit>

pnpm-lock.yaml

@@ -5,4 +5,5 @@ allowBuilds:
   '@fortawesome/free-solid-svg-icons': false
   core-js: false
   fsevents: false
-minimumReleaseAge: 0
+minimumReleaseAge: 0
+packages: []

pnpm-workspace.yaml

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+$args = array_slice($argv, 1);
+
+if ($args === []) {
+    fwrite(STDERR, "Usage: php scripts/coverage-runner.php <pest coverage arguments>\n");
+    exit(1);
+}
+
+$pestRunner = getcwd() . '/scripts/pest-runner.php';
+if (!is_file($pestRunner)) {
+    fwrite(STDERR, "Unable to find Pest runner at scripts/pest-runner.php.\n");
+    exit(1);
+}
+
+$hasCoverageExtension = extension_loaded('xdebug') || extension_loaded('pcov');
+
+if (!$hasCoverageExtension) {
+    fwrite(STDERR, "No PHP coverage driver is available.\n\n");
+    fwrite(STDERR, "Install or enable one of:\n");
+    fwrite(STDERR, "  - Xdebug with XDEBUG_MODE=coverage\n");
+    fwrite(STDERR, "  - PCOV\n");
+    fwrite(STDERR, "\n");
+    fwrite(STDERR, 'Current PHP binary: ' . PHP_BINARY . "\n");
+    exit(1);
+}
+
+putenv('XDEBUG_MODE=coverage');
+$_ENV['XDEBUG_MODE']    = 'coverage';
+$_SERVER['XDEBUG_MODE'] = 'coverage';
+
+$hasTestTarget = false;
+foreach ($args as $arg) {
+    if ($arg !== '' && $arg[0] !== '-') {
+        $hasTestTarget = true;
+        break;
+    }
+}
+
+if (!$hasTestTarget && is_dir(getcwd() . '/server/tests')) {
+    $args[] = 'server/tests';
+}
+
+$command        = array_merge([PHP_BINARY, $pestRunner], $args);
+$escapedCommand = implode(' ', array_map('escapeshellarg', $command));
+
+passthru($escapedCommand, $exitCode);
+
+exit($exitCode);