Skip to content

Commit c98c049

Browse files
alan-agius4clydin
alan-agius4
authored and
clydin
committed
test: update tests to account for changes in the build output structure
This commit updates the tests to account for the new build structure.
1 parent 49f07a8 commit c98c049

File tree

73 files changed

+617
-492
lines changed

Some content is hidden

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

73 files changed

+617
-492
lines changed

‎goldens/circular-deps/packages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
[
2+
[
3+
"packages/angular_devkit/build_angular/src/tools/esbuild/bundler-context.ts",
4+
"packages/angular_devkit/build_angular/src/tools/esbuild/utils.ts"
5+
],
26
[
37
"packages/angular_devkit/build_angular/src/tools/webpack/utils/stats.ts",
48
"packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts"

‎packages/angular_devkit/build_angular/src/builders/application/tests/behavior/angular-aot-metadata_spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
1919
const { result } = await harness.executeOnce();
2020
expect(result?.success).toBe(true);
2121

22-
harness.expectFile('dist/main.js').content.not.toContain('setClassMetadata');
22+
harness.expectFile('dist/browser/main.js').content.not.toContain('setClassMetadata');
2323
});
2424

2525
it('should not emit any AOT NgModule scope metadata functions', async () => {
@@ -30,7 +30,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
3030
const { result } = await harness.executeOnce();
3131
expect(result?.success).toBe(true);
3232

33-
harness.expectFile('dist/main.js').content.not.toContain('setNgModuleScope');
33+
harness.expectFile('dist/browser/main.js').content.not.toContain('setNgModuleScope');
3434
});
3535
});
3636
});

‎packages/angular_devkit/build_angular/src/builders/application/tests/behavior/browser-support_spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
4040
const { result } = await harness.executeOnce();
4141

4242
expect(result?.success).toBe(true);
43-
harness.expectFile('dist/main.js').content.not.toMatch(/\sasync\s+function\s/);
44-
harness.expectFile('dist/main.js.map').content.toContain('Promise<Void123>');
43+
harness.expectFile('dist/browser/main.js').content.not.toMatch(/\sasync\s+function\s/);
44+
harness.expectFile('dist/browser/main.js.map').content.toContain('Promise<Void123>');
4545
});
4646

4747
it('downlevels async functions ', async () => {
@@ -58,8 +58,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
5858
const { result } = await harness.executeOnce();
5959

6060
expect(result?.success).toBe(true);
61-
harness.expectFile('dist/main.js').content.not.toMatch(/\sasync\s/);
62-
harness.expectFile('dist/main.js').content.toContain('"from-async-function"');
61+
harness.expectFile('dist/browser/main.js').content.not.toMatch(/\sasync\s/);
62+
harness.expectFile('dist/browser/main.js').content.toContain('"from-async-function"');
6363
});
6464

6565
it('warns when IE is present in browserslist', async () => {
@@ -109,8 +109,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
109109
const { result } = await harness.executeOnce();
110110

111111
expect(result?.success).toBe(true);
112-
harness.expectFile('dist/main.js').content.not.toMatch(/\sawait\s/);
113-
harness.expectFile('dist/main.js').content.toContain('"for await...of"');
112+
harness.expectFile('dist/browser/main.js').content.not.toMatch(/\sawait\s/);
113+
harness.expectFile('dist/browser/main.js').content.toContain('"for await...of"');
114114
});
115115
});
116116
});

‎packages/angular_devkit/build_angular/src/builders/application/tests/behavior/index-preload-hints_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
2828
expect(result?.success).toBe(true);
2929

3030
harness
31-
.expectFile('dist/index.html')
31+
.expectFile('dist/browser/index.html')
3232
.content.toContain(
3333
'<link rel="preload" href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:wght@300;400;500;700&display=swap" as="style">',
3434
);

‎packages/angular_devkit/build_angular/src/builders/application/tests/behavior/stylesheet_autoprefixer_spec.ts

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
4747
expect(result?.success).toBeTrue();
4848

4949
harness
50-
.expectFile('dist/styles.css')
50+
.expectFile('dist/browser/styles.css')
5151
.content.toMatch(/section\s*{\s*-webkit-hyphens:\s*none;\s*hyphens:\s*none;\s*}/);
5252
harness
53-
.expectFile('dist/styles.css')
53+
.expectFile('dist/browser/styles.css')
5454
.content.toMatch(/div\s*{\s*-webkit-hyphens:\s*none;\s*hyphens:\s*none;\s*}/);
5555
});
5656

@@ -75,8 +75,12 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
7575
const { result } = await harness.executeOnce();
7676
expect(result?.success).toBeTrue();
7777

78-
harness.expectFile('dist/styles.css').content.toMatch(/section\s*{\s*hyphens:\s*none;\s*}/);
79-
harness.expectFile('dist/styles.css').content.toMatch(/div\s*{\s*hyphens:\s*none;\s*}/);
78+
harness
79+
.expectFile('dist/browser/styles.css')
80+
.content.toMatch(/section\s*{\s*hyphens:\s*none;\s*}/);
81+
harness
82+
.expectFile('dist/browser/styles.css')
83+
.content.toMatch(/div\s*{\s*hyphens:\s*none;\s*}/);
8084
});
8185

8286
it(`should add prefixes for listed browsers in external component styles [${ext}]`, async () => {
@@ -105,10 +109,10 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
105109
expect(result?.success).toBeTrue();
106110

107111
harness
108-
.expectFile('dist/main.js')
112+
.expectFile('dist/browser/main.js')
109113
.content.toMatch(/{\\n\s*-webkit-hyphens:\s*none;\\n\s*hyphens:\s*none;\\n\s*}/);
110114
harness
111-
.expectFile('dist/main.js')
115+
.expectFile('dist/browser/main.js')
112116
.content.toMatch(/{\\n\s*-webkit-hyphens:\s*none;\\n\s*hyphens:\s*none;\\n\s*}/);
113117
});
114118

@@ -135,8 +139,12 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
135139
const { result } = await harness.executeOnce();
136140
expect(result?.success).toBeTrue();
137141

138-
harness.expectFile('dist/main.js').content.toMatch(/{\\n\s*hyphens:\s*none;\\n\s*}/);
139-
harness.expectFile('dist/main.js').content.toMatch(/{\\n\s*hyphens:\s*none;\\n\s*}/);
142+
harness
143+
.expectFile('dist/browser/main.js')
144+
.content.toMatch(/{\\n\s*hyphens:\s*none;\\n\s*}/);
145+
harness
146+
.expectFile('dist/browser/main.js')
147+
.content.toMatch(/{\\n\s*hyphens:\s*none;\\n\s*}/);
140148
});
141149
}
142150

@@ -164,7 +172,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
164172
expect(result?.success).toBeTrue();
165173

166174
harness
167-
.expectFile('dist/main.js')
175+
.expectFile('dist/browser/main.js')
168176
// div[_ngcontent-%COMP%] {\n -webkit-hyphens: none;\n hyphens: none;\n}\n
169177
.content.toMatch(/{\\n\s*-webkit-hyphens:\s*none;\\n\s*hyphens:\s*none;\\n\s*}/);
170178
});
@@ -190,7 +198,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
190198
const { result } = await harness.executeOnce();
191199
expect(result?.success).toBeTrue();
192200

193-
harness.expectFile('dist/main.js').content.toMatch(/{\\n\s*hyphens:\s*none;\\n\s*}/);
201+
harness.expectFile('dist/browser/main.js').content.toMatch(/{\\n\s*hyphens:\s*none;\\n\s*}/);
194202
});
195203
});
196204
});

‎packages/angular_devkit/build_angular/src/builders/application/tests/behavior/typescript-path-mapping_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
103103
const { result } = await harness.executeOnce();
104104

105105
expect(result?.success).toBe(true);
106-
harness.expectFile('dist/main.js').content.toContain(`console.log("A")`);
106+
harness.expectFile('dist/browser/main.js').content.toContain(`console.log("A")`);
107107
});
108108
});
109109
});

‎packages/angular_devkit/build_angular/src/builders/application/tests/options/app-shell_spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
113113
const { result } = await harness.executeOnce();
114114
expect(result?.success).toBeTrue();
115115

116-
harness.expectFile('dist/main.js').toExist();
117-
const indexFileContent = harness.expectFile('dist/index.html').content;
116+
harness.expectFile('dist/browser/main.js').toExist();
117+
const indexFileContent = harness.expectFile('dist/browser/index.html').content;
118118
indexFileContent.toContain('app-shell works!');
119119
indexFileContent.toContain('ng-server-context="app-shell"');
120120
});
@@ -137,7 +137,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
137137
const { result } = await harness.executeOnce();
138138
expect(result?.success).toBeTrue();
139139

140-
const indexFileContent = harness.expectFile('dist/index.html').content;
140+
const indexFileContent = harness.expectFile('dist/browser/index.html').content;
141141
indexFileContent.toContain('app-shell works!');
142142
indexFileContent.toContain('p{color:#000}');
143143
indexFileContent.toContain(
@@ -166,7 +166,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
166166
const { result } = await harness.executeOnce();
167167
expect(result?.success).toBeTrue();
168168

169-
const indexFileContent = harness.expectFile('dist/index.html').content;
169+
const indexFileContent = harness.expectFile('dist/browser/index.html').content;
170170
indexFileContent.toContain('app-shell works!');
171171
indexFileContent.toContain('p{color:#000}');
172172
indexFileContent.toContain(

‎packages/angular_devkit/build_angular/src/builders/application/tests/options/assets_spec.ts

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
4141

4242
expect(result?.success).toBe(true);
4343

44-
harness.expectFile('dist/extra.file').content.toBe('extra file');
45-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
46-
harness.expectFile('dist/another.file').content.toBe('asset file');
44+
harness.expectFile('dist/browser/extra.file').content.toBe('extra file');
45+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
46+
harness.expectFile('dist/browser/another.file').content.toBe('asset file');
4747
});
4848

4949
describe('shorthand syntax', () => {
@@ -59,7 +59,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
5959

6060
expect(result?.success).toBe(true);
6161

62-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
62+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
6363
});
6464

6565
it('copies multiple assets', async () => {
@@ -75,8 +75,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
7575

7676
expect(result?.success).toBe(true);
7777

78-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
79-
harness.expectFile('dist/another.file').content.toBe('asset file');
78+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
79+
harness.expectFile('dist/browser/another.file').content.toBe('asset file');
8080
});
8181

8282
it('copies an asset with directory and maintains directory in output', async () => {
@@ -91,7 +91,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
9191

9292
expect(result?.success).toBe(true);
9393

94-
harness.expectFile('dist/subdirectory/test.svg').content.toBe('<svg></svg>');
94+
harness.expectFile('dist/browser/subdirectory/test.svg').content.toBe('<svg></svg>');
9595
});
9696

9797
it('does not fail if asset does not exist', async () => {
@@ -104,7 +104,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
104104

105105
expect(result?.success).toBe(true);
106106

107-
harness.expectFile('dist/test.svg').toNotExist();
107+
harness.expectFile('dist/browser/test.svg').toNotExist();
108108
});
109109

110110
it('fail if asset path is not within project source root', async () => {
@@ -119,7 +119,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
119119

120120
expect(error?.message).toMatch('path must start with the project source root');
121121

122-
harness.expectFile('dist/test.svg').toNotExist();
122+
harness.expectFile('dist/browser/test.svg').toNotExist();
123123
});
124124
});
125125

@@ -136,7 +136,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
136136

137137
expect(result?.success).toBe(true);
138138

139-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
139+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
140140
});
141141

142142
it('copies multiple assets as separate entries', async () => {
@@ -155,8 +155,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
155155

156156
expect(result?.success).toBe(true);
157157

158-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
159-
harness.expectFile('dist/another.file').content.toBe('asset file');
158+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
159+
harness.expectFile('dist/browser/another.file').content.toBe('asset file');
160160
});
161161

162162
it('copies multiple assets with a single entry glob pattern', async () => {
@@ -172,8 +172,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
172172

173173
expect(result?.success).toBe(true);
174174

175-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
176-
harness.expectFile('dist/another.file').content.toBe('asset file');
175+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
176+
harness.expectFile('dist/browser/another.file').content.toBe('asset file');
177177
});
178178

179179
it('copies multiple assets with a wildcard glob pattern', async () => {
@@ -189,8 +189,8 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
189189

190190
expect(result?.success).toBe(true);
191191

192-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
193-
harness.expectFile('dist/another.file').content.toBe('asset file');
192+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
193+
harness.expectFile('dist/browser/another.file').content.toBe('asset file');
194194
});
195195

196196
it('copies multiple assets with a recursive wildcard glob pattern', async () => {
@@ -209,9 +209,9 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
209209

210210
expect(result?.success).toBe(true);
211211

212-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
213-
harness.expectFile('dist/another.file').content.toBe('asset file');
214-
harness.expectFile('dist/nested/extra.file').content.toBe('extra file');
212+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
213+
harness.expectFile('dist/browser/another.file').content.toBe('asset file');
214+
harness.expectFile('dist/browser/nested/extra.file').content.toBe('extra file');
215215
});
216216

217217
it('automatically ignores "." prefixed files when using wildcard glob pattern', async () => {
@@ -245,9 +245,9 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
245245

246246
expect(result?.success).toBe(true);
247247

248-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
249-
harness.expectFile('dist/another.file').toNotExist();
250-
harness.expectFile('dist/nested/extra.file').content.toBe('extra file');
248+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
249+
harness.expectFile('dist/browser/another.file').toNotExist();
250+
harness.expectFile('dist/browser/nested/extra.file').content.toBe('extra file');
251251
});
252252

253253
it('supports ignoring with a glob pattern when using a glob pattern', async () => {
@@ -266,9 +266,9 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
266266

267267
expect(result?.success).toBe(true);
268268

269-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
270-
harness.expectFile('dist/another.file').toNotExist();
271-
harness.expectFile('dist/nested/extra.file').toNotExist();
269+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
270+
harness.expectFile('dist/browser/another.file').toNotExist();
271+
harness.expectFile('dist/browser/nested/extra.file').toNotExist();
272272
});
273273

274274
it('copies an asset with directory and maintains directory in output', async () => {
@@ -283,7 +283,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
283283

284284
expect(result?.success).toBe(true);
285285

286-
harness.expectFile('dist/subdirectory/test.svg').content.toBe('<svg></svg>');
286+
harness.expectFile('dist/browser/subdirectory/test.svg').content.toBe('<svg></svg>');
287287
});
288288

289289
it('does not fail if asset does not exist', async () => {
@@ -296,7 +296,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
296296

297297
expect(result?.success).toBe(true);
298298

299-
harness.expectFile('dist/test.svg').toNotExist();
299+
harness.expectFile('dist/browser/test.svg').toNotExist();
300300
});
301301

302302
it('uses project output path when output option is empty string', async () => {
@@ -311,7 +311,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
311311

312312
expect(result?.success).toBe(true);
313313

314-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
314+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
315315
});
316316

317317
it('uses project output path when output option is "."', async () => {
@@ -326,7 +326,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
326326

327327
expect(result?.success).toBe(true);
328328

329-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
329+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
330330
});
331331

332332
it('uses project output path when output option is "/"', async () => {
@@ -341,7 +341,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
341341

342342
expect(result?.success).toBe(true);
343343

344-
harness.expectFile('dist/test.svg').content.toBe('<svg></svg>');
344+
harness.expectFile('dist/browser/test.svg').content.toBe('<svg></svg>');
345345
});
346346

347347
it('creates a project output sub-path when output option path does not exist', async () => {
@@ -356,7 +356,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
356356

357357
expect(result?.success).toBe(true);
358358

359-
harness.expectFile('dist/subdirectory/test.svg').content.toBe('<svg></svg>');
359+
harness.expectFile('dist/browser/subdirectory/test.svg').content.toBe('<svg></svg>');
360360
});
361361

362362
it('fails if output option is not within project output path', async () => {
@@ -373,7 +373,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
373373
'An asset cannot be written to a location outside of the output path',
374374
);
375375

376-
harness.expectFile('dist/test.svg').toNotExist();
376+
harness.expectFile('dist/browser/test.svg').toNotExist();
377377
});
378378
});
379379
});

0 commit comments

Comments
 (0)