Skip to content

Commit 09dfc37

Browse files
committed
test: update e2e test to work with Angular 18
Updating this test to work with Angular 18.
1 parent b2ce345 commit 09dfc37

25 files changed

+77
-77
lines changed

tests/legacy-cli/e2e/assets/17-ssr-project-webpack/package.json

Lines changed: 0 additions & 47 deletions
This file was deleted.

tests/legacy-cli/e2e/assets/17-ssr-project-webpack/angular.json renamed to tests/legacy-cli/e2e/assets/18-ssr-project-webpack/angular.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
6-
"17-ssr-project-webpack": {
6+
"18-ssr-project-webpack": {
77
"projectType": "application",
88
"schematics": {},
99
"root": "",
@@ -13,7 +13,7 @@
1313
"build": {
1414
"builder": "@angular-devkit/build-angular:browser",
1515
"options": {
16-
"outputPath": "dist/17-ssr-project-webpack/browser",
16+
"outputPath": "dist/18-ssr-project-webpack/browser",
1717
"index": "src/index.html",
1818
"main": "src/main.ts",
1919
"polyfills": [
@@ -60,18 +60,18 @@
6060
"builder": "@angular-devkit/build-angular:dev-server",
6161
"configurations": {
6262
"production": {
63-
"buildTarget": "17-ssr-project-webpack:build:production"
63+
"buildTarget": "18-ssr-project-webpack:build:production"
6464
},
6565
"development": {
66-
"buildTarget": "17-ssr-project-webpack:build:development"
66+
"buildTarget": "18-ssr-project-webpack:build:development"
6767
}
6868
},
6969
"defaultConfiguration": "development"
7070
},
7171
"extract-i18n": {
7272
"builder": "@angular-devkit/build-angular:extract-i18n",
7373
"options": {
74-
"buildTarget": "17-ssr-project-webpack:build"
74+
"buildTarget": "18-ssr-project-webpack:build"
7575
}
7676
},
7777
"test": {
@@ -95,7 +95,7 @@
9595
"server": {
9696
"builder": "@angular-devkit/build-angular:server",
9797
"options": {
98-
"outputPath": "dist/17-ssr-project-webpack/server",
98+
"outputPath": "dist/18-ssr-project-webpack/server",
9999
"main": "server.ts",
100100
"tsConfig": "tsconfig.server.json"
101101
},
@@ -117,12 +117,12 @@
117117
"builder": "@angular-devkit/build-angular:ssr-dev-server",
118118
"configurations": {
119119
"development": {
120-
"browserTarget": "17-ssr-project-webpack:build:development",
121-
"serverTarget": "17-ssr-project-webpack:server:development"
120+
"browserTarget": "18-ssr-project-webpack:build:development",
121+
"serverTarget": "18-ssr-project-webpack:server:development"
122122
},
123123
"production": {
124-
"browserTarget": "17-ssr-project-webpack:build:production",
125-
"serverTarget": "17-ssr-project-webpack:server:production"
124+
"browserTarget": "18-ssr-project-webpack:build:production",
125+
"serverTarget": "18-ssr-project-webpack:server:production"
126126
}
127127
},
128128
"defaultConfiguration": "development"
@@ -136,12 +136,12 @@
136136
},
137137
"configurations": {
138138
"production": {
139-
"browserTarget": "17-ssr-project-webpack:build:production",
140-
"serverTarget": "17-ssr-project-webpack:server:production"
139+
"browserTarget": "18-ssr-project-webpack:build:production",
140+
"serverTarget": "18-ssr-project-webpack:server:production"
141141
},
142142
"development": {
143-
"browserTarget": "17-ssr-project-webpack:build:development",
144-
"serverTarget": "17-ssr-project-webpack:server:development"
143+
"browserTarget": "18-ssr-project-webpack:build:development",
144+
"serverTarget": "18-ssr-project-webpack:server:development"
145145
}
146146
},
147147
"defaultConfiguration": "production"
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"name": "18-ssr-project-webpack",
3+
"version": "0.0.0",
4+
"scripts": {
5+
"ng": "ng",
6+
"start": "ng serve",
7+
"build": "ng build",
8+
"watch": "ng build --watch --configuration development",
9+
"test": "ng test",
10+
"dev:ssr": "ng run 18-ssr-project-webpack:serve-ssr",
11+
"serve:ssr": "node dist/18-ssr-project-webpack/server/main.js",
12+
"build:ssr": "ng build && ng run 18-ssr-project-webpack:server",
13+
"prerender": "ng run 18-ssr-project-webpack:prerender"
14+
},
15+
"private": true,
16+
"dependencies": {
17+
"@angular/animations": "^18.0.0-next.0",
18+
"@angular/common": "^18.0.0-next.0",
19+
"@angular/compiler": "^18.0.0-next.0",
20+
"@angular/core": "^18.0.0-next.0",
21+
"@angular/forms": "^18.0.0-next.0",
22+
"@angular/platform-browser": "^18.0.0-next.0",
23+
"@angular/platform-browser-dynamic": "^18.0.0-next.0",
24+
"@angular/platform-server": "^18.0.0-next.0",
25+
"@angular/router": "^18.0.0-next.0",
26+
"@angular/ssr": "^18.0.0-next.0",
27+
"express": "^4.18.2",
28+
"rxjs": "~7.8.0",
29+
"tslib": "^2.3.0",
30+
"zone.js": "~0.14.3"
31+
},
32+
"devDependencies": {
33+
"@angular-devkit/build-angular": "^18.0.0-next.0",
34+
"@angular/cli": "^18.0.0-next.0",
35+
"@angular/compiler-cli": "^18.0.0-next.0",
36+
"@types/express": "^4.17.17",
37+
"@types/jasmine": "~4.3.0",
38+
"@types/node": "^18.18.0",
39+
"jasmine-core": "~4.6.0",
40+
"karma": "~6.4.0",
41+
"karma-chrome-launcher": "~3.2.0",
42+
"karma-coverage": "~2.2.0",
43+
"karma-jasmine": "~5.1.0",
44+
"karma-jasmine-html-reporter": "~2.1.0",
45+
"typescript": "~5.3.2"
46+
}
47+
}

tests/legacy-cli/e2e/assets/17-ssr-project-webpack/server.ts renamed to tests/legacy-cli/e2e/assets/18-ssr-project-webpack/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import AppServerModule from './src/main.server';
1010
// The Express app is exported so that it can be used by serverless Functions.
1111
export function app(): express.Express {
1212
const server = express();
13-
const distFolder = join(process.cwd(), 'dist/17-ssr-project-webpack/browser');
13+
const distFolder = join(process.cwd(), 'dist/18-ssr-project-webpack/browser');
1414
const indexHtml = existsSync(join(distFolder, 'index.original.html'))
1515
? join(distFolder, 'index.original.html')
1616
: join(distFolder, 'index.html');

tests/legacy-cli/e2e/assets/17-ssr-project-webpack/src/app/app.component.spec.ts renamed to tests/legacy-cli/e2e/assets/18-ssr-project-webpack/src/app/app.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ describe('AppComponent', () => {
1414
expect(app).toBeTruthy();
1515
});
1616

17-
it(`should have as title '17-ssr-project-webpack'`, () => {
17+
it(`should have as title '18-ssr-project-webpack'`, () => {
1818
const fixture = TestBed.createComponent(AppComponent);
1919
const app = fixture.componentInstance;
20-
expect(app.title).toEqual('17-ssr-project-webpack');
20+
expect(app.title).toEqual('18-ssr-project-webpack');
2121
});
2222

2323
it('should render title', () => {
2424
const fixture = TestBed.createComponent(AppComponent);
2525
fixture.detectChanges();
2626
const compiled = fixture.nativeElement as HTMLElement;
27-
expect(compiled.querySelector('.content span')?.textContent).toContain('17-ssr-project-webpack app is running!');
27+
expect(compiled.querySelector('.content span')?.textContent).toContain('18-ssr-project-webpack app is running!');
2828
});
2929
});

tests/legacy-cli/e2e/assets/17-ssr-project-webpack/src/app/app.component.ts renamed to tests/legacy-cli/e2e/assets/18-ssr-project-webpack/src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
66
styleUrls: ['./app.component.css']
77
})
88
export class AppComponent {
9-
title = '17-ssr-project-webpack';
9+
title = '18-ssr-project-webpack';
1010
}

tests/legacy-cli/e2e/assets/webpack/test-app/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "^17.0.0-next",
6-
"@angular/compiler": "^17.0.0-next",
7-
"@angular/compiler-cli": "^17.0.0-next",
8-
"@angular/core": "^17.0.0-next",
9-
"@angular/platform-browser": "^17.0.0-next",
10-
"@angular/platform-browser-dynamic": "^17.0.0-next",
11-
"@angular/router": "^17.0.0-next",
5+
"@angular/common": "^18.0.0-next",
6+
"@angular/compiler": "^18.0.0-next",
7+
"@angular/compiler-cli": "^18.0.0-next",
8+
"@angular/core": "^18.0.0-next",
9+
"@angular/platform-browser": "^18.0.0-next",
10+
"@angular/platform-browser-dynamic": "^18.0.0-next",
11+
"@angular/router": "^18.0.0-next",
1212
"@ngtools/webpack": "0.0.0",
1313
"rxjs": "^6.6.7",
1414
"zone.js": "^0.14.0"
1515
},
1616
"devDependencies": {
1717
"sass": "^1.32.8",
1818
"sass-loader": "^11.0.1",
19-
"typescript": "~5.2.2",
19+
"typescript": "~5.3.2",
2020
"webpack": "^5.27.0",
2121
"webpack-cli": "^4.5.0"
2222
}

tests/legacy-cli/e2e/tests/update/update-application-builder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { execAndWaitForOutputToMatch, ng, noSilentNg } from '../../utils/process
1010
import { findFreePort } from '../../utils/network';
1111

1212
export default async function () {
13-
await createProjectFromAsset('17-ssr-project-webpack', false, false);
13+
await createProjectFromAsset('18-ssr-project-webpack', false, false);
1414
await ng('update', `@angular/cli`, '--name=use-application-builder');
1515

1616
await Promise.all([
@@ -23,8 +23,8 @@ export default async function () {
2323
await noSilentNg('build', '--configuration=production');
2424

2525
await Promise.all([
26-
expectFileToExist('dist/17-ssr-project-webpack/server/server.mjs'),
27-
expectFileMatchToExist('dist/17-ssr-project-webpack/browser', /main-[a-zA-Z0-9]{8}\.js/),
26+
expectFileToExist('dist/18-ssr-project-webpack/server/server.mjs'),
27+
expectFileMatchToExist('dist/18-ssr-project-webpack/browser', /main-[a-zA-Z0-9]{8}\.js/),
2828
]);
2929

3030
// Verify that the app runs

0 commit comments

Comments
 (0)