Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion integration/harness-e2e-cli/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import {Component} from '@angular/core';
import {MatRadioButton, MatRadioGroup} from '@angular/material/radio';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
standalone: false,
imports: [MatRadioGroup, MatRadioButton],
})
export class AppComponent {
title = 'harness-e2e-cli';
Expand Down
19 changes: 0 additions & 19 deletions integration/harness-e2e-cli/src/app/app.module.ts

This file was deleted.

10 changes: 5 additions & 5 deletions integration/harness-e2e-cli/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {enableProdMode} from '@angular/core';
import {platformBrowser} from '@angular/platform-browser';
import {bootstrapApplication, provideProtractorTestingSupport} from '@angular/platform-browser';

import {AppModule} from './app/app.module';
import {environment} from './environments/environment';
import {AppComponent} from './app/app.component';

if (environment.production) {
enableProdMode();
}

platformBrowser()
.bootstrapModule(AppModule)
.catch(err => console.error(err));
bootstrapApplication(AppComponent, {
providers: [provideProtractorTestingSupport()],
}).catch(err => console.error(err));
6 changes: 0 additions & 6 deletions integration/yarn-pnp-compat/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ import {TestBed} from '@angular/core/testing';
import {AppComponent} from './app.component';

describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [AppComponent],
}).compileComponents();
});

it('should create the app', () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
Expand Down
3 changes: 2 additions & 1 deletion integration/yarn-pnp-compat/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import {Component} from '@angular/core';
import {MatButtonModule} from '@angular/material/button';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
standalone: false,
imports: [MatButtonModule],
})
export class AppComponent {
title = 'yarn-pnp-compat';
Expand Down
13 changes: 0 additions & 13 deletions integration/yarn-pnp-compat/src/app/app.module.ts

This file was deleted.

8 changes: 3 additions & 5 deletions integration/yarn-pnp-compat/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import {enableProdMode} from '@angular/core';
import {platformBrowser} from '@angular/platform-browser';
import {bootstrapApplication} from '@angular/platform-browser';

import {AppModule} from './app/app.module';
import {environment} from './environments/environment';
import {AppComponent} from './app/app.component';

if (environment.production) {
enableProdMode();
}

platformBrowser()
.bootstrapModule(AppModule)
.catch(err => console.error(err));
bootstrapApplication(AppComponent).catch(err => console.error(err));
4 changes: 2 additions & 2 deletions src/cdk/table/table.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2892,9 +2892,9 @@ class RowContextCdkTableApp {
imports: [CdkTableModule],
})
class WrapperCdkTableApp<T> implements AfterContentInit {
@ContentChildren(CdkColumnDef) columnDefs: QueryList<CdkColumnDef>;
@ContentChildren(CdkColumnDef, {descendants: false}) columnDefs: QueryList<CdkColumnDef>;
@ContentChild(CdkHeaderRowDef) headerRowDef: CdkHeaderRowDef;
@ContentChildren(CdkRowDef) rowDefs: QueryList<CdkRowDef<T>>;
@ContentChildren(CdkRowDef, {descendants: false}) rowDefs: QueryList<CdkRowDef<T>>;
@ContentChild(CdkNoDataRow) noDataRow: CdkNoDataRow;

@ViewChild(CdkTable, {static: true}) table: CdkTable<T>;
Expand Down
71 changes: 33 additions & 38 deletions src/material-experimental/column-resize/column-resize.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,40 +274,58 @@ abstract class BaseTestComponentRtl extends BaseTestComponent {
}
}

@Component({template: getTableTemplate(false), standalone: false})
@Component({
template: getTableTemplate(false),
imports: [BidiModule, MatTableModule, MatColumnResizeModule],
})
class MatResizeTest extends BaseTestComponent {
@ViewChild(MatColumnResize) columnResize: AbstractMatColumnResize;
}

@Component({
template: getTableTemplate(false),
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
imports: [BidiModule, MatTableModule, MatColumnResizeModule],
})
class MatResizeOnPushTest extends MatResizeTest {}

@Component({template: getTableTemplate(true), standalone: false})
@Component({
template: getTableTemplate(true),
imports: [BidiModule, MatTableModule, MatDefaultEnabledColumnResizeModule],
})
class MatResizeDefaultTest extends BaseTestComponent {
@ViewChild(MatDefaultEnabledColumnResize) columnResize: AbstractMatColumnResize;
}

@Component({template: getTableTemplate(true), standalone: false})
@Component({
template: getTableTemplate(true),
imports: [BidiModule, MatTableModule, MatDefaultEnabledColumnResizeModule],
})
class MatResizeDefaultRtlTest extends BaseTestComponentRtl {
@ViewChild(MatDefaultEnabledColumnResize) columnResize: AbstractMatColumnResize;
}

@Component({template: getFlexTemplate(false), standalone: false})
@Component({
template: getFlexTemplate(false),
imports: [BidiModule, MatTableModule, MatColumnResizeModule],
})
class MatResizeFlexTest extends BaseTestComponent {
@ViewChild(MatColumnResizeFlex) columnResize: AbstractMatColumnResize;
}

@Component({template: getFlexTemplate(true), standalone: false})
@Component({
template: getFlexTemplate(true),
imports: [BidiModule, MatTableModule, MatDefaultEnabledColumnResizeModule],
})
class MatResizeDefaultFlexTest extends BaseTestComponent {
@ViewChild(MatDefaultEnabledColumnResizeFlex)
columnResize: AbstractMatColumnResize;
}

@Component({template: getFlexTemplate(true), standalone: false})
@Component({
template: getFlexTemplate(true),
imports: [BidiModule, MatTableModule, MatDefaultEnabledColumnResizeModule],
})
class MatResizeDefaultFlexRtlTest extends BaseTestComponentRtl {
@ViewChild(MatDefaultEnabledColumnResizeFlex)
columnResize: AbstractMatColumnResize;
Expand Down Expand Up @@ -357,44 +375,23 @@ declare global {
}

const testCases = [
[MatColumnResizeModule, MatResizeTest, 'opt-in table-based mat-table'],
[MatColumnResizeModule, MatResizeOnPushTest, 'inside OnPush component'],
[MatColumnResizeModule, MatResizeFlexTest, 'opt-in flex-based mat-table'],
[
MatDefaultEnabledColumnResizeModule,
MatResizeDefaultTest,
'default enabled table-based mat-table',
],
[
MatDefaultEnabledColumnResizeModule,
MatResizeDefaultRtlTest,
'default enabled rtl table-based mat-table',
],
[
MatDefaultEnabledColumnResizeModule,
MatResizeDefaultFlexTest,
'default enabled flex-based mat-table',
],
[
MatDefaultEnabledColumnResizeModule,
MatResizeDefaultFlexRtlTest,
'default enabled rtl flex-based mat-table',
],
[MatResizeTest, 'opt-in table-based mat-table'],
[MatResizeOnPushTest, 'inside OnPush component'],
[MatResizeFlexTest, 'opt-in flex-based mat-table'],
[MatResizeDefaultTest, 'default enabled table-based mat-table'],
[MatResizeDefaultRtlTest, 'default enabled rtl table-based mat-table'],
[MatResizeDefaultFlexTest, 'default enabled flex-based mat-table'],
[MatResizeDefaultFlexRtlTest, 'default enabled rtl flex-based mat-table'],
] as const;

describe('Material Popover Edit', () => {
for (const [resizeModule, componentClass, label] of testCases) {
for (const [componentClass, label] of testCases) {
describe(label, () => {
let component: BaseTestComponent;
let fixture: ComponentFixture<BaseTestComponent>;

beforeEach(fakeAsync(() => {
jasmine.addMatchers(approximateMatcher);

TestBed.configureTestingModule({
imports: [BidiModule, MatTableModule, resizeModule],
declarations: [componentClass],
});
fixture = TestBed.createComponent(componentClass);
component = fixture.componentInstance;
fixture.detectChanges();
Expand Down Expand Up @@ -645,12 +642,10 @@ describe('Material Popover Edit', () => {
jasmine.addMatchers(approximateMatcher);

TestBed.configureTestingModule({
imports: [BidiModule, MatTableModule, MatColumnResizeModule],
providers: [
FakeColumnSizeStore,
{provide: ColumnSizeStore, useExisting: FakeColumnSizeStore},
],
declarations: [MatResizeOnPushTest],
});
fixture = TestBed.createComponent(MatResizeOnPushTest);
component = fixture.componentInstance;
Expand Down
8 changes: 2 additions & 6 deletions src/material-experimental/popover-edit/popover-edit.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ class ElementDataSource extends DataSource<PeriodicElement> {
margin: 16px;
}
`,
standalone: false,
imports: [MatTableModule, MatPopoverEditModule, FormsModule],
})
class MatFlexTableInCell extends BaseTestComponent {
displayedColumns = ['before', 'name', 'weight'];
Expand Down Expand Up @@ -281,7 +281,7 @@ class MatFlexTableInCell extends BaseTestComponent {
margin: 16px;
}
`,
standalone: false,
imports: [MatTableModule, MatPopoverEditModule, FormsModule],
})
class MatTableInCell extends BaseTestComponent {
displayedColumns = ['before', 'name', 'weight'];
Expand All @@ -300,10 +300,6 @@ describe('Material Popover Edit', () => {
let fixture: ComponentFixture<BaseTestComponent>;

beforeEach(fakeAsync(() => {
TestBed.configureTestingModule({
imports: [MatTableModule, MatPopoverEditModule, FormsModule],
declarations: [componentClass],
});
fixture = TestBed.createComponent(componentClass);
component = fixture.componentInstance;
fixture.detectChanges();
Expand Down
Loading
Loading