From a2099565d42de455f5812d6f542d005b3cbe9f9b Mon Sep 17 00:00:00 2001 From: Sergii Mykhailov Date: Mon, 26 Feb 2024 16:54:55 +0100 Subject: [PATCH 1/2] Fixed dependencies --- package.json | 6 +++--- src/date-time-formatter.test.ts | 4 ++-- src/safe-datetimeformat.ts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 5d3ecb3..226f23b 100644 --- a/package.json +++ b/package.json @@ -32,13 +32,13 @@ }, "devDependencies": { "@jest-runner/electron": "3.0.0", - "@types/jest": "^25.1.1", + "@types/jest": "^29.5.12", "electron": "9.4.0", - "jest": "^25.1.0", + "jest": "^26.4.0", "rimraf": "^3.0.1", "ts-jest": "^26.4.3", "tsdx": "^0.12.3", - "tslint": "^6.0.0", + "tslint": "^5.1.0", "tslint-microsoft-contrib": "^6.2.0", "tsutils": "^3.17.1", "typescript": "^3.7.5" diff --git a/src/date-time-formatter.test.ts b/src/date-time-formatter.test.ts index 4b9f4c2..c30f498 100644 --- a/src/date-time-formatter.test.ts +++ b/src/date-time-formatter.test.ts @@ -29,7 +29,7 @@ const { describe('date-time-format-options', () => { test('uses correct version of electron', () => { - expect(process.versions.electron).toMatch(/8.*$/); + expect((process.versions as any).electron).toMatch(/8.*$/); }); describe('functionality', () => { @@ -457,7 +457,7 @@ describe('date-time-format-options', () => { } const end = performance.now(); expect(result).toBe('6/28/2020 3:40 PM'); -expect(end - start).toBe(0); + expect(end - start).toBe(0); }); }); }); diff --git a/src/safe-datetimeformat.ts b/src/safe-datetimeformat.ts index f05fed6..ec235cd 100644 --- a/src/safe-datetimeformat.ts +++ b/src/safe-datetimeformat.ts @@ -39,9 +39,9 @@ export function getVdiTimeZoneFix() { return 'Etc/GMT'; } if (tz > 0) { - return "Etc/GMT+" + tz; + return 'Etc/GMT+' + tz; } - return "Etc/GMT"+ tz; + return 'Etc/GMT' + tz; } return 'UTC'; } From 6b4911a965d988a7e54f446796d40a59a1a7d6be Mon Sep 17 00:00:00 2001 From: Ligia Popescu <48448512+ligiapopescu@users.noreply.github.com> Date: Mon, 26 Feb 2024 18:20:35 +0200 Subject: [PATCH 2/2] Update electron version in date-time-formatter.test.ts --- src/date-time-formatter.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/date-time-formatter.test.ts b/src/date-time-formatter.test.ts index c30f498..ba8f328 100644 --- a/src/date-time-formatter.test.ts +++ b/src/date-time-formatter.test.ts @@ -29,7 +29,7 @@ const { describe('date-time-format-options', () => { test('uses correct version of electron', () => { - expect((process.versions as any).electron).toMatch(/8.*$/); + expect((process.versions as any).electron).toMatch(/9.*$/); }); describe('functionality', () => {