Merge branch 'main' into v4.4.0

This commit is contained in:
Joe Previte 2022-05-06 10:04:38 -07:00 committed by GitHub
commit 200f7fe5ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View File

@ -1 +1 @@
14 16

View File

@ -31,7 +31,7 @@ for [VS
Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
Here is what is needed: Here is what is needed:
- `node` v14.x - `node` v16.x
- `git` v2.x or greater - `git` v2.x or greater
- [`git-lfs`](https://git-lfs.github.com) - [`git-lfs`](https://git-lfs.github.com)
- [`yarn`](https://classic.yarnpkg.com/en/) - [`yarn`](https://classic.yarnpkg.com/en/)

View File

@ -131,7 +131,8 @@ describe("update", () => {
await expect(settings().read()).resolves.toEqual({ update }) await expect(settings().read()).resolves.toEqual({ update })
expect(isNaN(update.checked)).toEqual(false) 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(update.version).toStrictEqual("2.1.0")
expect(spy).toEqual(["/latest"]) expect(spy).toEqual(["/latest"])
}) })
@ -145,7 +146,7 @@ describe("update", () => {
await expect(settings().read()).resolves.toEqual({ update }) await expect(settings().read()).resolves.toEqual({ update })
expect(isNaN(update.checked)).toStrictEqual(false) expect(isNaN(update.checked)).toStrictEqual(false)
expect(update.checked).toBeLessThan(now) expect(update.checked).toBeLessThanOrEqual(now)
expect(update.version).toStrictEqual("2.1.0") expect(update.version).toStrictEqual("2.1.0")
expect(spy).toEqual([]) expect(spy).toEqual([])
}) })
@ -160,7 +161,7 @@ describe("update", () => {
await expect(settings().read()).resolves.toEqual({ update }) await expect(settings().read()).resolves.toEqual({ update })
expect(isNaN(update.checked)).toStrictEqual(false) expect(isNaN(update.checked)).toStrictEqual(false)
expect(update.checked).toBeGreaterThanOrEqual(now) 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(update.version).toStrictEqual("4.1.1")
expect(spy).toStrictEqual(["/latest"]) expect(spy).toStrictEqual(["/latest"])
}) })
@ -206,7 +207,7 @@ describe("update", () => {
let update = await provider.getUpdate(true) let update = await provider.getUpdate(true)
expect(isNaN(update.checked)).toStrictEqual(false) expect(isNaN(update.checked)).toStrictEqual(false)
expect(update.checked).toBeGreaterThanOrEqual(now) expect(update.checked).toBeGreaterThanOrEqual(now)
expect(update.checked).toBeLessThan(Date.now()) expect(update.checked).toBeLessThanOrEqual(Date.now())
expect(update.version).toStrictEqual("unknown") expect(update.version).toStrictEqual("unknown")
provider = new UpdateProvider("http://probably.invalid.dev.localhost/latest", settings()) provider = new UpdateProvider("http://probably.invalid.dev.localhost/latest", settings())
@ -214,7 +215,7 @@ describe("update", () => {
update = await provider.getUpdate(true) update = await provider.getUpdate(true)
expect(isNaN(update.checked)).toStrictEqual(false) expect(isNaN(update.checked)).toStrictEqual(false)
expect(update.checked).toBeGreaterThanOrEqual(now) expect(update.checked).toBeGreaterThanOrEqual(now)
expect(update.checked).toBeLessThan(Date.now()) expect(update.checked).toBeLessThanOrEqual(Date.now())
expect(update.version).toStrictEqual("unknown") expect(update.version).toStrictEqual("unknown")
}) })