Skip to content

Commit 037b79b

Browse files
cexbrayatthePunderWoman
cexbrayat
authored and
thePunderWoman
committed
fix(core): change defer block fixture default behavior to playthrough (#54088)
This is a followup to #53956 The default behavior needs to be changed in `TestBedCompiler` as well to have an effect. PR Close #54088
1 parent c3b0095 commit 037b79b

File tree

5 files changed

+13
-39
lines changed

5 files changed

+13
-39
lines changed

‎packages/core/test/acceptance/defer_spec.ts‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ function createFixture(template: string) {
131131
...COMMON_PROVIDERS,
132132
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
133133
],
134-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
135134
});
136135

137136
clearDirectiveDefs(MyCmp);
@@ -160,8 +159,7 @@ const COMMON_PROVIDERS = [{provide: PLATFORM_ID, useValue: PLATFORM_BROWSER_ID}]
160159

161160
describe('@defer', () => {
162161
beforeEach(() => {
163-
TestBed.configureTestingModule(
164-
{providers: COMMON_PROVIDERS, deferBlockBehavior: DeferBlockBehavior.Playthrough});
162+
TestBed.configureTestingModule({providers: COMMON_PROVIDERS});
165163
});
166164

167165
it('should transition between placeholder, loading and loaded states', async () => {
@@ -558,7 +556,6 @@ describe('@defer', () => {
558556
...COMMON_PROVIDERS,
559557
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
560558
],
561-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
562559
});
563560

564561
clearDirectiveDefs(RootCmp);
@@ -837,7 +834,6 @@ describe('@defer', () => {
837834
providers: [
838835
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
839836
],
840-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
841837
});
842838

843839
const fixture = TestBed.createComponent(MyCmp);
@@ -912,7 +908,6 @@ describe('@defer', () => {
912908
},
913909
},
914910
],
915-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
916911
});
917912

918913
const fixture = TestBed.createComponent(MyCmp);
@@ -988,7 +983,6 @@ describe('@defer', () => {
988983
},
989984
},
990985
],
991-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
992986
});
993987

994988
const fixture = TestBed.createComponent(MyCmp);
@@ -1308,7 +1302,6 @@ describe('@defer', () => {
13081302
providers: [
13091303
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
13101304
],
1311-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
13121305
});
13131306

13141307
const fixture = TestBed.createComponent(RootCmp);
@@ -1429,7 +1422,6 @@ describe('@defer', () => {
14291422
providers: [
14301423
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
14311424
],
1432-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
14331425
});
14341426

14351427
clearDirectiveDefs(RootCmp);
@@ -1515,7 +1507,6 @@ describe('@defer', () => {
15151507
providers: [
15161508
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
15171509
],
1518-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
15191510
});
15201511

15211512
clearDirectiveDefs(RootCmp);
@@ -1597,7 +1588,6 @@ describe('@defer', () => {
15971588
providers: [
15981589
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
15991590
],
1600-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
16011591
});
16021592

16031593
clearDirectiveDefs(RootCmp);
@@ -1666,7 +1656,6 @@ describe('@defer', () => {
16661656
providers: [
16671657
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
16681658
],
1669-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
16701659
});
16711660

16721661
clearDirectiveDefs(RootCmp);
@@ -1749,7 +1738,6 @@ describe('@defer', () => {
17491738
providers: [
17501739
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
17511740
],
1752-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
17531741
});
17541742

17551743
clearDirectiveDefs(RootCmp);
@@ -1832,7 +1820,6 @@ describe('@defer', () => {
18321820
providers: [
18331821
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
18341822
],
1835-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
18361823
});
18371824

18381825
clearDirectiveDefs(RootCmp);
@@ -1904,7 +1891,6 @@ describe('@defer', () => {
19041891
...COMMON_PROVIDERS,
19051892
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
19061893
],
1907-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
19081894
});
19091895

19101896
clearDirectiveDefs(RootCmp);
@@ -2005,7 +1991,6 @@ describe('@defer', () => {
20051991
providers: [
20061992
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
20071993
],
2008-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
20091994
});
20101995

20111996
clearDirectiveDefs(RootCmp);
@@ -2088,7 +2073,6 @@ describe('@defer', () => {
20882073
providers: [
20892074
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
20902075
],
2091-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
20922076
});
20932077

20942078
clearDirectiveDefs(RootCmp);
@@ -2181,7 +2165,6 @@ describe('@defer', () => {
21812165
providers: [
21822166
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
21832167
],
2184-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
21852168
});
21862169

21872170
clearDirectiveDefs(RootCmp);
@@ -2236,7 +2219,7 @@ describe('@defer', () => {
22362219
isVisible = false;
22372220
}
22382221

2239-
TestBed.configureTestingModule({deferBlockBehavior: DeferBlockBehavior.Playthrough});
2222+
TestBed.configureTestingModule({});
22402223

22412224
clearDirectiveDefs(RootCmp);
22422225

@@ -2735,7 +2718,7 @@ describe('@defer', () => {
27352718
})
27362719
class MyCmp {
27372720
}
2738-
TestBed.configureTestingModule({deferBlockBehavior: DeferBlockBehavior.Playthrough});
2721+
TestBed.configureTestingModule({});
27392722

27402723
const appRef = TestBed.inject(ApplicationRef);
27412724
const zone = TestBed.inject(NgZone);
@@ -2782,7 +2765,6 @@ describe('@defer', () => {
27822765
}
27832766
},
27842767
],
2785-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
27862768
});
27872769

27882770
clearDirectiveDefs(MyCmp);
@@ -2831,7 +2813,6 @@ describe('@defer', () => {
28312813
}
28322814
},
28332815
],
2834-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
28352816
});
28362817

28372818
clearDirectiveDefs(MyCmp);
@@ -3090,7 +3071,6 @@ describe('@defer', () => {
30903071
}
30913072
},
30923073
],
3093-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
30943074
});
30953075

30963076
clearDirectiveDefs(MyCmp);
@@ -3145,7 +3125,6 @@ describe('@defer', () => {
31453125
}
31463126
},
31473127
],
3148-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
31493128
});
31503129

31513130
clearDirectiveDefs(MyCmp);
@@ -3207,7 +3186,6 @@ describe('@defer', () => {
32073186
providers: [
32083187
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
32093188
],
3210-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
32113189
});
32123190

32133191
clearDirectiveDefs(RootCmp);
@@ -3266,9 +3244,7 @@ describe('@defer', () => {
32663244
class RootCmp {
32673245
}
32683246

3269-
TestBed.configureTestingModule({
3270-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
3271-
});
3247+
TestBed.configureTestingModule({});
32723248

32733249
clearDirectiveDefs(RootCmp);
32743250

@@ -3337,7 +3313,6 @@ describe('@defer', () => {
33373313
providers: [
33383314
{provide: ɵDEFER_BLOCK_DEPENDENCY_INTERCEPTOR, useValue: deferDepsInterceptor},
33393315
],
3340-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
33413316
});
33423317

33433318
clearDirectiveDefs(RootCmp);
@@ -3406,7 +3381,7 @@ describe('@defer', () => {
34063381
isVisible = false;
34073382
}
34083383

3409-
TestBed.configureTestingModule({deferBlockBehavior: DeferBlockBehavior.Playthrough});
3384+
TestBed.configureTestingModule({});
34103385

34113386
clearDirectiveDefs(RootCmp);
34123387

@@ -3807,7 +3782,6 @@ describe('@defer', () => {
38073782
}
38083783
},
38093784
],
3810-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
38113785
});
38123786

38133787
clearDirectiveDefs(MyCmp);
@@ -3857,7 +3831,6 @@ describe('@defer', () => {
38573831
}
38583832
},
38593833
],
3860-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
38613834
});
38623835

38633836
clearDirectiveDefs(MyCmp);

‎packages/core/test/defer_fixture_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ describe('DeferFixture', () => {
106106
SecondDeferredComp,
107107
],
108108
providers: COMMON_PROVIDERS,
109-
deferBlockBehavior: DeferBlockBehavior.Playthrough,
110109
});
111110

112111
const componentFixture = TestBed.createComponent(DeferComp);
@@ -144,6 +143,7 @@ describe('DeferFixture', () => {
144143
SecondDeferredComp,
145144
],
146145
providers: COMMON_PROVIDERS,
146+
deferBlockBehavior: DeferBlockBehavior.Manual,
147147
});
148148

149149
const componentFixture = TestBed.createComponent(DeferComp);

‎packages/core/testing/src/test_bed.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ import {
4747

4848
import {ComponentFixture} from './component_fixture';
4949
import {MetadataOverride} from './metadata_override';
50-
import {ComponentFixtureAutoDetect, ComponentFixtureNoNgZone, ModuleTeardownOptions, TEARDOWN_TESTING_MODULE_ON_DESTROY_DEFAULT, TestComponentRenderer, TestEnvironmentOptions, TestModuleMetadata, THROW_ON_UNKNOWN_ELEMENTS_DEFAULT, THROW_ON_UNKNOWN_PROPERTIES_DEFAULT} from './test_bed_common';
50+
import {ComponentFixtureNoNgZone, DEFER_BLOCK_DEFAULT_BEHAVIOR, ModuleTeardownOptions, TEARDOWN_TESTING_MODULE_ON_DESTROY_DEFAULT, TestComponentRenderer, TestEnvironmentOptions, TestModuleMetadata, THROW_ON_UNKNOWN_ELEMENTS_DEFAULT, THROW_ON_UNKNOWN_PROPERTIES_DEFAULT} from './test_bed_common';
5151
import {TestBedCompiler} from './test_bed_compiler';
5252

53-
const DEFER_BLOCK_DEFAULT_BEHAVIOR = DeferBlockBehavior.Playthrough;
54-
5553
/**
5654
* Static methods implemented by the `TestBed`.
5755
*

‎packages/core/testing/src/test_bed_common.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export const THROW_ON_UNKNOWN_ELEMENTS_DEFAULT = false;
1818
/** Whether unknown properties in templates should throw by default. */
1919
export const THROW_ON_UNKNOWN_PROPERTIES_DEFAULT = false;
2020

21+
/** Whether defer blocks should use manual triggering or play through normally. */
22+
export const DEFER_BLOCK_DEFAULT_BEHAVIOR = DeferBlockBehavior.Playthrough;
23+
2124
/**
2225
* An abstract class for inserting the root test component element in a platform independent way.
2326
*

‎packages/core/testing/src/test_bed_compiler.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {ComponentDef, ComponentType} from '../../src/render3';
1313

1414
import {MetadataOverride} from './metadata_override';
1515
import {ComponentResolver, DirectiveResolver, NgModuleResolver, PipeResolver, Resolver} from './resolvers';
16-
import {TestModuleMetadata} from './test_bed_common';
16+
import {DEFER_BLOCK_DEFAULT_BEHAVIOR, TestModuleMetadata} from './test_bed_common';
1717

1818
enum TestingModuleOverride {
1919
DECLARATION,
@@ -112,7 +112,7 @@ export class TestBedCompiler {
112112
private testModuleType: NgModuleType<any>;
113113
private testModuleRef: NgModuleRef<any>|null = null;
114114

115-
private deferBlockBehavior = DeferBlockBehavior.Manual;
115+
private deferBlockBehavior = DEFER_BLOCK_DEFAULT_BEHAVIOR;
116116

117117
constructor(private platform: PlatformRef, private additionalModuleTypes: Type<any>|Type<any>[]) {
118118
class DynamicTestModule {}
@@ -149,7 +149,7 @@ export class TestBedCompiler {
149149
this.schemas.push(...moduleDef.schemas);
150150
}
151151

152-
this.deferBlockBehavior = moduleDef.deferBlockBehavior ?? DeferBlockBehavior.Manual;
152+
this.deferBlockBehavior = moduleDef.deferBlockBehavior ?? DEFER_BLOCK_DEFAULT_BEHAVIOR;
153153
}
154154

155155
overrideModule(ngModule: Type<any>, override: MetadataOverride<NgModule>): void {

0 commit comments

Comments
 (0)