Skip to content

Commit 9e4ac7d

Browse files
committed
docs: opt docs app back into zonejs
Also opt in the e2e app and some failing docs tests.
1 parent bbdaedf commit 9e4ac7d

File tree

5 files changed

+25
-21
lines changed

5 files changed

+25
-21
lines changed

docs/src/app/pages/component-sidenav/component-sidenav.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
import {provideZoneChangeDetection} from '@angular/core';
12
import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
2-
import {take} from 'rxjs/operators';
3-
import {ComponentSidenav} from './component-sidenav';
43
import {MatSidenav} from '@angular/material/sidenav';
54
import {provideRouter} from '@angular/router';
5+
import {take} from 'rxjs/operators';
6+
import {ComponentSidenav} from './component-sidenav';
67

78
describe('ComponentSidenav', () => {
89
let fixture: ComponentFixture<ComponentSidenav>;
910
let component: ComponentSidenav;
1011

1112
beforeEach(() => {
1213
TestBed.configureTestingModule({
13-
providers: [provideRouter([])],
14+
providers: [provideRouter([]), provideZoneChangeDetection()],
1415
});
1516

1617
fixture = TestBed.createComponent(ComponentSidenav);

docs/src/app/shared/carousel/carousel.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import {Component, ViewChild} from '@angular/core';
1+
import {Component, provideZoneChangeDetection, ViewChild} from '@angular/core';
22
import {ComponentFixture, fakeAsync, flush, TestBed} from '@angular/core/testing';
3-
import {Carousel, CarouselItem} from './carousel';
43
import {provideRouter} from '@angular/router';
4+
import {Carousel, CarouselItem} from './carousel';
55

66
describe('HorizontalCarousel', () => {
77
let fixture: ComponentFixture<CarouselTestComponent>;
88
let component: Carousel;
99

1010
beforeEach(fakeAsync(() => {
1111
TestBed.configureTestingModule({
12-
providers: [provideRouter([])],
12+
providers: [provideRouter([]), provideZoneChangeDetection()],
1313
});
1414
fixture = TestBed.createComponent(CarouselTestComponent);
1515
fixture.nativeElement.style.width = '1300px';

docs/src/app/shared/doc-viewer/doc-viewer.spec.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import {Clipboard} from '@angular/cdk/clipboard';
2+
import {provideHttpClient} from '@angular/common/http';
13
import {HttpTestingController, provideHttpClientTesting} from '@angular/common/http/testing';
2-
import {Component} from '@angular/core';
4+
import {Component, provideZoneChangeDetection} from '@angular/core';
35
import {TestBed} from '@angular/core/testing';
4-
import {By} from '@angular/platform-browser';
5-
import {DocViewer} from './doc-viewer';
6-
import {ExampleViewer} from '../example-viewer/example-viewer';
7-
import {MatTooltip} from '@angular/material/tooltip';
86
import {MatIconButton} from '@angular/material/button';
9-
import {Clipboard} from '@angular/cdk/clipboard';
10-
import {provideHttpClient} from '@angular/common/http';
7+
import {MatTooltip} from '@angular/material/tooltip';
8+
import {By} from '@angular/platform-browser';
119
import {provideRouter} from '@angular/router';
10+
import {ExampleViewer} from '../example-viewer/example-viewer';
11+
import {DocViewer} from './doc-viewer';
1212

1313
describe('DocViewer', () => {
1414
let http: HttpTestingController;
@@ -22,6 +22,7 @@ describe('DocViewer', () => {
2222
provideRouter([]),
2323
provideHttpClient(),
2424
provideHttpClientTesting(),
25+
provideZoneChangeDetection(),
2526
],
2627
});
2728

docs/src/main.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {ErrorHandler} from '@angular/core';
109
import {provideHttpClient} from '@angular/common/http';
10+
import {ErrorHandler, provideZoneChangeDetection} from '@angular/core';
1111

12-
import {unregisterServiceWorkers} from './unregister-service-workers';
12+
import {LocationStrategy, PathLocationStrategy} from '@angular/common';
13+
import {bootstrapApplication} from '@angular/platform-browser';
14+
import {provideRouter, withInMemoryScrolling} from '@angular/router';
1315
import {MaterialDocsApp} from './app/material-docs-app';
1416
import {MATERIAL_DOCS_ROUTES} from './app/routes';
15-
import {withInMemoryScrolling, provideRouter} from '@angular/router';
16-
import {bootstrapApplication} from '@angular/platform-browser';
1717
import {AnalyticsErrorReportHandler} from './app/shared/analytics/error-report-handler';
18-
import {LocationStrategy, PathLocationStrategy} from '@angular/common';
18+
import {unregisterServiceWorkers} from './unregister-service-workers';
1919

2020
// Unregister all installed service workers and force reload the page if there was
2121
// an old service worker from a previous version of the docs.
@@ -33,5 +33,6 @@ bootstrapApplication(MaterialDocsApp, {
3333
}),
3434
),
3535
provideHttpClient(),
36+
provideZoneChangeDetection(),
3637
],
3738
}).catch(err => console.error(err));

src/e2e-app/main.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import {enableProdMode} from '@angular/core';
1+
import {enableProdMode, provideZoneChangeDetection} from '@angular/core';
22
import {bootstrapApplication, provideProtractorTestingSupport} from '@angular/platform-browser';
33
import {provideRouter} from '@angular/router';
44

5-
import {E2eApp} from './components/e2e-app/e2e-app';
6-
import {Home} from './components/home';
75
import {BlockScrollStrategyE2E} from './components/block-scroll-strategy/block-scroll-strategy-e2e';
86
import {ComponentHarnessE2e} from './components/component-harness-e2e';
7+
import {E2eApp} from './components/e2e-app/e2e-app';
8+
import {Home} from './components/home';
99
import {SliderE2e} from './components/slider-e2e';
1010
import {VirtualScrollE2E} from './components/virtual-scroll/virtual-scroll-e2e';
1111

@@ -21,5 +21,6 @@ bootstrapApplication(E2eApp, {
2121
{path: 'slider', component: SliderE2e},
2222
{path: 'virtual-scroll', component: VirtualScrollE2E},
2323
]),
24+
provideZoneChangeDetection(),
2425
],
2526
});

0 commit comments

Comments
 (0)