Merge pull request #1065 from araujoarthur0/electron-mocha-renderer-m…

…igration

.github/workflows/Checks.yml

@@ -54,12 +54,17 @@ jobs:
           fi
 
           npm run test:electron-mocha-main
+
+          # Move initial coverage to avoid it being replaced below by renderer run
+          mv coverage_c8 coverage-electron-mocha-main
+
+          npm run test:electron-mocha-renderer
           npm run test:jest
           npm run test:mocha
       - name: '        CodeCov'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage_c8/coverage-final.json,coverage_jest/coverage-final.json,coverage_mocha/coverage-final.json
+          files: coverage-electron-mocha-main/coverage-final.json,coverage_c8/coverage-final.json,coverage_jest/coverage-final.json,coverage_mocha/coverage-final.json
           name: codecov-${{ matrix.os }}
           verbose: true

__tests__/__renderer__/themes.js

@@ -1,19 +1,23 @@
 /* eslint-disable no-undef */
 'use strict';
 
-const assert = require('assert');
+import assert from 'assert';
+import { stub } from 'sinon';
 
 import {
     applyTheme,
     isValidTheme
 } from '../../renderer/themes.js';
-window.$ = window.jQuery = require('jquery');
+
+// Stub $ and window.matchMedia for applyTheme()
+global.$ = stub().returns({'attr': stub()});
+global.window = { matchMedia: stub().returns({matches: true}) };
 
 describe('Theme Functions', function()
 {
     describe('isValidTheme()', function()
     {
-        test('should validate', () =>
+        it('should validate', () =>
         {
             assert.strictEqual(isValidTheme('system-default'), true);
             assert.strictEqual(isValidTheme('light'), true);
@@ -24,7 +28,7 @@ describe('Theme Functions', function()
 
     describe('isValidTheme()', function()
     {
-        test('should not validate', () =>
+        it('should not validate', () =>
         {
             assert.strictEqual(isValidTheme('foo'), false);
             assert.strictEqual(isValidTheme('bar'), false);
@@ -33,18 +37,30 @@ describe('Theme Functions', function()
 
     describe('applyTheme()', function()
     {
-        test('should apply', () =>
+        beforeEach(() =>
+        {
+            global.window.matchMedia.resetHistory();
+            global.$.resetHistory();
+        });
+
+        it('should apply', () =>
         {
             assert.strictEqual(applyTheme('system-default'), true);
             assert.strictEqual(applyTheme('light'), true);
             assert.strictEqual(applyTheme('dark'), true);
             assert.strictEqual(applyTheme('cadent-star'), true);
+
+            assert.strictEqual(global.window.matchMedia.callCount, 1);
+            assert.strictEqual(global.$.callCount, 4);
         });
 
-        test('should not apply', function()
+        it('should not apply', function()
         {
             assert.strictEqual(applyTheme('foo'), false);
             assert.strictEqual(applyTheme('bar'), false);
+
+            assert.strictEqual(global.window.matchMedia.callCount, 0);
+            assert.strictEqual(global.$.callCount, 0);
         });
     });
 });

__tests__/electron-mocha-renderer.config.cjs

@@ -0,0 +1,5 @@
+const data = require('./mocha-base.config.cjs');
+
+data.spec = ['__tests__/__renderer__/themes.js'];
+
+module.exports = data;

jest.config.js

@@ -13,7 +13,7 @@ module.exports = {
             displayName: 'RENDERER',
             runner: '@jest-runner/electron',
             testEnvironment: '@jest-runner/electron/environment',
-            testMatch: ['**/__tests__/**renderer**/*.js', '**/__tests__/**renderer**/classes/*.js']
+            testMatch: ['**/__tests__/**renderer**/*.js', '**/__tests__/**renderer**/classes/*.js', '!**/themes.js']
         }
     ]
 };