Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit a77de3c

Browse files
fix(tests): remove unneeded async() wrappers in karma tests
1 parent 484a280 commit a77de3c

File tree

6 files changed

+25
-30
lines changed

6 files changed

+25
-30
lines changed

src/lib/flexbox/api/flex.spec.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
import {Component, OnInit, DebugElement} from '@angular/core';
22
import {CommonModule} from '@angular/common';
3-
import {ComponentFixture, TestBed, async } from '@angular/core/testing';
3+
import {ComponentFixture, TestBed } from '@angular/core/testing';
44

55
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
66
import {MatchMedia} from '../../media-query/match-media';
77
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
88
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
99
import {FlexLayoutModule} from '../_module';
1010

11-
import {customMatchers, expect} from '../../utils/testing/custom-matchers';
11+
import {customMatchers} from '../../utils/testing/custom-matchers';
1212
import {makeCreateTestComponent, makeExpectDOMFrom, makeExpectDOMForQuery} from '../../utils/testing/helpers';
1313

1414
describe('flex directive', () => {
1515
let fixture: ComponentFixture<any>;
16-
let createTestComponent = makeCreateTestComponent(()=> TestFlexComponent);
1716
let expectDOMFrom = makeExpectDOMFrom(()=> TestFlexComponent);
1817
let expectDomForQuery = makeExpectDOMForQuery(()=> TestFlexComponent);
19-
let activateMediaQuery = (alias, allowOverlaps?:boolean) => {
20-
let matchMedia : MockMatchMedia = fixture.debugElement.injector.get(MatchMedia);
21-
matchMedia.activate(alias,allowOverlaps);
22-
};
2318

24-
beforeEach(async(() => {
19+
beforeEach(() => {
2520
jasmine.addMatchers(customMatchers);
2621

2722
// Configure testbed to prepare services
@@ -33,7 +28,7 @@ describe('flex directive', () => {
3328
{provide: MatchMedia, useClass: MockMatchMedia}
3429
]
3530
})
36-
}));
31+
});
3732
afterEach(() => {
3833
if ( fixture ) {
3934
fixture.debugElement.injector.get(MatchMedia).clearAll();

src/lib/flexbox/api/hide.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import {Component, OnInit, DebugElement} from '@angular/core';
1+
import {Component, OnInit} from '@angular/core';
22
import {CommonModule} from '@angular/common';
3-
import {ComponentFixture, TestBed, async } from '@angular/core/testing';
3+
import {ComponentFixture, TestBed } from '@angular/core/testing';
44

55
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
66
import {MatchMedia} from '../../media-query/match-media';
77
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
88
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
99
import {FlexLayoutModule} from '../_module';
1010

11-
import {customMatchers, expect} from '../../utils/testing/custom-matchers';
12-
import {makeCreateTestComponent, makeExpectDOMFrom, expectNativeEl} from '../../utils/testing/helpers';
11+
import {customMatchers} from '../../utils/testing/custom-matchers';
12+
import {makeCreateTestComponent, expectNativeEl} from '../../utils/testing/helpers';
1313

1414
describe('show directive', () => {
1515
let fixture: ComponentFixture<any>;
@@ -19,7 +19,7 @@ describe('show directive', () => {
1919
matchMedia.activate(alias);
2020
};
2121

22-
beforeEach(async(() => {
22+
beforeEach(() => {
2323
jasmine.addMatchers(customMatchers);
2424

2525
// Configure testbed to prepare services
@@ -31,7 +31,7 @@ describe('show directive', () => {
3131
{provide: MatchMedia, useClass: MockMatchMedia}
3232
]
3333
})
34-
}));
34+
});
3535
afterEach(() => {
3636
if ( fixture ) {
3737
fixture.debugElement.injector.get(MatchMedia).clearAll();

src/lib/flexbox/api/layout-align.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, OnInit} from '@angular/core';
22
import {CommonModule} from '@angular/common';
3-
import {ComponentFixture, TestBed, async } from '@angular/core/testing';
3+
import {ComponentFixture, TestBed } from '@angular/core/testing';
44

55
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
66
import {MatchMedia} from '../../media-query/match-media';
@@ -17,7 +17,7 @@ describe('layout-align directive', () => {
1717
let createTestComponent = makeCreateTestComponent(()=> TestLayoutAlignComponent);
1818
let expectDOMFrom = makeExpectDOMFrom(()=> TestLayoutAlignComponent);
1919

20-
beforeEach(async(() => {
20+
beforeEach(() => {
2121
jasmine.addMatchers(customMatchers);
2222

2323
// Configure testbed to prepare services
@@ -29,7 +29,7 @@ describe('layout-align directive', () => {
2929
{provide: MatchMedia, useClass: MockMatchMedia}
3030
]
3131
})
32-
}));
32+
});
3333
afterEach(() => {
3434
if ( fixture ) {
3535
fixture.debugElement.injector.get(MatchMedia).clearAll();

src/lib/flexbox/api/layout.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, OnInit} from '@angular/core';
22
import {CommonModule} from '@angular/common';
3-
import {ComponentFixture, TestBed, async } from '@angular/core/testing';
3+
import {ComponentFixture, TestBed } from '@angular/core/testing';
44

55
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
66
import {MatchMedia} from '../../media-query/match-media';
@@ -20,7 +20,7 @@ describe('layout directive', () => {
2020
matchMedia.activate(alias,allowOverlaps);
2121
};
2222

23-
beforeEach(async(() => {
23+
beforeEach(() => {
2424
jasmine.addMatchers(customMatchers);
2525

2626
// Configure testbed to prepare services
@@ -32,7 +32,7 @@ describe('layout directive', () => {
3232
{provide: MatchMedia, useClass: MockMatchMedia}
3333
]
3434
})
35-
}));
35+
});
3636
afterEach(() => {
3737
if ( fixture ) {
3838
fixture.debugElement.injector.get(MatchMedia).clearAll();

src/lib/flexbox/api/show.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import {Component, OnInit, DebugElement} from '@angular/core';
1+
import {Component, OnInit} from '@angular/core';
22
import {CommonModule} from '@angular/common';
3-
import {ComponentFixture, TestBed, async } from '@angular/core/testing';
3+
import {ComponentFixture, TestBed } from '@angular/core/testing';
44

55
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
66
import {MatchMedia} from '../../media-query/match-media';
77
import {BreakPointsProvider} from '../../media-query/providers/break-points-provider';
88
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
99
import {FlexLayoutModule} from '../_module';
1010

11-
import {customMatchers, expect} from '../../utils/testing/custom-matchers';
12-
import {makeCreateTestComponent, makeExpectDOMFrom, expectNativeEl} from '../../utils/testing/helpers';
11+
import {customMatchers} from '../../utils/testing/custom-matchers';
12+
import {makeCreateTestComponent, expectNativeEl} from '../../utils/testing/helpers';
1313

1414
describe('show directive', () => {
1515
let fixture: ComponentFixture<any>;
@@ -19,7 +19,7 @@ describe('show directive', () => {
1919
matchMedia.activate(alias, enableOverlaps);
2020
};
2121

22-
beforeEach(async(() => {
22+
beforeEach(() => {
2323
jasmine.addMatchers(customMatchers);
2424

2525
// Configure testbed to prepare services
@@ -31,7 +31,7 @@ describe('show directive', () => {
3131
{provide: MatchMedia, useClass: MockMatchMedia}
3232
]
3333
})
34-
}));
34+
});
3535
afterEach(() => {
3636
if ( fixture ) {
3737
fixture.debugElement.injector.get(MatchMedia).clearAll();

src/lib/flexbox/responsive/responsive-activation.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'rxjs/add/operator/filter';
44
import 'rxjs/add/operator/map';
55
import {Observable} from 'rxjs/Observable';
66

7-
import { TestBed, inject, async } from '@angular/core/testing';
7+
import { TestBed, inject } from '@angular/core/testing';
88

99
import {MockMatchMedia} from '../../media-query/mock/mock-match-media';
1010
import {BreakPointRegistry} from '../../media-query/breakpoints/break-point-registry';
@@ -46,14 +46,14 @@ describe('responsive-activation', () => {
4646
});
4747

4848
// Single async inject to save references; which are used in all tests below
49-
beforeEach( async(inject(
49+
beforeEach(inject(
5050
[ BreakPointRegistry, MatchMedia, MediaMonitor ],
5151
(_breakPoints_, _matchMedia_, _mediaMonitor_) => {
5252
breakPoints = _breakPoints_; // Only used to look up mediaQuery by aliases
5353
matchMedia = _matchMedia_; // Only used to manual/simulate activate a mediaQuery
5454
monitor = _mediaMonitor_;
5555
}
56-
)));
56+
));
5757

5858
it('does not report mediaQuery changes for static usages', () => {
5959
let value;

0 commit comments

Comments
 (0)