Skip to content

Commit c7afef6

Browse files
committed
test(server): settings watcher tests wait for the reload decision before asserting
Signed-off-by: Yordis Prieto <[email protected]>
1 parent dccbd39 commit c7afef6

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

‎apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,22 +161,22 @@ describe("layerSettingsWatcher", () => {
161161
Effect.gen(function* () {
162162
const changes = yield* Queue.unbounded<ServerSettings>();
163163
const reconciled = yield* Queue.unbounded<void>();
164-
const calls: Array<"reconcile" | "reloadSecrets"> = [];
164+
let reloads = 0;
165165
const mutator = Layer.succeed(ProviderInstanceRegistryMutator, {
166-
reconcile: () =>
167-
Effect.suspend(() => {
168-
calls.push("reconcile");
169-
return Queue.offer(reconciled, undefined);
170-
}),
171-
reloadSecrets: () => Effect.sync(() => void calls.push("reloadSecrets")),
166+
reconcile: () => Queue.offer(reconciled, undefined),
167+
reloadSecrets: () => Effect.sync(() => void reloads++),
172168
});
173169
yield* Layer.build(
174170
layerSettingsWatcher(Stream.fromQueue(changes), initial).pipe(Layer.provide(mutator)),
175171
);
176172
return {
177-
calls,
173+
reloads: () => reloads,
174+
// Changes run one at a time, so the repeat's reconcile means the first one's reload decision is done.
178175
change: (settings: ServerSettings) =>
179-
Queue.offer(changes, settings).pipe(Effect.andThen(Queue.take(reconciled))),
176+
Queue.offerAll(changes, [settings, settings]).pipe(
177+
Effect.andThen(Queue.take(reconciled)),
178+
Effect.andThen(Queue.take(reconciled)),
179+
),
180180
};
181181
});
182182

@@ -185,13 +185,14 @@ describe("layerSettingsWatcher", () => {
185185
() =>
186186
Effect.gen(function* () {
187187
const settings = yield* ServerSettingsService;
188-
const { calls, change } = yield* watch(yield* settings.getSettings);
188+
const { reloads, change } = yield* watch(yield* settings.getSettings);
189189

190190
yield* change(yield* settings.updateSettings({ secretProviders: provider("Personal") }));
191-
yield* change(yield* settings.updateSettings({ secretProviders: provider("Renamed") }));
191+
expect(reloads()).toBe(1);
192192

193193
// A label is not read by any vault, so renaming a provider retries nothing.
194-
expect(calls).toEqual(["reconcile", "reloadSecrets", "reconcile"]);
194+
yield* change(yield* settings.updateSettings({ secretProviders: provider("Renamed") }));
195+
expect(reloads()).toBe(1);
195196
}).pipe(Effect.scoped, Effect.provide(ServerSettingsService.layerTest())),
196197
);
197198

@@ -202,11 +203,11 @@ describe("layerSettingsWatcher", () => {
202203
const settings = yield* ServerSettingsService;
203204
const started = yield* settings.getSettings;
204205
const saved = yield* settings.updateSettings({ secretProviders: provider("Personal") });
205-
const { calls, change } = yield* watch(started);
206+
const { reloads, change } = yield* watch(started);
206207

207208
yield* change(saved);
208209

209-
expect(calls).toEqual(["reconcile", "reloadSecrets"]);
210+
expect(reloads()).toBe(1);
210211
}).pipe(Effect.scoped, Effect.provide(ServerSettingsService.layerTest())),
211212
);
212213
});

0 commit comments

Comments
 (0)