Skip to content

Commit 43e46be

Browse files
timdeschryvertimdeschryver
committed
build: update to Angular 20-rc
1 parent 980cf6f commit 43e46be

File tree

17 files changed

+2803
-1441
lines changed

17 files changed

+2803
-1441
lines changed

‎modules/component-store/spec/integration.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ describe('ComponentStore integration', () => {
431431
'ngOnDestroy'
432432
);
433433

434-
const serviceCallSpy = jest.spyOn(TestBed.get(Service), 'call');
434+
const serviceCallSpy = jest.spyOn(TestBed.inject(Service), 'call');
435435
return {
436436
...setup,
437437
destroy: () => setup.child.propsStore.ngOnDestroy(),

‎modules/signals/rxjs-interop/spec/rx-method.spec.ts

+16-16
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ describe('rxMethod', () => {
5555
method(sig);
5656
expect(results.length).toBe(0);
5757

58-
TestBed.flushEffects();
58+
TestBed.tick();
5959
expect(results[0]).toBe(1);
6060

6161
sig.set(10);
6262
expect(results.length).toBe(1);
6363

64-
TestBed.flushEffects();
64+
TestBed.tick();
6565
expect(results[1]).toBe(10);
6666
}));
6767

@@ -97,18 +97,18 @@ describe('rxMethod', () => {
9797

9898
subject$.next(1);
9999
sig.set(1);
100-
TestBed.flushEffects();
100+
TestBed.tick();
101101
expect(results).toEqual([1, 1]);
102102

103103
ref1.destroy();
104104
subject$.next(2);
105105
sig.set(2);
106-
TestBed.flushEffects();
106+
TestBed.tick();
107107
expect(results).toEqual([1, 1, 2]);
108108

109109
ref2.destroy();
110110
sig.set(3);
111-
TestBed.flushEffects();
111+
TestBed.tick();
112112
expect(results).toEqual([1, 1, 2]);
113113
}));
114114

@@ -195,7 +195,7 @@ describe('rxMethod', () => {
195195
const num = signal(3);
196196
increment(num);
197197

198-
TestBed.flushEffects();
198+
TestBed.tick();
199199
expect(counter()).toBe(4);
200200
});
201201

@@ -245,20 +245,20 @@ describe('rxMethod', () => {
245245
globalService.trackSignal(globalService.globalSignal);
246246
});
247247

248-
TestBed.flushEffects();
248+
TestBed.tick();
249249
expect(globalService.globalSignalChangeCounter).toBe(1);
250250

251251
globalService.incrementSignal();
252-
TestBed.flushEffects();
252+
TestBed.tick();
253253
expect(globalService.globalSignalChangeCounter).toBe(2);
254254

255255
globalService.incrementSignal();
256-
TestBed.flushEffects();
256+
TestBed.tick();
257257
expect(globalService.globalSignalChangeCounter).toBe(3);
258258

259259
instanceInjector.destroy();
260260
globalService.incrementSignal();
261-
TestBed.flushEffects();
261+
TestBed.tick();
262262

263263
expect(globalService.globalSignalChangeCounter).toBe(3);
264264
});
@@ -273,7 +273,7 @@ describe('rxMethod', () => {
273273
globalService.trackObservable(globalService.globalObservable)
274274
);
275275

276-
TestBed.flushEffects();
276+
TestBed.tick();
277277
expect(globalService.globalObservableChangeCounter).toBe(1);
278278

279279
globalService.incrementObservable();
@@ -298,15 +298,15 @@ describe('rxMethod', () => {
298298
injector: instanceInjector,
299299
});
300300

301-
TestBed.flushEffects();
301+
TestBed.tick();
302302
globalService.incrementSignal();
303-
TestBed.flushEffects();
303+
TestBed.tick();
304304

305305
expect(globalService.globalSignalChangeCounter).toBe(2);
306306

307307
instanceInjector.destroy();
308308
globalService.incrementSignal();
309-
TestBed.flushEffects();
309+
TestBed.tick();
310310

311311
expect(globalService.globalSignalChangeCounter).toBe(2);
312312
});
@@ -336,13 +336,13 @@ describe('rxMethod', () => {
336336
globalService.trackSignal(globalService.globalSignal);
337337
globalService.trackObservable(globalService.globalObservable);
338338

339-
TestBed.flushEffects();
339+
TestBed.tick();
340340
expect(globalService.globalSignalChangeCounter).toBe(1);
341341
expect(globalService.globalObservableChangeCounter).toBe(1);
342342

343343
globalService.incrementSignal();
344344
globalService.incrementObservable();
345-
TestBed.flushEffects();
345+
TestBed.tick();
346346

347347
expect(globalService.globalSignalChangeCounter).toBe(2);
348348
expect(globalService.globalObservableChangeCounter).toBe(2);

‎modules/signals/spec/helpers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function createLocalService<Service extends Type<unknown>>(
2424
return {
2525
service: fixture.componentInstance.service,
2626
flush: () => {
27-
TestBed.flushEffects();
27+
TestBed.tick();
2828
fixture.detectChanges();
2929
},
3030
destroy: () => fixture.destroy(),

‎modules/signals/spec/signal-method.spec.ts

+18-18
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ describe('signalMethod', () => {
2727
adder(summand);
2828
expect(a).toBe(1);
2929

30-
TestBed.flushEffects();
30+
TestBed.tick();
3131
expect(a).toBe(2);
3232

3333
summand.set(2);
3434
summand.set(2);
35-
TestBed.flushEffects();
35+
TestBed.tick();
3636
expect(a).toBe(4);
3737

38-
TestBed.flushEffects();
38+
TestBed.tick();
3939
expect(a).toBe(4);
4040
});
4141

@@ -51,13 +51,13 @@ describe('signalMethod', () => {
5151
adder(summand);
5252

5353
summand.set(2);
54-
TestBed.flushEffects();
54+
TestBed.tick();
5555
expect(a).toBe(3);
5656

5757
adder.destroy();
5858

5959
summand.set(2);
60-
TestBed.flushEffects();
60+
TestBed.tick();
6161
expect(a).toBe(3);
6262
});
6363

@@ -73,14 +73,14 @@ describe('signalMethod', () => {
7373
const adder = createAdder((value) => (a += value));
7474
adder(summand1);
7575
adder(summand2);
76-
TestBed.flushEffects();
76+
TestBed.tick();
7777
expect(a).toBe(4);
7878

7979
adder.destroy();
8080

8181
summand1.set(2);
8282
summand2.set(3);
83-
TestBed.flushEffects();
83+
TestBed.tick();
8484
expect(a).toBe(4);
8585
});
8686

@@ -98,13 +98,13 @@ describe('signalMethod', () => {
9898
adder(summand1, { injector: childInjector });
9999
adder(summand2);
100100

101-
TestBed.flushEffects();
101+
TestBed.tick();
102102
expect(a).toBe(4);
103103
childInjector.destroy();
104104

105105
summand1.set(2);
106106
summand2.set(2);
107-
TestBed.flushEffects();
107+
TestBed.tick();
108108

109109
adder.destroy();
110110
expect(a).toBe(4);
@@ -122,11 +122,11 @@ describe('signalMethod', () => {
122122
const value = signal(1);
123123

124124
adder(value);
125-
TestBed.flushEffects();
125+
TestBed.tick();
126126

127127
sourceInjector.destroy();
128128
value.set(2);
129-
TestBed.flushEffects();
129+
TestBed.tick();
130130

131131
expect(a).toBe(2);
132132
});
@@ -149,12 +149,12 @@ describe('signalMethod', () => {
149149
TestBed.runInInjectionContext(() => {
150150
adder(value, { injector: callerInjector });
151151
});
152-
TestBed.flushEffects();
152+
TestBed.tick();
153153
expect(a).toBe(2);
154154

155155
sourceInjector.destroy();
156156
value.set(2);
157-
TestBed.flushEffects();
157+
TestBed.tick();
158158

159159
expect(a).toBe(4);
160160
});
@@ -182,17 +182,17 @@ describe('signalMethod', () => {
182182
runInInjectionContext(callerInjector, () =>
183183
adder(value, { injector: providedInjector })
184184
);
185-
TestBed.flushEffects();
185+
TestBed.tick();
186186
expect(a).toBe(2);
187187

188188
sourceInjector.destroy();
189189
value.set(2);
190-
TestBed.flushEffects();
190+
TestBed.tick();
191191
expect(a).toBe(4);
192192

193193
callerInjector.destroy();
194194
value.set(1);
195-
TestBed.flushEffects();
195+
TestBed.tick();
196196
expect(a).toBe(5);
197197
});
198198
});
@@ -205,14 +205,14 @@ describe('signalMethod', () => {
205205
adder(summand1);
206206
const s2 = adder(summand2);
207207

208-
TestBed.flushEffects();
208+
TestBed.tick();
209209
s2.destroy();
210210
expect(a).toBe(4);
211211

212212
summand1.set(100);
213213
summand2.set(3000);
214214

215-
TestBed.flushEffects();
215+
TestBed.tick();
216216
expect(a).toBe(104);
217217
});
218218

‎modules/signals/spec/signal-state.spec.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ describe('signalState', () => {
134134
expect(userEmitted).toBe(0);
135135
expect(firstNameEmitted).toBe(0);
136136

137-
TestBed.flushEffects();
137+
TestBed.tick();
138138

139139
expect(numbersEmitted).toBe(1);
140140
expect(userEmitted).toBe(1);
141141
expect(firstNameEmitted).toBe(1);
142142

143143
patchState(state, { numbers: [1, 2, 3] });
144-
TestBed.flushEffects();
144+
TestBed.tick();
145145

146146
expect(numbersEmitted).toBe(2);
147147
expect(userEmitted).toBe(1);
@@ -150,7 +150,7 @@ describe('signalState', () => {
150150
patchState(state, (state) => ({
151151
user: { ...state.user, lastName: 'Schmidt' },
152152
}));
153-
TestBed.flushEffects();
153+
TestBed.tick();
154154

155155
expect(numbersEmitted).toBe(2);
156156
expect(userEmitted).toBe(2);
@@ -159,7 +159,7 @@ describe('signalState', () => {
159159
patchState(state, (state) => ({
160160
user: { ...state.user, firstName: 'Johannes' },
161161
}));
162-
TestBed.flushEffects();
162+
TestBed.tick();
163163

164164
expect(numbersEmitted).toBe(2);
165165
expect(userEmitted).toBe(3);
@@ -184,17 +184,17 @@ describe('signalState', () => {
184184
userCounter++;
185185
});
186186

187-
TestBed.flushEffects();
187+
TestBed.tick();
188188
expect(stateCounter).toBe(1);
189189
expect(userCounter).toBe(1);
190190

191191
patchState(state, {});
192-
TestBed.flushEffects();
192+
TestBed.tick();
193193
expect(stateCounter).toBe(2);
194194
expect(userCounter).toBe(1);
195195

196196
patchState(state, (state) => state);
197-
TestBed.flushEffects();
197+
TestBed.tick();
198198
expect(stateCounter).toBe(3);
199199
expect(userCounter).toBe(1);
200200
}));

‎modules/signals/spec/state-source.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ describe('StateSource', () => {
183183
});
184184
});
185185

186-
TestBed.flushEffects();
186+
TestBed.tick();
187187
expect(executionCount).toBe(1);
188188

189189
store.setFoo('baz');
190190

191-
TestBed.flushEffects();
191+
TestBed.tick();
192192
expect(executionCount).toBe(2);
193193
});
194194
});

‎modules/signals/spec/types/signal-store.types.spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('signalStore', () => {
3434

3535
expectSnippet(snippet).toInfer(
3636
'Store',
37-
'Type$1<{ foo: Signal<string>; bar: Signal<number[]>; } & StateSource<{ foo: string; bar: number[]; }>>'
37+
'Type<{ foo: Signal<string>; bar: Signal<number[]>; } & StateSource<{ foo: string; bar: number[]; }>>'
3838
);
3939
});
4040

@@ -234,7 +234,7 @@ describe('signalStore', () => {
234234

235235
expectSnippet(snippet).toSucceed();
236236

237-
expectSnippet(snippet).toInfer('Store', 'Type$1<{} & StateSource<{}>>');
237+
expectSnippet(snippet).toInfer('Store', 'Type<{} & StateSource<{}>>');
238238
});
239239

240240
it('succeeds when state slices are union types', () => {
@@ -305,7 +305,7 @@ describe('signalStore', () => {
305305

306306
expectSnippet(snippet1).toInfer(
307307
'Store',
308-
'Type$1<{ name: DeepSignal<{ x: { y: string; }; }>; arguments: Signal<number[]>; call: Signal<boolean>; } & StateSource<{ name: { x: { y: string; }; }; arguments: number[]; call: boolean; }>>'
308+
'Type<{ name: DeepSignal<{ x: { y: string; }; }>; arguments: Signal<number[]>; call: Signal<boolean>; } & StateSource<{ name: { x: { y: string; }; }; arguments: number[]; call: boolean; }>>'
309309
);
310310

311311
const snippet2 = `
@@ -322,7 +322,7 @@ describe('signalStore', () => {
322322

323323
expectSnippet(snippet2).toInfer(
324324
'Store',
325-
'Type$1<{ apply: Signal<string>; bind: DeepSignal<{ foo: string; }>; prototype: Signal<string[]>; } & StateSource<{ apply: string; bind: { foo: string; }; prototype: string[]; }>>'
325+
'Type<{ apply: Signal<string>; bind: DeepSignal<{ foo: string; }>; prototype: Signal<string[]>; } & StateSource<{ apply: string; bind: { foo: string; }; prototype: string[]; }>>'
326326
);
327327

328328
const snippet3 = `
@@ -338,7 +338,7 @@ describe('signalStore', () => {
338338

339339
expectSnippet(snippet3).toInfer(
340340
'Store',
341-
'Type$1<{ length: Signal<number>; caller: Signal<undefined>; } & StateSource<{ length: number; caller: undefined; }>>'
341+
'Type<{ length: Signal<number>; caller: Signal<undefined>; } & StateSource<{ length: number; caller: undefined; }>>'
342342
);
343343
});
344344

0 commit comments

Comments
 (0)