Cypress: added missing mocks

Also fixed some unit tests that needed to be updated

Author: warpdesign

.github/workflows/github-actions-tests.yml

@@ -5,7 +5,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
         os: [ubuntu-latest]
         experimental: [false]
         # include:
@@ -26,9 +26,15 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
+      - name:  Install
+        run:   |
+                if [ "$RUNNER_OS" == "Linux" ]; then
+                      sudo apt-get install -y libsdl-pango-dev libgif-dev
+                fi
+        shell: bash
       - name: Install node_modules
         working-directory: ./
-        run: npm ci
+        run: npm ci && npm rebuild canvas --update-binary
       - name: Install e2e node_modules
         run: npm ci
       - name: Build E2E version

e2e/cypress/mocks/electron.js

@@ -42,5 +42,10 @@ module.exports = {
         writeText: function(text) {
             //
         }
+    },
+    webFrame: {
+        setVisualZoomLevelLimits: function (minimumLevel, maximumLevel) {
+            //
+        }
     }
 };

jest.config.js

@@ -6,7 +6,6 @@ module.exports = {
     preset: 'ts-jest',
     setupFilesAfterEnv: [
       "<rootDir>/setupTests.ts",
-      'jest-canvas-mock'
     ],
     moduleDirectories: [
       'node_modules',

package-lock.json

@@ -97,7 +97,6 @@
         "husky": "^3.0.9",
         "identity-obj-proxy": "^3.0.0",
         "jest": "^29.3.1",
-        "jest-canvas-mock": "^2.4.0",
         "jest-cli": "^29.3.1",
         "jest-environment-jsdom": "^29.3.1",
         "lint-staged": "^10.4.2",

package.json

@@ -2,3 +2,21 @@ import '@testing-library/jest-dom'
 import '@testing-library/jest-dom/extend-expect'
 
 global.console.error = jest.fn()
+
+interface KeyboardIterator extends Iterator<[string, string]> {
+    length: number
+    [key: number]: [string, string]
+}
+
+interface KeyboardMap {
+    entries: () => KeyboardIterator
+}
+
+// some tests are not executed with dom so won't have navigator property defined
+if (global.navigator)
+    global.navigator.keyboard = {
+        getLayoutMap: () =>
+            Promise.resolve(<KeyboardMap>({
+                entries: () => [] as unknown as [string, string],
+            } as unknown as KeyboardMap)),
+    }

setupTests.ts

@@ -15,9 +15,9 @@ describe('ShortcutsDialog', () => {
     beforeEach(() => jest.resetAllMocks())
 
     describe('shortcuts list', () => {
-        it('should render shortcuts', () => {
+        it('should render shortcuts', async () => {
             render(<ShortcutsDialog {...DEFAULT_PROPS} />)
-            expect(screen.getByText(exitLabel)).toBeInTheDocument()
+            expect(await screen.findByText(exitLabel)).toBeInTheDocument()
             expect(screen.getByText(reloadViewLabel)).toBeInTheDocument()
         })
 

src/components/dialogs/__tests__/shortcutsDialog.test.tsx

@@ -17,10 +17,7 @@ const files: Array<FileDescriptor> = [
         mode: 16877,
         isDir: true,
         readonly: false,
-        id: {
-            ino: 0n,
-            dev: 1n,
-        },
+        id: '0-1',
         isSym: false,
         target: '',
         type: '',
@@ -37,10 +34,7 @@ const files: Array<FileDescriptor> = [
         mode: 33188,
         isDir: false,
         readonly: false,
-        id: {
-            ino: 1n,
-            dev: 1n,
-        },
+        id: '1-1',
         isSym: false,
         target: '',
         type: '',
@@ -57,10 +51,7 @@ const files: Array<FileDescriptor> = [
         mode: 33188,
         isDir: false,
         readonly: false,
-        id: {
-            ino: 2n,
-            dev: 1n,
-        },
+        id: '2-1',
         isSym: false,
         target: '',
         type: '',
@@ -77,10 +68,7 @@ const files: Array<FileDescriptor> = [
         mode: 33188,
         isDir: false,
         readonly: false,
-        id: {
-            ino: 3n,
-            dev: 1n,
-        },
+        id: '3-1',
         isSym: false,
         target: '',
         type: '',
@@ -90,25 +78,25 @@ const files: Array<FileDescriptor> = [
 describe('sorting methods', () => {
     it('sort by Name/Asc', () => {
         const sortMethod = getSortMethod('name', 'asc')
-        const sorted_ids = files.sort(sortMethod).map((file) => file.id.ino)
-        expect(sorted_ids).toEqual([2n, 0n, 1n, 3n])
+        const sorted_ids = files.sort(sortMethod).map((file) => file.id)
+        expect(sorted_ids).toEqual(['2-1', '0-1', '1-1', '3-1'])
     })
 
     it('sort by Name/Desc', () => {
         const sortMethod = getSortMethod('name', 'desc')
-        const sorted_ids = files.sort(sortMethod).map((file) => file.id.ino)
-        expect(sorted_ids).toEqual([3n, 1n, 0n, 2n])
+        const sorted_ids = files.sort(sortMethod).map((file) => file.id)
+        expect(sorted_ids).toEqual(['3-1', '1-1', '0-1', '2-1'])
     })
 
     it('sort by Size/Asc', () => {
         const sortMethod = getSortMethod('size', 'asc')
-        const sorted_ids = files.sort(sortMethod).map((file) => file.id.ino)
-        expect(sorted_ids).toEqual([1n, 0n, 3n, 2n])
+        const sorted_ids = files.sort(sortMethod).map((file) => file.id)
+        expect(sorted_ids).toEqual(['1-1', '0-1', '3-1', '2-1'])
     })
 
     it('sort by Size/Asc', () => {
         const sortMethod = getSortMethod('size', 'desc')
-        const sorted_ids = files.sort(sortMethod).map((file) => file.id.ino)
-        expect(sorted_ids).toEqual([2n, 3n, 0n, 1n])
+        const sorted_ids = files.sort(sortMethod).map((file) => file.id)
+        expect(sorted_ids).toEqual(['2-1', '3-1', '0-1', '1-1'])
     })
 })

src/services/__tests__/FsSort.test.ts

@@ -409,10 +409,7 @@ describe('FsLocal', () => {
                 length: fsStat.size,
                 isDir: false,
                 isSym: false,
-                id: {
-                    dev: fsStat.dev,
-                    ino: fsStat.ino,
-                },
+                id: `${fsStat.ino}-${fsStat.dev}`,
                 mode: fsStat.mode,
                 readonly: false,
                 target: null,