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

Commit 1523765

Browse files
filipesilvafilipesilva
committed
test(@angular-devkit/build-webpack): use workspace file
1 parent 5d6e73e commit 1523765

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+333
-507
lines changed

‎packages/angular_devkit/build_webpack/test/browser/allow-js_spec_large.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
*/
88

99
import { tap } from 'rxjs/operators';
10-
import { TestProjectHost, browserWorkspaceTarget, runTargetSpec, workspaceRoot } from '../utils';
10+
import { browserTargetSpec, host, runTargetSpec } from '../utils';
1111

1212

1313
describe('Browser Builder allow js', () => {
14-
const host = new TestProjectHost(workspaceRoot);
15-
1614
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
1715
afterEach(done => host.restore().subscribe(undefined, done.fail, done));
1816

@@ -25,7 +23,7 @@ describe('Browser Builder allow js', () => {
2523
// TODO: this test originally edited tsconfig to have `"allowJs": true` but works without it.
2624
// Investigate.
2725

28-
runTargetSpec(host, browserWorkspaceTarget).pipe(
26+
runTargetSpec(host, browserTargetSpec).pipe(
2927
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
3028
).subscribe(undefined, done.fail, done);
3129
}, 30000);
@@ -38,7 +36,7 @@ describe('Browser Builder allow js', () => {
3836

3937
const overrides = { aot: true };
4038

41-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
39+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
4240
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
4341
).subscribe(undefined, done.fail, done);
4442
}, 30000);

‎packages/angular_devkit/build_webpack/test/browser/aot_spec_large.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
import { join, normalize, virtualFs } from '@angular-devkit/core';
1010
import { tap } from 'rxjs/operators';
11-
import { TestProjectHost, browserWorkspaceTarget, runTargetSpec, workspaceRoot } from '../utils';
11+
import { browserTargetSpec, host, runTargetSpec } from '../utils';
1212

1313

1414
describe('Browser Builder', () => {
15-
const host = new TestProjectHost(workspaceRoot);
1615
const outputPath = normalize('dist');
1716

1817
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
@@ -21,7 +20,7 @@ describe('Browser Builder', () => {
2120
it('works', (done) => {
2221
const overrides = { aot: true };
2322

24-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
23+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
2524
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
2625
tap(() => {
2726
const fileName = join(outputPath, 'main.js');

‎packages/angular_devkit/build_webpack/test/browser/assets_spec_large.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88

99
import { normalize, virtualFs } from '@angular-devkit/core';
1010
import { tap } from 'rxjs/operators';
11-
import { TestProjectHost, browserWorkspaceTarget, runTargetSpec, workspaceRoot } from '../utils';
11+
import { browserTargetSpec, host, runTargetSpec } from '../utils';
1212

1313

1414
describe('Browser Builder assets', () => {
15-
const host = new TestProjectHost(workspaceRoot);
16-
1715
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
1816
afterEach(done => host.restore().subscribe(undefined, done.fail, done));
1917

@@ -39,7 +37,7 @@ describe('Browser Builder assets', () => {
3937
],
4038
};
4139

42-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
40+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
4341
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
4442
tap(() => {
4543
// Assets we expect should be there.
@@ -68,7 +66,7 @@ describe('Browser Builder assets', () => {
6866
// ],
6967
// };
7068

71-
// architect.loadWorkspaceFromJson(makeWorkspace(browserWorkspaceTarget)).pipe(
69+
// architect.loadWorkspaceFromJson(makeWorkspace(browserTargetSpec)).pipe(
7270
// concatMap(() => architect.run(architect.getTarget({ overrides }))),
7371
// ).subscribe(undefined, (err) => {
7472
// expect(err.message)
@@ -92,7 +90,7 @@ describe('Browser Builder assets', () => {
9290
],
9391
};
9492

95-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
93+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
9694
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
9795
).subscribe(undefined, done.fail, done);
9896
}, 30000);

‎packages/angular_devkit/build_webpack/test/browser/base-href_spec_large.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
import { join, normalize, virtualFs } from '@angular-devkit/core';
1010
import { tap } from 'rxjs/operators';
11-
import { TestProjectHost, browserWorkspaceTarget, runTargetSpec, workspaceRoot } from '../utils';
11+
import { browserTargetSpec, host, runTargetSpec } from '../utils';
1212

1313

1414
describe('Browser Builder base href', () => {
15-
const host = new TestProjectHost(workspaceRoot);
1615
const outputPath = normalize('dist');
1716

1817
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
@@ -26,7 +25,7 @@ describe('Browser Builder base href', () => {
2625

2726
const overrides = { baseHref: '/myUrl' };
2827

29-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
28+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
3029
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
3130
tap(() => {
3231
const fileName = join(outputPath, 'index.html');

‎packages/angular_devkit/build_webpack/test/browser/build-optimizer_spec_large.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88

99
import { join, normalize, virtualFs } from '@angular-devkit/core';
1010
import { tap } from 'rxjs/operators';
11-
import { TestProjectHost, browserWorkspaceTarget, runTargetSpec, workspaceRoot } from '../utils';
11+
import { browserTargetSpec, host, runTargetSpec } from '../utils';
1212

1313

1414
describe('Browser Builder build optimizer', () => {
15-
const host = new TestProjectHost(workspaceRoot);
1615
const outputPath = normalize('dist');
1716

1817
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
1918
afterEach(done => host.restore().subscribe(undefined, done.fail, done));
2019

2120
it('works', (done) => {
2221
const overrides = { aot: true, buildOptimizer: true };
23-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
22+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
2423
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
2524
tap(() => {
2625
const fileName = join(outputPath, 'main.js');

‎packages/angular_devkit/build_webpack/test/browser/circular-dependency_spec_large.ts

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

99
import { tap } from 'rxjs/operators';
10-
import {
11-
TestLogger,
12-
TestProjectHost,
13-
browserWorkspaceTarget,
14-
runTargetSpec,
15-
workspaceRoot,
16-
} from '../utils';
10+
import { TestLogger, browserTargetSpec, host, runTargetSpec } from '../utils';
1711

1812

1913
describe('Browser Builder circular dependency detection', () => {
20-
const host = new TestProjectHost(workspaceRoot);
21-
2214
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
2315
afterEach(done => host.restore().subscribe(undefined, done.fail, done));
2416

@@ -29,7 +21,7 @@ describe('Browser Builder circular dependency detection', () => {
2921
const overrides = { baseHref: '/myUrl' };
3022
const logger = new TestLogger('circular-dependencies');
3123

32-
runTargetSpec(host, browserWorkspaceTarget, overrides, logger).pipe(
24+
runTargetSpec(host, browserTargetSpec, overrides, logger).pipe(
3325
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
3426
tap(() => expect(logger.includes('Circular dependency detected')).toBe(true)),
3527
).subscribe(undefined, done.fail, done);

‎packages/angular_devkit/build_webpack/test/browser/custom-lazy-modules_spec_large.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
// import { Architect } from '@angular-devkit/architect';
1010
// import { join, normalize } from '@angular-devkit/core';
1111
// import { concatMap, tap, toArray } from 'rxjs/operators';
12-
// import { TestProjectHost, browserWorkspaceTarget, makeWorkspace, workspaceRoot } from '../utils';
12+
// import { host, browserTargetSpec, makeWorkspace } from '../utils';
1313
// import { lazyModuleFiles, lazyModuleImport } from './rebuild_spec_large';
1414

1515

1616
// TODO: re-enable this test when the custom lazy module changes have been ported over to
1717
// webpack-builder from the CLI.
1818
// describe('Browser Builder custom lazy modules', () => {
19-
// const host = new TestProjectHost(workspaceRoot);
19+
//
2020
// const architect = new Architect(normalize(workspaceRoot), host);
2121
// const outputPath = normalize('dist');
2222

@@ -47,7 +47,7 @@
4747

4848
// const overrides = { lazyModules: ['app/lazy/lazy.module'] };
4949

50-
// architect.loadWorkspaceFromJson(makeWorkspace(browserWorkspaceTarget)).pipe(
50+
// architect.loadWorkspaceFromJson(makeWorkspace(browserTargetSpec)).pipe(
5151
// concatMap(() => architect.run(architect.getTarget({ overrides }))),
5252
// tap((buildEvent) => expect(buildEvent.success).toBe(true)),
5353
// tap(() =>

‎packages/angular_devkit/build_webpack/test/browser/deploy-url_spec_large.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
import { join, normalize, virtualFs } from '@angular-devkit/core';
1010
import { concatMap, tap } from 'rxjs/operators';
11-
import { TestProjectHost, browserWorkspaceTarget, runTargetSpec, workspaceRoot } from '../utils';
11+
import { browserTargetSpec, host, runTargetSpec } from '../utils';
1212

1313

1414
describe('Browser Builder deploy url', () => {
15-
const host = new TestProjectHost(workspaceRoot);
1615
const outputPath = normalize('dist');
1716

1817
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
@@ -21,14 +20,14 @@ describe('Browser Builder deploy url', () => {
2120
it('uses deploy url for bundles urls', (done) => {
2221
const overrides = { deployUrl: 'deployUrl/' };
2322

24-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
23+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
2524
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
2625
tap(() => {
2726
const fileName = join(outputPath, 'index.html');
2827
const content = virtualFs.fileBufferToString(host.asSync().read(normalize(fileName)));
2928
expect(content).toContain('deployUrl/main.js');
3029
}),
31-
concatMap(() => runTargetSpec(host, browserWorkspaceTarget,
30+
concatMap(() => runTargetSpec(host, browserTargetSpec,
3231
{ deployUrl: 'http://example.com/some/path/' })),
3332
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
3433
tap(() => {
@@ -42,7 +41,7 @@ describe('Browser Builder deploy url', () => {
4241
it('uses deploy url for in webpack runtime', (done) => {
4342
const overrides = { deployUrl: 'deployUrl/' };
4443

45-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
44+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
4645
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
4746
tap(() => {
4847
const fileName = join(outputPath, 'runtime.js');

‎packages/angular_devkit/build_webpack/test/browser/errors_spec_large.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,10 @@
77
*/
88

99
import { tap } from 'rxjs/operators';
10-
import {
11-
TestLogger,
12-
TestProjectHost,
13-
browserWorkspaceTarget,
14-
runTargetSpec,
15-
workspaceRoot,
16-
} from '../utils';
10+
import { TestLogger, browserTargetSpec, host, runTargetSpec } from '../utils';
1711

1812

1913
describe('Browser Builder errors', () => {
20-
const host = new TestProjectHost(workspaceRoot);
21-
2214
beforeEach(done => host.initialize().subscribe(undefined, done.fail, done));
2315
afterEach(done => host.restore().subscribe(undefined, done.fail, done));
2416

@@ -29,7 +21,7 @@ describe('Browser Builder errors', () => {
2921
`);
3022
const logger = new TestLogger('errors-compilation');
3123

32-
runTargetSpec(host, browserWorkspaceTarget, undefined, logger).pipe(
24+
runTargetSpec(host, browserTargetSpec, undefined, logger).pipe(
3325
tap((buildEvent) => {
3426
expect(buildEvent.success).toBe(false);
3527
expect(logger.includes('polyfills.ts is missing from the TypeScript')).toBe(true);
@@ -41,7 +33,7 @@ describe('Browser Builder errors', () => {
4133
host.appendToFile('src/app/app.component.ts', ']]]');
4234
const logger = new TestLogger('errors-syntax');
4335

44-
runTargetSpec(host, browserWorkspaceTarget, undefined, logger).pipe(
36+
runTargetSpec(host, browserTargetSpec, undefined, logger).pipe(
4537
tap((buildEvent) => {
4638
expect(buildEvent.success).toBe(false);
4739
expect(logger.includes('Declaration or statement expected.')).toBe(true);
@@ -53,7 +45,7 @@ describe('Browser Builder errors', () => {
5345
host.replaceInFile('src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
5446
const logger = new TestLogger('errors-static');
5547

56-
runTargetSpec(host, browserWorkspaceTarget, { aot: true }, logger).pipe(
48+
runTargetSpec(host, browserTargetSpec, { aot: true }, logger).pipe(
5749
tap((buildEvent) => {
5850
expect(buildEvent.success).toBe(false);
5951
expect(logger.includes('Function expressions are not supported in')).toBe(true);

‎packages/angular_devkit/build_webpack/test/browser/file-replacements_spec_large.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
// import { Architect } from '@angular-devkit/architect';
1010
// import { join, normalize, virtualFs } from '@angular-devkit/core';
1111
// import { concatMap, tap } from 'rxjs/operators';
12-
// import { TestProjectHost, browserWorkspaceTarget, makeWorkspace, workspaceRoot } from '../utils';
12+
// import { host, browserTargetSpec, makeWorkspace } from '../utils';
1313

1414

1515
// TODO: re-enable this test when the functionality is implemented, wether by option or via VFS.
1616
// describe('Browser Builder file replacements', () => {
17-
// const host = new TestProjectHost(workspaceRoot);
17+
//
1818
// const architect = new Architect(normalize(workspaceRoot), host);
1919
// const outputPath = normalize('dist');
2020

@@ -28,7 +28,7 @@
2828
// ],
2929
// };
3030

31-
// architect.loadWorkspaceFromJson(makeWorkspace(browserWorkspaceTarget)).pipe(
31+
// architect.loadWorkspaceFromJson(makeWorkspace(browserTargetSpec)).pipe(
3232
// concatMap(() => architect.run(architect.getTarget({ overrides }))),
3333
// tap(() => {
3434
// const fileName = join(outputPath, 'main.js');
@@ -48,7 +48,7 @@
4848
// ],
4949
// };
5050

51-
// architect.loadWorkspaceFromJson(makeWorkspace(browserWorkspaceTarget)).pipe(
51+
// architect.loadWorkspaceFromJson(makeWorkspace(browserTargetSpec)).pipe(
5252
// concatMap(() => architect.run(architect.getTarget({ overrides }))),
5353
// tap((buildEvent) => expect(buildEvent.success).toBe(false)),
5454
// ).subscribe(undefined, done.fail, done);
@@ -64,7 +64,7 @@
6464
// ],
6565
// };
6666

67-
// architect.loadWorkspaceFromJson(makeWorkspace(browserWorkspaceTarget)).pipe(
67+
// architect.loadWorkspaceFromJson(makeWorkspace(browserTargetSpec)).pipe(
6868
// concatMap(() => architect.run(architect.getTarget({ overrides }))),
6969
// tap((buildEvent) => expect(buildEvent.success).toBe(false)),
7070
// ).subscribe(undefined, done.fail, done);

‎packages/angular_devkit/build_webpack/test/browser/i18n_spec_large.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
import { join, normalize, virtualFs } from '@angular-devkit/core';
1010
import { tap } from 'rxjs/operators';
11-
import { TestProjectHost, browserWorkspaceTarget, runTargetSpec, workspaceRoot } from '../utils';
11+
import { browserTargetSpec, host, runTargetSpec } from '../utils';
1212

1313

1414
describe('Browser Builder i18n', () => {
15-
const host = new TestProjectHost(workspaceRoot);
1615
const outputPath = normalize('dist');
1716
const emptyTranslationFile = `
1817
<?xml version="1.0" encoding="UTF-8" ?>
@@ -54,7 +53,7 @@ describe('Browser Builder i18n', () => {
5453
i18nLocale: 'fr',
5554
};
5655

57-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
56+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
5857
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
5958
tap(() => {
6059
const fileName = join(outputPath, 'main.js');
@@ -76,7 +75,7 @@ describe('Browser Builder i18n', () => {
7675
host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
7776
host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
7877

79-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
78+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
8079
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
8180
tap(() => {
8281
const fileName = join(outputPath, 'main.js');
@@ -98,15 +97,15 @@ describe('Browser Builder i18n', () => {
9897
host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
9998
host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
10099

101-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
100+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
102101
tap((buildEvent) => expect(buildEvent.success).toBe(false)),
103102
).subscribe(undefined, done.fail, done);
104103
}, 30000);
105104

106105
it('register locales', (done) => {
107106
const overrides = { aot: true, i18nLocale: 'fr_FR' };
108107

109-
runTargetSpec(host, browserWorkspaceTarget, overrides).pipe(
108+
runTargetSpec(host, browserTargetSpec, overrides).pipe(
110109
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
111110
tap(() => {
112111
const fileName = join(outputPath, 'main.js');

0 commit comments

Comments
 (0)