Skip to content

Commit 16902ac

Browse files
RangerMauveMauve Signweaverachou11
authored
chore: Bump @comapeo/schema dep for attachment metadata (#1027)
* chore: Bump @comapeo/schema dep * fix type issue in e2e test * Update package.json Co-authored-by: Andrew Chou <[email protected]> * update @mapeo/mock-data to fix failing tests --------- Co-authored-by: Mauve Signweaver <[email protected]> Co-authored-by: Andrew Chou <[email protected]>
1 parent 28438c5 commit 16902ac

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

package-lock.json

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"@comapeo/core2.0.1": "npm:@comapeo/[email protected]",
113113
"@comapeo/ipc": "^2.1.0",
114114
"@mapeo/default-config": "5.0.0",
115-
"@mapeo/mock-data": "^2.1.5",
115+
"@mapeo/mock-data": "^3.0.0",
116116
"@sinonjs/fake-timers": "^10.0.2",
117117
"@types/b4a": "^1.6.0",
118118
"@types/bogon": "^1.0.2",
@@ -159,7 +159,7 @@
159159
},
160160
"dependencies": {
161161
"@comapeo/fallback-smp": "^1.0.0",
162-
"@comapeo/schema": "1.5.0",
162+
"@comapeo/schema": "1.6.0",
163163
"@digidem/types": "^2.3.0",
164164
"@fastify/error": "^3.4.1",
165165
"@fastify/type-provider-typebox": "^4.1.0",

test-e2e/cross-version-sync.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ test('syncing @comapeo/[email protected] with the current version', async (t) => {
1717
const newManager = createManager('new', t)
1818
await newManager.setDeviceInfo({ name: 'new', deviceType: 'desktop' })
1919

20-
const managers = [oldManager, newManager]
21-
22-
const disconnect = connectPeers(managers)
20+
const disconnect = connectPeers([oldManager, newManager])
2321
t.after(disconnect)
24-
await waitForPeers(managers)
22+
await waitForPeers([oldManager, newManager])
2523

26-
const [oldManagerPeers, newManagerPeers] = await Promise.all(
27-
managers.map((manager) => manager.listLocalPeers())
28-
)
24+
const [oldManagerPeers, newManagerPeers] = await Promise.all([
25+
oldManager.listLocalPeers(),
26+
newManager.listLocalPeers(),
27+
])
2928
assert.equal(oldManagerPeers.length, 1, 'old manager sees 1 peer')
3029
assert.equal(newManagerPeers.length, 1, 'new manager sees 1 peer')
3130
assert(
@@ -45,10 +44,11 @@ test('syncing @comapeo/[email protected] with the current version', async (t) => {
4544
invitees: [newManager],
4645
})
4746

48-
const projects = await Promise.all(
49-
managers.map((manager) => manager.getProject(projectId))
50-
)
51-
const [oldProject, newProject] = projects
47+
const [oldProject, newProject] = await Promise.all([
48+
oldManager.getProject(projectId),
49+
newManager.getProject(projectId),
50+
])
51+
5252
assert.equal(
5353
(await newProject.$getProjectSettings()).name,
5454
'foo bar',
@@ -58,15 +58,15 @@ test('syncing @comapeo/[email protected] with the current version', async (t) => {
5858
oldProject.$sync.start()
5959
newProject.$sync.start()
6060

61-
const [oldObservation, newObservation] = await Promise.all(
62-
projects.map((project) =>
63-
project.observation.create(valueOf(generate('observation')[0]))
64-
)
65-
)
61+
const [oldObservation, newObservation] = await Promise.all([
62+
oldProject.observation.create(valueOf(generate('observation')[0])),
63+
newProject.observation.create(valueOf(generate('observation')[0])),
64+
])
6665

67-
await Promise.all(
68-
projects.map((project) => project.$sync.waitForSync('full'))
69-
)
66+
await Promise.all([
67+
oldProject.$sync.waitForSync('full'),
68+
newProject.$sync.waitForSync('full'),
69+
])
7070

7171
assert(
7272
await oldProject.observation.getByDocId(newObservation.docId),

0 commit comments

Comments
 (0)