Skip to content

Commit 0a4c86b

Browse files
Alanhansl
Alan
authored and
hansl
committed
style: format touched files in e2e
1 parent 9d4a093 commit 0a4c86b

File tree

2 files changed

+182
-111
lines changed

2 files changed

+182
-111
lines changed

‎tests/legacy-cli/e2e/tests/build/build-app-shell.ts

Lines changed: 73 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import { ng, npm } from '../../utils/process';
55
import { updateJsonFile } from '../../utils/project';
66
import { readNgVersion } from '../../utils/version';
77

8-
9-
export default function () {
8+
export default function() {
109
// Skip this test in Angular 2/4.
1110
if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
1211
return Promise.resolve();
@@ -21,26 +20,31 @@ export default function () {
2120
}
2221

2322
return Promise.resolve()
24-
.then(() => updateJsonFile('angular.json', workspaceJson => {
25-
const appArchitect = workspaceJson.projects['test-project'].architect;
26-
appArchitect['server'] = {
27-
builder: '@angular-devkit/build-angular:server',
28-
options: {
29-
outputPath: 'dist/test-project-server',
30-
main: 'src/main.server.ts',
31-
tsConfig: 'tsconfig.server.json'
32-
}
33-
};
34-
appArchitect['app-shell'] = {
35-
builder: '@angular-devkit/build-angular:app-shell',
36-
options: {
37-
browserTarget: 'test-project:build:production',
38-
serverTarget: 'test-project:server',
39-
route: '/shell'
40-
}
41-
};
42-
}))
43-
.then(() => writeFile('./tsconfig.server.json', `
23+
.then(() =>
24+
updateJsonFile('angular.json', workspaceJson => {
25+
const appArchitect = workspaceJson.projects['test-project'].architect;
26+
appArchitect['server'] = {
27+
builder: '@angular-devkit/build-angular:server',
28+
options: {
29+
outputPath: 'dist/test-project-server',
30+
main: 'src/main.server.ts',
31+
tsConfig: 'tsconfig.server.json',
32+
},
33+
};
34+
appArchitect['app-shell'] = {
35+
builder: '@angular-devkit/build-angular:app-shell',
36+
options: {
37+
browserTarget: 'test-project:build:production',
38+
serverTarget: 'test-project:server',
39+
route: '/shell',
40+
},
41+
};
42+
}),
43+
)
44+
.then(() =>
45+
writeFile(
46+
'./tsconfig.server.json',
47+
`
4448
{
4549
"extends": "./tsconfig.app.json",
4650
"compilerOptions": {
@@ -53,8 +57,13 @@ export default function () {
5357
"entryModule": "src/app/app.server.module#AppServerModule"
5458
}
5559
}
56-
`))
57-
.then(() => writeFile('./src/main.server.ts', `
60+
`,
61+
),
62+
)
63+
.then(() =>
64+
writeFile(
65+
'./src/main.server.ts',
66+
`
5867
import { enableProdMode } from '@angular/core';
5968
6069
import { environment } from './environments/environment';
@@ -64,12 +73,22 @@ export default function () {
6473
}
6574
6675
export { AppServerModule } from './app/app.server.module';
67-
`))
68-
.then(() => writeFile('./src/app/app.component.html', stripIndent`
76+
`,
77+
),
78+
)
79+
.then(() =>
80+
writeFile(
81+
'./src/app/app.component.html',
82+
stripIndent`
6983
Hello World
7084
<router-outlet></router-outlet>
71-
`))
72-
.then(() => writeFile('./src/app/app.module.ts', stripIndent`
85+
`,
86+
),
87+
)
88+
.then(() =>
89+
writeFile(
90+
'./src/app/app.module.ts',
91+
stripIndent`
7392
import { BrowserModule } from '@angular/platform-browser';
7493
import { NgModule } from '@angular/core';
7594
import { RouterModule } from '@angular/router';
@@ -85,8 +104,13 @@ export default function () {
85104
bootstrap: [AppComponent]
86105
})
87106
export class AppModule { }
88-
`))
89-
.then(() => writeFile('./src/app/app.server.module.ts', stripIndent`
107+
`,
108+
),
109+
)
110+
.then(() =>
111+
writeFile(
112+
'./src/app/app.server.module.ts',
113+
stripIndent`
90114
import {NgModule} from '@angular/core';
91115
import {ServerModule} from '@angular/platform-server';
92116
import { Routes, RouterModule } from '@angular/router';
@@ -113,23 +137,31 @@ export default function () {
113137
declarations: [ShellComponent],
114138
})
115139
export class AppServerModule {}
116-
`))
117-
.then(() => writeFile('./src/app/shell.component.ts', stripIndent`
140+
`,
141+
),
142+
)
143+
.then(() =>
144+
writeFile(
145+
'./src/app/shell.component.ts',
146+
stripIndent`
118147
import { Component } from '@angular/core';
119148
@Component({
120149
selector: 'app-shell',
121150
template: '<p>shell Works!</p>',
122151
styles: []
123152
})
124153
export class ShellComponent {}
125-
`))
126-
.then(() => updateJsonFile('package.json', packageJson => {
127-
const dependencies = packageJson['dependencies'];
128-
dependencies['@angular/platform-server'] = platformServerVersion;
129-
// ServerModule depends on @angular/http regardless the app's dependency.
130-
dependencies['@angular/http'] = httpVersion;
131-
})
132-
.then(() => npm('install')))
154+
`,
155+
),
156+
)
157+
.then(() =>
158+
updateJsonFile('package.json', packageJson => {
159+
const dependencies = packageJson['dependencies'];
160+
dependencies['@angular/platform-server'] = platformServerVersion;
161+
// ServerModule depends on @angular/http regardless the app's dependency.
162+
dependencies['@angular/http'] = httpVersion;
163+
}).then(() => npm('install')),
164+
)
133165
.then(() => ng('run', 'test-project:app-shell'))
134166
.then(() => expectFileToMatch('dist/test-project/index.html', /shell Works!/));
135-
}
167+
}

‎tests/legacy-cli/e2e/tests/build/platform-server.ts

Lines changed: 109 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
import { normalize } from 'path';
22
import { getGlobalVariable } from '../../utils/env';
3-
import {
4-
appendToFile,
5-
expectFileToMatch,
6-
prependToFile,
7-
writeFile,
8-
} from '../../utils/fs';
3+
import { appendToFile, expectFileToMatch, prependToFile, writeFile } from '../../utils/fs';
94
import { exec, ng, silentNpm } from '../../utils/process';
105
import { updateJsonFile } from '../../utils/project';
116
import { readNgVersion } from '../../utils/version';
127

13-
export default function () {
8+
export default function() {
149
let platformServerVersion = readNgVersion();
1510
let httpVersion = readNgVersion();
1611

@@ -24,25 +19,33 @@ export default function () {
2419
return Promise.resolve();
2520
}
2621

27-
return Promise.resolve()
28-
.then(() => updateJsonFile('package.json', packageJson => {
29-
const dependencies = packageJson['dependencies'];
30-
dependencies['@angular/platform-server'] = platformServerVersion;
31-
// ServerModule depends on @angular/http regardless the app's dependency.
32-
dependencies['@angular/http'] = httpVersion;
33-
}))
34-
.then(() => updateJsonFile('angular.json', workspaceJson => {
35-
const appArchitect = workspaceJson.projects['test-project'].architect;
36-
appArchitect['server'] = {
37-
builder: '@angular-devkit/build-angular:server',
38-
options: {
39-
outputPath: 'dist/test-project-server',
40-
main: 'src/main.server.ts',
41-
tsConfig: 'tsconfig.server.json',
42-
},
43-
};
44-
}))
45-
.then(() => writeFile('./tsconfig.server.json', `
22+
return (
23+
Promise.resolve()
24+
.then(() =>
25+
updateJsonFile('package.json', packageJson => {
26+
const dependencies = packageJson['dependencies'];
27+
dependencies['@angular/platform-server'] = platformServerVersion;
28+
// ServerModule depends on @angular/http regardless the app's dependency.
29+
dependencies['@angular/http'] = httpVersion;
30+
}),
31+
)
32+
.then(() =>
33+
updateJsonFile('angular.json', workspaceJson => {
34+
const appArchitect = workspaceJson.projects['test-project'].architect;
35+
appArchitect['server'] = {
36+
builder: '@angular-devkit/build-angular:server',
37+
options: {
38+
outputPath: 'dist/test-project-server',
39+
main: 'src/main.server.ts',
40+
tsConfig: 'tsconfig.server.json',
41+
},
42+
};
43+
}),
44+
)
45+
.then(() =>
46+
writeFile(
47+
'./tsconfig.server.json',
48+
`
4649
{
4750
"extends": "./tsconfig.app.json",
4851
"compilerOptions": {
@@ -55,8 +58,13 @@ export default function () {
5558
"entryModule": "src/app/app.server.module#AppServerModule"
5659
}
5760
}
58-
`))
59-
.then(() => writeFile('./src/main.server.ts', `
61+
`,
62+
),
63+
)
64+
.then(() =>
65+
writeFile(
66+
'./src/main.server.ts',
67+
`
6068
import { enableProdMode } from '@angular/core';
6169
6270
import { environment } from './environments/environment';
@@ -66,8 +74,13 @@ export default function () {
6674
}
6775
6876
export { AppServerModule } from './app/app.server.module';
69-
`))
70-
.then(() => writeFile('./src/app/app.server.module.ts', `
77+
`,
78+
),
79+
)
80+
.then(() =>
81+
writeFile(
82+
'./src/app/app.server.module.ts',
83+
`
7184
import { NgModule } from '@angular/core';
7285
import { BrowserModule } from '@angular/platform-browser';
7386
import { ServerModule } from '@angular/platform-server';
@@ -84,35 +97,41 @@ export default function () {
8497
bootstrap: [AppComponent],
8598
})
8699
export class AppServerModule {}
87-
`))
88-
.then(() => silentNpm('install'))
89-
// This part of the test requires a non-aot build, which isn't available anymore.
90-
// .then(() => ng('run', 'test-project:server'))
91-
// // files were created successfully
92-
// .then(() => expectFileToMatch('dist/test-project-server/main.js',
93-
// /exports.*AppServerModule/))
94-
// .then(() => writeFile('./index.js', `
95-
// require('zone.js/dist/zone-node');
96-
// require('reflect-metadata');
97-
// const fs = require('fs');
98-
// const \{ AppServerModule \} = require('./dist/test-project-server/main');
99-
// const \{ renderModule \} = require('@angular/platform-server');
100+
`,
101+
),
102+
)
103+
.then(() => silentNpm('install'))
104+
// This part of the test requires a non-aot build, which isn't available anymore.
105+
// .then(() => ng('run', 'test-project:server'))
106+
// // files were created successfully
107+
// .then(() => expectFileToMatch('dist/test-project-server/main.js',
108+
// /exports.*AppServerModule/))
109+
// .then(() => writeFile('./index.js', `
110+
// require('zone.js/dist/zone-node');
111+
// require('reflect-metadata');
112+
// const fs = require('fs');
113+
// const \{ AppServerModule \} = require('./dist/test-project-server/main');
114+
// const \{ renderModule \} = require('@angular/platform-server');
100115

101-
// renderModule(AppServerModule, \{
102-
// url: '/',
103-
// document: '<app-root></app-root>'
104-
// \}).then(html => \{
105-
// fs.writeFileSync('dist/test-project-server/index.html', html);
106-
// \});
107-
// `))
108-
// .then(() => exec(normalize('node'), 'index.js'))
109-
// .then(() => expectFileToMatch('dist/test-project-server/index.html',
110-
// new RegExp('<h2 _ngcontent-c0="">Here are some links to help you start: </h2>')))
111-
.then(() => ng('run', 'test-project:server'))
112-
// files were created successfully
113-
.then(() => expectFileToMatch('dist/test-project-server/main.js',
114-
/exports.*AppServerModuleNgFactory/))
115-
.then(() => writeFile('./index.js', `
116+
// renderModule(AppServerModule, \{
117+
// url: '/',
118+
// document: '<app-root></app-root>'
119+
// \}).then(html => \{
120+
// fs.writeFileSync('dist/test-project-server/index.html', html);
121+
// \});
122+
// `))
123+
// .then(() => exec(normalize('node'), 'index.js'))
124+
// .then(() => expectFileToMatch('dist/test-project-server/index.html',
125+
// new RegExp('<h2 _ngcontent-c0="">Here are some links to help you start: </h2>')))
126+
.then(() => ng('run', 'test-project:server'))
127+
// files were created successfully
128+
.then(() =>
129+
expectFileToMatch('dist/test-project-server/main.js', /exports.*AppServerModuleNgFactory/),
130+
)
131+
.then(() =>
132+
writeFile(
133+
'./index.js',
134+
`
116135
require('zone.js/dist/zone-node');
117136
require('reflect-metadata');
118137
const fs = require('fs');
@@ -125,19 +144,35 @@ export default function () {
125144
\}).then(html => \{
126145
fs.writeFileSync('dist/test-project-server/index.html', html);
127146
\});
128-
`))
129-
.then(() => exec(normalize('node'), 'index.js'))
130-
.then(() => expectFileToMatch('dist/test-project-server/index.html',
131-
/<h2.*>Here are some links to help you start: <\/h2>/))
132-
.then(() => expectFileToMatch('./dist/test-project-server/main.js',
133-
/require\(["']@angular\/[^"']*["']\)/))
147+
`,
148+
),
149+
)
150+
.then(() => exec(normalize('node'), 'index.js'))
151+
.then(() =>
152+
expectFileToMatch(
153+
'dist/test-project-server/index.html',
154+
/<h2.*>Here are some links to help you start: <\/h2>/,
155+
),
156+
)
157+
.then(() =>
158+
expectFileToMatch(
159+
'./dist/test-project-server/main.js',
160+
/require\(["']@angular\/[^"']*["']\)/,
161+
),
162+
)
134163

135-
// Check externals.
136-
.then(() => prependToFile('./src/app/app.server.module.ts', `
164+
// Check externals.
165+
.then(() =>
166+
prependToFile(
167+
'./src/app/app.server.module.ts',
168+
`
137169
import 'zone.js/dist/zone-node';
138170
import 'reflect-metadata';
139-
`)
140-
.then(() => appendToFile('./src/app/app.server.module.ts', `
171+
`,
172+
).then(() =>
173+
appendToFile(
174+
'./src/app/app.server.module.ts',
175+
`
141176
import * as fs from 'fs';
142177
import { renderModule } from '@angular/platform-server';
143178
@@ -147,5 +182,9 @@ export default function () {
147182
\}).then(html => \{
148183
fs.writeFileSync('dist/test-project-server/index.html', html);
149184
\});
150-
`)))
151-
}
185+
`,
186+
),
187+
),
188+
)
189+
);
190+
}

0 commit comments

Comments
 (0)