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

Commit a5f830c

Browse files
CaerusKaruCaerusKaru
committed
refactor: use absolute imports in spec files
In order to ensure that only one Injector is used in the test suite, we need to ensure that we import all artifacts from the same place, compilation-wise.
1 parent 667809c commit a5f830c

File tree

10 files changed

+42
-102
lines changed

10 files changed

+42
-102
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190

191191
- *checkout_code
192192
- *attach_release_output
193-
- yarn stamp
193+
- run: yarn stamp
194194

195195
# CircleCI has a config setting to enforce SSH for all github connections.
196196
# This is not compatible with our mechanism of using a Personal Access Token

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"build": "ng build",
2121
"stamp": "ts-node tools/package-tools/version-placeholders.ts --module=commonjs",
2222
"build:universal-demo-app": "ng run universal-demo-app:build:production && ng run universal-demo-app:server",
23-
"test": "ng test",
23+
"test": "ng test @angular/flex-layout",
2424
"test:ssr": "webpack --config test/webpack-spec-ssr-bundle.js && jasmine --config=test/jasmine-ssr.json",
2525
"lint": "stylelint projects/libs/**/*.scss --config=stylelint-config.json && tslint --project ./tsconfig.json --config tslint.json"
2626
},

‎projects/libs/flex-layout/core/breakpoints/data/orientation-break-points.spec.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77
*/
88

99
import {TestBed, inject, async} from '@angular/core/testing';
10-
11-
import {BreakPoint} from '../break-point';
12-
import {DEFAULT_BREAKPOINTS} from './break-points';
13-
import {ORIENTATION_BREAKPOINTS} from './orientation-break-points';
14-
import {BREAKPOINTS} from '../break-points-token';
15-
import {FlexLayoutModule} from '../../../module';
10+
import {FlexLayoutModule} from '@angular/flex-layout';
11+
import {BreakPoint, BREAKPOINTS, DEFAULT_BREAKPOINTS, ORIENTATION_BREAKPOINTS} from '@angular/flex-layout/core';
1612

1713
describe('break-point-provider', () => {
1814
let breakPoints: BreakPoint[];

‎projects/libs/flex-layout/extended/show-hide/show.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ import {
1616
SERVER_TOKEN,
1717
StyleUtils,
1818
} from '@angular/flex-layout/core';
19-
import {FlexLayoutModule} from '../../module';
20-
21-
import {customMatchers} from '@angular/flex-layout/_private-utils/testing';
19+
import {FlexLayoutModule} from '@angular/flex-layout';
2220
import {
21+
customMatchers,
2322
makeCreateTestComponent,
2423
expectNativeEl,
2524
expectEl,
@@ -29,7 +28,8 @@ import {MatFormFieldModule} from '@angular/material/form-field';
2928
import {FormsModule} from '@angular/forms';
3029
import {MatSelectModule} from '@angular/material/select';
3130
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
32-
import {ShowHideDirective} from './show-hide';
31+
import {ShowHideDirective} from '@angular/flex-layout/extended';
32+
3333

3434
describe('show directive', () => {
3535
let fixture: ComponentFixture<any>;

‎projects/libs/flex-layout/flex/flex-offset/flex-offset.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@ import {
1515
StyleBuilder,
1616
StyleUtils,
1717
} from '@angular/flex-layout/core';
18-
19-
import {FlexLayoutModule} from '../../module';
20-
import {customMatchers} from '@angular/flex-layout/_private-utils/testing';
18+
import {FlexLayoutModule} from '@angular/flex-layout';
2119
import {
20+
customMatchers,
2221
makeCreateTestComponent,
2322
queryFor,
2423
expectEl,
2524
expectNativeEl,
2625
} from '@angular/flex-layout/_private-utils/testing';
27-
import {FlexModule} from '../module';
28-
import {FlexOffsetStyleBuilder} from './flex-offset';
26+
import {FlexModule, FlexOffsetStyleBuilder} from '@angular/flex-layout/flex';
27+
2928

3029
describe('flex-offset directive', () => {
3130
let fixture: ComponentFixture<any>;

‎projects/libs/flex-layout/flex/flex/flex.spec.ts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ import {
1616
StyleBuilder,
1717
StyleUtils,
1818
} from '@angular/flex-layout/core';
19-
20-
import {FlexLayoutModule} from '../../module';
21-
import {DefaultFlexDirective, FlexStyleBuilder} from './flex';
22-
import {DefaultLayoutDirective} from '../layout/layout';
23-
import {customMatchers, expect} from '@angular/flex-layout/_private-utils/testing';
19+
import {FlexLayoutModule} from '@angular/flex-layout';
20+
import {DefaultFlexDirective, DefaultLayoutDirective, FlexStyleBuilder} from '@angular/flex-layout/flex';
2421
import {
22+
customMatchers,
23+
expect,
2524
makeCreateTestComponent,
2625
expectNativeEl,
2726
queryFor,
2827
expectEl,
2928
} from '@angular/flex-layout/_private-utils/testing';
3029

30+
3131
describe('flex directive', () => {
3232
let fixture: ComponentFixture<any>;
3333
let mediaController: MockMatchMedia;
@@ -367,7 +367,7 @@ describe('flex directive', () => {
367367
'flex': '1 1 1e-09px',
368368
'box-sizing': 'border-box',
369369
}, styler);
370-
} else if (platform.FIREFOX) {
370+
} else if (platform.FIREFOX || platform.WEBKIT || platform.IOS) {
371371
expectEl(element).toHaveStyle({
372372
'flex': '1 1 1e-9px',
373373
'box-sizing': 'border-box',
@@ -471,7 +471,14 @@ describe('flex directive', () => {
471471
it('should work with calc values', () => {
472472
// @see http://caniuse.com/#feat=calc for IE issues with calc()
473473
componentWithTemplate(`<div fxFlex='calc(30vw - 10px)'></div>`);
474-
if (!(platform.FIREFOX || platform.EDGE)) {
474+
if (platform.WEBKIT || platform.IOS) {
475+
expectNativeEl(fixture).toHaveStyle({
476+
'box-sizing': 'border-box',
477+
'flex-grow': '1',
478+
'flex-shrink': '1',
479+
'flex-basis': 'calc(-10px + 30vw)'
480+
}, styler);
481+
} else if (!(platform.FIREFOX || platform.EDGE)) {
475482
expectNativeEl(fixture).toHaveStyle({
476483
'box-sizing': 'border-box',
477484
'flex-grow': '1',

‎projects/libs/flex-layout/flex/layout-align/layout-align.spec.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ import {
1717
StyleBuilder,
1818
StyleUtils,
1919
} from '@angular/flex-layout/core';
20-
21-
import {FlexLayoutModule} from '../../module';
20+
import {FlexLayoutModule} from '@angular/flex-layout';
2221
import {extendObject} from '@angular/flex-layout/_private-utils';
23-
import {customMatchers} from '@angular/flex-layout/_private-utils/testing';
24-
import {makeCreateTestComponent, expectNativeEl} from '@angular/flex-layout/_private-utils/testing';
25-
import {FlexModule} from '../module';
26-
import {LayoutAlignStyleBuilder} from './layout-align';
22+
import {customMatchers, makeCreateTestComponent, expectNativeEl} from '@angular/flex-layout/_private-utils/testing';
23+
import {FlexModule, LayoutAlignStyleBuilder} from '@angular/flex-layout/flex';
24+
2725

2826
describe('layout-align directive', () => {
2927
let fixture: ComponentFixture<any>;

‎projects/libs/flex-layout/flex/layout-gap/layout-gap.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ import {
1717
StyleBuilder,
1818
StyleUtils,
1919
} from '@angular/flex-layout/core';
20-
21-
import {FlexLayoutModule} from '../../module';
22-
import {customMatchers, expect} from '@angular/flex-layout/_private-utils/testing';
20+
import {FlexLayoutModule} from '@angular/flex-layout';
2321
import {
22+
customMatchers,
23+
expect,
2424
expectEl,
2525
expectNativeEl,
2626
makeCreateTestComponent,
2727
queryFor,
2828
} from '@angular/flex-layout/_private-utils/testing';
29-
import {FlexModule} from '../module';
30-
import {LayoutGapStyleBuilder} from './layout-gap';
29+
import {FlexModule, LayoutGapStyleBuilder} from '@angular/flex-layout/flex';
30+
3131

3232
describe('layout-gap directive', () => {
3333
let fixture: ComponentFixture<any>;

‎projects/libs/flex-layout/flex/layout/layout.spec.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ import {
1616
StyleBuilder,
1717
StyleUtils,
1818
} from '@angular/flex-layout/core';
19+
import {FlexLayoutModule} from '@angular/flex-layout';
20+
import {customMatchers, makeCreateTestComponent, expectNativeEl, expectEl, queryFor} from '@angular/flex-layout/_private-utils/testing';
21+
import {FlexModule, LayoutStyleBuilder} from '@angular/flex-layout/flex';
1922

20-
import {FlexLayoutModule} from '../../module';
21-
import {customMatchers} from '@angular/flex-layout/_private-utils/testing';
22-
import {makeCreateTestComponent, expectNativeEl, expectEl} from '@angular/flex-layout/_private-utils/testing';
23-
import {queryFor} from '@angular/flex-layout/_private-utils/testing';
24-
import {FlexModule} from '../module';
25-
import {LayoutStyleBuilder} from './layout';
2623

2724
describe('layout directive', () => {
2825
let fixture: ComponentFixture<any>;

‎projects/libs/flex-layout/grid/auto/auto.spec.ts‎

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,22 @@ import {
1616
SERVER_TOKEN,
1717
StyleUtils,
1818
} from '@angular/flex-layout/core';
19+
import {GridModule} from '@angular/flex-layout/grid';
20+
import {customMatchers, expectNativeEl, makeCreateTestComponent} from '@angular/flex-layout/_private-utils/testing';
1921

20-
import {customMatchers} from '@angular/flex-layout/_private-utils/testing';
21-
import {expectNativeEl, makeCreateTestComponent} from '@angular/flex-layout/_private-utils/testing';
22-
23-
import {GridModule} from '../module';
2422

2523
describe('grid auto parent directive', () => {
2624
let fixture: ComponentFixture<any>;
2725
let styler: StyleUtils;
2826
let mediaController: MockMatchMedia;
2927
let platform: Platform;
30-
let shouldRun = true;
3128
let createTestComponent = (template: string, styles?: any) => {
32-
shouldRun = true;
3329
fixture = makeCreateTestComponent(() => TestGridAutoComponent)(template, styles);
3430
inject([StyleUtils, MatchMedia, Platform],
3531
(_styler: StyleUtils, _matchMedia: MockMatchMedia, _platform: Platform) => {
3632
styler = _styler;
3733
mediaController = _matchMedia;
3834
platform = _platform;
39-
40-
// TODO(CaerusKaru): Grid tests won't work with Edge 14
41-
if (_platform.EDGE) {
42-
shouldRun = false;
43-
}
4435
})();
4536
};
4637

@@ -69,10 +60,6 @@ describe('grid auto parent directive', () => {
6960
`;
7061
createTestComponent(template);
7162

72-
if (!shouldRun) {
73-
return;
74-
}
75-
7663
expectNativeEl(fixture).toHaveStyle({
7764
'display': 'grid',
7865
'grid-auto-flow': 'row'
@@ -89,10 +76,6 @@ describe('grid auto parent directive', () => {
8976
`;
9077
createTestComponent(template);
9178

92-
if (!shouldRun) {
93-
return;
94-
}
95-
9679
expectNativeEl(fixture).toHaveStyle({
9780
'display': 'inline-grid',
9881
'grid-auto-flow': 'row'
@@ -109,10 +92,6 @@ describe('grid auto parent directive', () => {
10992
`;
11093
createTestComponent(template);
11194

112-
if (!shouldRun) {
113-
return;
114-
}
115-
11695
expectNativeEl(fixture).toHaveStyle({
11796
'display': 'grid',
11897
'grid-auto-flow': 'row'
@@ -129,10 +108,6 @@ describe('grid auto parent directive', () => {
129108
`;
130109
createTestComponent(template);
131110

132-
if (!shouldRun) {
133-
return;
134-
}
135-
136111
expectNativeEl(fixture).toHaveStyle({
137112
'display': 'grid',
138113
'grid-auto-flow': 'column'
@@ -149,13 +124,9 @@ describe('grid auto parent directive', () => {
149124
`;
150125
createTestComponent(template);
151126

152-
if (!shouldRun) {
153-
return;
154-
}
155-
156127
expectNativeEl(fixture).toHaveStyle({
157128
'display': 'grid',
158-
'grid-auto-flow': platform.EDGE ? 'row dense' : 'dense'
129+
'grid-auto-flow': 'dense'
159130
}, styler);
160131
});
161132

@@ -169,13 +140,9 @@ describe('grid auto parent directive', () => {
169140
`;
170141
createTestComponent(template);
171142

172-
if (!shouldRun) {
173-
return;
174-
}
175-
176143
expectNativeEl(fixture).toHaveStyle({
177144
'display': 'grid',
178-
'grid-auto-flow': platform.EDGE ? 'row dense' : 'dense'
145+
'grid-auto-flow': 'dense'
179146
}, styler);
180147
});
181148

@@ -189,10 +156,6 @@ describe('grid auto parent directive', () => {
189156
`;
190157
createTestComponent(template);
191158

192-
if (!shouldRun) {
193-
return;
194-
}
195-
196159
expectNativeEl(fixture).toHaveStyle({
197160
'display': 'grid',
198161
'grid-auto-flow': 'column dense'
@@ -209,10 +172,6 @@ describe('grid auto parent directive', () => {
209172
`;
210173
createTestComponent(template);
211174

212-
if (!shouldRun) {
213-
return;
214-
}
215-
216175
expectNativeEl(fixture).toHaveStyle({
217176
'display': 'grid',
218177
'grid-auto-flow': platform.FIREFOX ? 'dense' : 'row dense',
@@ -229,10 +188,6 @@ describe('grid auto parent directive', () => {
229188
`;
230189
createTestComponent(template);
231190

232-
if (!shouldRun) {
233-
return;
234-
}
235-
236191
expectNativeEl(fixture).toHaveStyle({
237192
'display': 'grid',
238193
'grid-auto-flow': platform.FIREFOX ? 'dense' : 'row dense'
@@ -249,10 +204,6 @@ describe('grid auto parent directive', () => {
249204
`;
250205
createTestComponent(template);
251206

252-
if (!shouldRun) {
253-
return;
254-
}
255-
256207
expectNativeEl(fixture).toHaveStyle({
257208
'display': 'grid',
258209
'grid-auto-flow': 'column'
@@ -265,10 +216,6 @@ describe('grid auto parent directive', () => {
265216
`;
266217
createTestComponent(template);
267218

268-
if (!shouldRun) {
269-
return;
270-
}
271-
272219
expectNativeEl(fixture).toHaveStyle({
273220
'display': 'grid',
274221
'grid-auto-flow': 'row'
@@ -291,10 +238,6 @@ describe('grid auto parent directive', () => {
291238
`;
292239
createTestComponent(template);
293240

294-
if (!shouldRun) {
295-
return;
296-
}
297-
298241
expectNativeEl(fixture).toHaveStyle({
299242
'display': 'grid',
300243
'grid-auto-flow': 'row'

0 commit comments

Comments
 (0)