fix: all test suites (#148)

* fix: test suite * fix: migrating phpunit config * fix: I want to see how much is failing * fix: just trying something * fix: widen the versions tested against * fix: not ready for 8.4 * fix: it doesn't fail in Windows 🤔 * fix: carbon dependency * fix: make it verbose * fix: make it verbose * fix: I don't think it will change anything, but who knows * fix: debug what's happening under the hood * fix: why the hello yauzl is failing on prefer-lowest 😡 * fix: clean zip maybe ? * Fix styling * fix: clean zip maybe ? * fix: fixed? * fix: phpstan (level 4) * fix: cleaning * feat: composer qa * fix: renamed test --------- Co-authored-by: SRWieZ <[email protected]>
NativePHP · Dec 26, 2024 · 8e4f571 · 8e4f571
1 parent d5e7c28
commit 8e4f571
Show file tree

Hide file tree

Showing 19 changed files with 465 additions and 374 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - '**.php'
-      - 'phpstan.neon.dist'
+      - '../../phpstan.neon'
 
 jobs:
   phpstan:

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,16 +10,26 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.1]
-        laravel: [10.*]
+        php: [8.2, 8.1, 8.3]
+        laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: ^8.18
             carbon: ^2.67
+            laravel-package-tools: ^1.16
+            collision: 7.*
+          - laravel: 11.*
+            testbench: 9.*
+            carbon: "^2.67|^3.0"
+            laravel-package-tools: ^1.16
+            collision: ^8.1.1
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -41,7 +51,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" "spatie/laravel-package-tools:${{ matrix.laravel-package-tools }}" "nunomaduro/collision:${{ matrix.collision }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --no-interaction
 
       - name: List Installed Dependencies

diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@ composer.lock
 coverage
 docs
 phpunit.xml
-phpstan.neon
 vendor
 node_modules
 resources/js/*.log
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "illuminate/contracts": "^10.0|^11.0",
         "laravel/prompts": "^0.1.1|^0.2|^0.3",
         "nativephp/laravel": "*",
-        "nativephp/php-bin": "^0.5",
+        "nativephp/php-bin": "^0.5.1",
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
@@ -62,6 +62,11 @@
         }
     },
     "scripts": {
+        "qa": [
+            "@composer format",
+            "@composer analyse",
+            "@composer test"
+        ],
         "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi",
         "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon.dist → phpstan.neon b/phpstan.neon.dist → phpstan.neon
@@ -1,6 +1,3 @@
-includes:
-    - phpstan-baseline.neon
-
 parameters:
     level: 4
     paths:
@@ -10,5 +7,4 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
-    backupGlobals="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    executionOrder="random"
-    failOnWarning="true"
-    failOnRisky="true"
-    failOnEmptyTestSuite="true"
-    beStrictAboutOutputDuringTests="true"
-    cacheDirectory=".phpunit.cache"
-    backupStaticProperties="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         backupGlobals="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         executionOrder="random"
+         failOnWarning="true"
+         failOnRisky="true"
+         failOnEmptyTestSuite="true"
+         beStrictAboutOutputDuringTests="true"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
 >
     <testsuites>
         <testsuite name="Native Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
         <report>
             <html outputDirectory="build/coverage"/>
             <text outputFile="build/coverage.txt"/>
@@ -33,4 +29,9 @@
     <logging>
         <junit outputFile="build/report.junit.xml"/>
     </logging>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/resources/js/electron-plugin/jest.config.js b/resources/js/electron-plugin/jest.config.js
@@ -3,6 +3,6 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   moduleNameMapper: {
-    "electron": "<rootDir>/mocks/electron.ts",
+    "^electron$": "<rootDir>/mocks/electron.ts",
   }
 };
diff --git a/resources/js/electron-plugin/mocks/electron.ts b/resources/js/electron-plugin/mocks/electron.ts
@@ -1 +1,12 @@
-export default {}
+module.exports = {
+    app: {
+        getPath: jest.fn().mockReturnValue('path'),
+        isPackaged: jest.fn().mockResolvedValue(function () {
+            console.log('isPackaged');
+            return false;
+        })
+    },
+    powerMonitor: {
+        addListener: jest.fn()
+    }
+}
diff --git a/resources/js/electron-plugin/tests/endpoints/clipboard.test.ts b/resources/js/electron-plugin/tests/endpoints/clipboard.test.ts
@@ -1,5 +1,5 @@
 import startAPIServer, { APIProcess } from "../../src/server/api";
-import axios, { AxiosError } from "axios";
+import axios from "axios";
 import electron from "electron";
 
 let apiServer: APIProcess;
@@ -10,18 +10,20 @@ const mockReadImage = {
 };
 
 jest.mock('electron', () => ({
-  clipboard: {
-    readText: jest.fn(() => 'clipboard text'),
-    readHTML: jest.fn(() => 'clipboard html'),
-    readImage: jest.fn(() => mockReadImage),
-    writeText: jest.fn(),
-    writeHTML: jest.fn(),
-    writeImage: jest.fn(),
-    clear: jest.fn(),
-  },
-  nativeImage: {
-    createFromDataURL: jest.fn(() => 'native image'),
-  }
+    ...jest.requireActual('electron'),
+
+    clipboard: {
+        readText: jest.fn(() => 'clipboard text'),
+        readHTML: jest.fn(() => 'clipboard html'),
+        readImage: jest.fn(() => mockReadImage),
+        writeText: jest.fn(),
+        writeHTML: jest.fn(),
+        writeImage: jest.fn(),
+        clear: jest.fn(),
+    },
+    nativeImage: {
+        createFromDataURL: jest.fn(() => 'native image'),
+    }
 }));
 
 describe('Clipboard test', () => {
@@ -65,7 +67,7 @@ describe('Clipboard test', () => {
 
   it('returns an error when trying to write an invalid data URL as image', async () => {
     try {
-      const response = await axios.post('/clipboard/image', {
+       await axios.post('/clipboard/image', {
         image: 'new image data URL',
       });
     } catch (error) {
@@ -76,7 +78,7 @@ describe('Clipboard test', () => {
   it('can write new images to clipboard', async () => {
     const exampleImage = 'example image url';
 
-    const response = await axios.post('/clipboard/image', {
+    await axios.post('/clipboard/image', {
       image: exampleImage,
     });
 

diff --git a/resources/js/electron-plugin/tests/endpoints/dialog.test.ts b/resources/js/electron-plugin/tests/endpoints/dialog.test.ts
@@ -1,21 +1,18 @@
 import startAPIServer, { APIProcess } from "../../src/server/api";
-import axios, { AxiosError } from "axios";
+import axios from "axios";
 import electron from "electron";
 
 let apiServer: APIProcess;
 
-const mockReadImage = {
-  isEmpty: jest.fn(() => true),
-  toDataURL: jest.fn(() => 'clipboard image'),
-};
-
 jest.mock('electron', () => ({
-  dialog: {
-    showOpenDialogSync: jest.fn(() => ['open dialog result']),
-    showSaveDialogSync: jest.fn(() => ['save dialog result']),
-    showMessageBoxSync: jest.fn(() => 1),
-    showErrorBox: jest.fn(),
-  }
+    ...jest.requireActual('electron'),
+
+    dialog: {
+        showOpenDialogSync: jest.fn(() => ['open dialog result']),
+        showSaveDialogSync: jest.fn(() => ['save dialog result']),
+        showMessageBoxSync: jest.fn(() => 1),
+        showErrorBox: jest.fn(),
+    }
 }));
 
 describe('Dialog test', () => {