Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8b2c78c

Browse files
Re-enable update tests
1 parent 10babb4 commit 8b2c78c

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

‎src/common/util.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ export const getOptions = <T extends Options>(): T => {
7777
options = {} as T
7878
}
7979

80+
// You can also pass options in stringified form to the options query
81+
// variable. Options provided here will override the ones in the options
82+
// element.
8083
const params = new URLSearchParams(location.search)
8184
const queryOpts = params.get("options")
8285
if (queryOpts) {

‎test/unit/update.test.ts‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { tmpdir } from "../../src/node/constants"
55
import { SettingsProvider, UpdateSettings } from "../../src/node/settings"
66
import { LatestResponse, UpdateProvider } from "../../src/node/update"
77

8-
describe.skip("update", () => {
8+
describe("update", () => {
99
let version = "1.0.0"
1010
let spy: string[] = []
1111
const server = http.createServer((request: http.IncomingMessage, response: http.ServerResponse) => {
@@ -75,7 +75,7 @@ describe.skip("update", () => {
7575
await expect(settings.read()).resolves.toEqual({ update })
7676
expect(isNaN(update.checked)).toEqual(false)
7777
expect(update.checked < Date.now() && update.checked >= now).toEqual(true)
78-
expect(update.version).toBe("2.1.0")
78+
expect(update.version).toStrictEqual("2.1.0")
7979
expect(spy).toEqual(["/latest"])
8080
})
8181

@@ -87,9 +87,9 @@ describe.skip("update", () => {
8787
const update = await p.getUpdate()
8888

8989
await expect(settings.read()).resolves.toEqual({ update })
90-
expect(isNaN(update.checked)).toBe(false)
90+
expect(isNaN(update.checked)).toStrictEqual(false)
9191
expect(update.checked < now).toBe(true)
92-
expect(update.version).toBe("2.1.0")
92+
expect(update.version).toStrictEqual("2.1.0")
9393
expect(spy).toEqual([])
9494
})
9595

@@ -101,10 +101,10 @@ describe.skip("update", () => {
101101
const update = await p.getUpdate(true)
102102

103103
await expect(settings.read()).resolves.toEqual({ update })
104-
expect(isNaN(update.checked)).toBe(false)
105-
expect(update.checked < Date.now() && update.checked >= now).toBe(true)
106-
expect(update.version).toBe("4.1.1")
107-
expect(spy).toBe(["/latest"])
104+
expect(isNaN(update.checked)).toStrictEqual(false)
105+
expect(update.checked < Date.now() && update.checked >= now).toStrictEqual(true)
106+
expect(update.version).toStrictEqual("4.1.1")
107+
expect(spy).toStrictEqual(["/latest"])
108108
})
109109

110110
it("should get latest after interval passes", async () => {
@@ -121,33 +121,40 @@ describe.skip("update", () => {
121121
await settings.write({ update: { checked, version } })
122122

123123
const update = await p.getUpdate()
124-
expect(update.checked).not.toBe(checked)
125-
expect(spy).toBe(["/latest"])
124+
expect(update.checked).not.toStrictEqual(checked)
125+
expect(spy).toStrictEqual(["/latest"])
126126
})
127127

128128
it("should check if it's the current version", async () => {
129129
version = "9999999.99999.9999"
130130

131131
const p = provider()
132132
let update = await p.getUpdate(true)
133-
expect(p.isLatestVersion(update)).toBe(false)
133+
expect(p.isLatestVersion(update)).toStrictEqual(false)
134134

135135
version = "0.0.0"
136136
update = await p.getUpdate(true)
137-
expect(p.isLatestVersion(update)).toBe(true)
137+
expect(p.isLatestVersion(update)).toStrictEqual(true)
138138

139139
// Old version format; make sure it doesn't report as being later.
140140
version = "999999.9999-invalid999.99.9"
141141
update = await p.getUpdate(true)
142-
expect(p.isLatestVersion(update)).toBe(true)
142+
expect(p.isLatestVersion(update)).toStrictEqual(true)
143143
})
144144

145145
it("should not reject if unable to fetch", async () => {
146-
expect.assertions(2)
147146
let provider = new UpdateProvider("invalid", settings)
148-
await expect(() => provider.getUpdate(true)).resolves.toBe(undefined)
147+
let now = Date.now()
148+
let update = await provider.getUpdate(true)
149+
expect(isNaN(update.checked)).toStrictEqual(false)
150+
expect(update.checked < Date.now() && update.checked >= now).toEqual(true)
151+
expect(update.version).toStrictEqual("unknown")
149152

150153
provider = new UpdateProvider("http://probably.invalid.dev.localhost/latest", settings)
151-
await expect(() => provider.getUpdate(true)).resolves.toBe(undefined)
154+
now = Date.now()
155+
update = await provider.getUpdate(true)
156+
expect(isNaN(update.checked)).toStrictEqual(false)
157+
expect(update.checked < Date.now() && update.checked >= now).toEqual(true)
158+
expect(update.version).toStrictEqual("unknown")
152159
})
153160
})

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /