Merge branch '2.6' of https://github.com/sulu/sulu into 3.0

sulu · May 16, 2024 · d0df230 · d0df230
2 parents a3126bd + 67057da
commit d0df230
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -34,10 +34,10 @@ jobs:
 
         steps:
             - name: Checkout project
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install and configure Node
-              uses: actions/setup-node@v2-beta
+              uses: actions/setup-node@v4
               with:
                   node-version: ${{ matrix.node-version }}
 
@@ -90,10 +90,10 @@ jobs:
 
         steps:
             - name: Checkout project
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install and configure Node
-              uses: actions/setup-node@v2-beta
+              uses: actions/setup-node@v4
               with:
                   node-version: '20'
 
@@ -185,7 +185,7 @@ jobs:
 
         steps:
             - name: Checkout project
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Start Database
               run: |
@@ -261,7 +261,7 @@ jobs:
 
         steps:
             - name: Checkout project
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install and configure PHP
               uses: shivammathur/setup-php@v2

diff --git a/tests/js/testSetup.config.js b/tests/js/testSetup.config.js
@@ -20,3 +20,17 @@ jest.mock('sulu-admin-bundle/services/Config', () => ({
     translations: ['en', 'de'],
     fallbackLocale: 'en',
 }));
+
+Object.defineProperty(window, 'matchMedia', { // see https://github.com/ckeditor/ckeditor5/issues/16368
+    writable: true,
+    value: jest.fn().mockImplementation((query) => ({
+        matches: false,
+        media: query,
+        onchange: null,
+        addListener: jest.fn(), // deprecated
+        removeListener: jest.fn(), // deprecated
+        addEventListener: jest.fn(),
+        removeEventListener: jest.fn(),
+        dispatchEvent: jest.fn(),
+    })),
+});