From 0323f00d4a5ee93ced70573a40de927302818a85 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 6 May 2022 09:11:10 -0700 Subject: [PATCH 1/4] fix(update): add OrEqual to update.checked test --- test/unit/node/update.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/node/update.test.ts b/test/unit/node/update.test.ts index 9aa6f75d7cb0..a6aafbee286b 100644 --- a/test/unit/node/update.test.ts +++ b/test/unit/node/update.test.ts @@ -206,7 +206,7 @@ describe("update", () => { let update = await provider.getUpdate(true) expect(isNaN(update.checked)).toStrictEqual(false) expect(update.checked).toBeGreaterThanOrEqual(now) - expect(update.checked).toBeLessThan(Date.now()) + expect(update.checked).toBeLessThanOrEqual(Date.now()) expect(update.version).toStrictEqual("unknown") provider = new UpdateProvider("http://probably.invalid.dev.localhost/latest", settings()) From c53d33913688d264920902b8696bc21420efe692 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 6 May 2022 09:14:35 -0700 Subject: [PATCH 2/4] fixup!: change all instances to OrEqual --- test/unit/node/update.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/node/update.test.ts b/test/unit/node/update.test.ts index a6aafbee286b..e96ed03fcc47 100644 --- a/test/unit/node/update.test.ts +++ b/test/unit/node/update.test.ts @@ -145,7 +145,7 @@ describe("update", () => { await expect(settings().read()).resolves.toEqual({ update }) expect(isNaN(update.checked)).toStrictEqual(false) - expect(update.checked).toBeLessThan(now) + expect(update.checked).toBeLessThanOrEqual(now) expect(update.version).toStrictEqual("2.1.0") expect(spy).toEqual([]) }) @@ -160,7 +160,7 @@ describe("update", () => { await expect(settings().read()).resolves.toEqual({ update }) expect(isNaN(update.checked)).toStrictEqual(false) expect(update.checked).toBeGreaterThanOrEqual(now) - expect(update.checked).toBeLessThan(Date.now()) + expect(update.checked).toBeLessThanOrEqual(Date.now()) expect(update.version).toStrictEqual("4.1.1") expect(spy).toStrictEqual(["/latest"]) }) @@ -214,7 +214,7 @@ describe("update", () => { update = await provider.getUpdate(true) expect(isNaN(update.checked)).toStrictEqual(false) expect(update.checked).toBeGreaterThanOrEqual(now) - expect(update.checked).toBeLessThan(Date.now()) + expect(update.checked).toBeLessThanOrEqual(Date.now()) expect(update.version).toStrictEqual("unknown") }) From efe182d0ae7dae548f99eba436940747161607cc Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 6 May 2022 09:27:01 -0700 Subject: [PATCH 3/4] fixup!: add missing equals --- test/unit/node/update.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/node/update.test.ts b/test/unit/node/update.test.ts index e96ed03fcc47..10433c64a2bb 100644 --- a/test/unit/node/update.test.ts +++ b/test/unit/node/update.test.ts @@ -131,7 +131,7 @@ describe("update", () => { await expect(settings().read()).resolves.toEqual({ update }) expect(isNaN(update.checked)).toEqual(false) - expect(update.checked < Date.now() && update.checked >= now).toEqual(true) + expect(update.checked <= Date.now() && update.checked >= now).toEqual(true) expect(update.version).toStrictEqual("2.1.0") expect(spy).toEqual(["/latest"]) }) From 2023d0648aafe6e6cb923c9ed3de84d5198119a7 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 6 May 2022 09:27:54 -0700 Subject: [PATCH 4/4] fixup!: consistency --- test/unit/node/update.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/node/update.test.ts b/test/unit/node/update.test.ts index 10433c64a2bb..d315e977c94a 100644 --- a/test/unit/node/update.test.ts +++ b/test/unit/node/update.test.ts @@ -131,7 +131,8 @@ describe("update", () => { await expect(settings().read()).resolves.toEqual({ update }) expect(isNaN(update.checked)).toEqual(false) - expect(update.checked <= Date.now() && update.checked >= now).toEqual(true) + expect(update.checked).toBeGreaterThanOrEqual(now) + expect(update.checked).toBeLessThanOrEqual(Date.now()) expect(update.version).toStrictEqual("2.1.0") expect(spy).toEqual(["/latest"]) })