Skip to content

Commit 09e6c5f

Browse files
ferdikoomenferdikoomen
committed
- Working on e2e tests for angular
1 parent 1d8dc54 commit 09e6c5f

21 files changed

+226
-30
lines changed

‎jest.config.ts

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,23 @@ const config: Config.InitialOptions = {
1515
displayName: 'E2E',
1616
testEnvironment: 'node',
1717
testMatch: [
18-
'<rootDir>/test/e2e/v2.fetch.spec.ts',
19-
'<rootDir>/test/e2e/v2.xhr.spec.ts',
20-
'<rootDir>/test/e2e/v2.node.spec.ts',
21-
'<rootDir>/test/e2e/v2.axios.spec.ts',
22-
'<rootDir>/test/e2e/v2.babel.spec.ts',
23-
'<rootDir>/test/e2e/v3.fetch.spec.ts',
24-
'<rootDir>/test/e2e/v3.xhr.spec.ts',
25-
'<rootDir>/test/e2e/v3.node.spec.ts',
26-
'<rootDir>/test/e2e/v3.axios.spec.ts',
27-
'<rootDir>/test/e2e/v3.babel.spec.ts',
28-
'<rootDir>/test/e2e/client.fetch.spec.ts',
29-
'<rootDir>/test/e2e/client.xhr.spec.ts',
30-
'<rootDir>/test/e2e/client.node.spec.ts',
31-
'<rootDir>/test/e2e/client.axios.spec.ts',
32-
'<rootDir>/test/e2e/client.babel.spec.ts',
18+
// '<rootDir>/test/e2e/v2.fetch.spec.ts',
19+
// '<rootDir>/test/e2e/v2.xhr.spec.ts',
20+
// '<rootDir>/test/e2e/v2.node.spec.ts',
21+
// '<rootDir>/test/e2e/v2.axios.spec.ts',
22+
// '<rootDir>/test/e2e/v2.babel.spec.ts',
23+
'<rootDir>/test/e2e/v2.angular.spec.ts',
24+
// '<rootDir>/test/e2e/v3.fetch.spec.ts',
25+
// '<rootDir>/test/e2e/v3.xhr.spec.ts',
26+
// '<rootDir>/test/e2e/v3.node.spec.ts',
27+
// '<rootDir>/test/e2e/v3.axios.spec.ts',
28+
// '<rootDir>/test/e2e/v3.babel.spec.ts',
29+
'<rootDir>/test/e2e/v3.angular.spec.ts',
30+
// '<rootDir>/test/e2e/client.fetch.spec.ts',
31+
// '<rootDir>/test/e2e/client.xhr.spec.ts',
32+
// '<rootDir>/test/e2e/client.node.spec.ts',
33+
// '<rootDir>/test/e2e/client.axios.spec.ts',
34+
// '<rootDir>/test/e2e/client.babel.spec.ts',
3335
],
3436
},
3537
],

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@
6565
},
6666
"devDependencies": {
6767
"@angular/common": "13.1.3",
68+
"@angular/compiler": "13.1.3",
6869
"@angular/core": "13.1.3",
6970
"@angular/platform-browser": "13.1.3",
71+
"@angular/platform-browser-dynamic": "13.1.3",
7072
"@babel/cli": "7.16.8",
7173
"@babel/core": "7.16.12",
7274
"@babel/preset-env": "7.16.11",

‎src/templates/core/angular/request.hbs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{>header}}
22

3-
import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
3+
import { HttpClient, HttpHeaders } from '@angular/common/http';
4+
import type { HttpResponse } from '@angular/common/http';
45
import { Observable } from 'rxjs';
56

67
import { ApiError } from './ApiError';

‎test/e2e/assets/angular-openapi-v2.ts

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import { HttpClientModule } from '@angular/common/http';
2+
import { Component, NgModule } from '@angular/core';
3+
import { BrowserModule } from '@angular/platform-browser';
4+
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
5+
6+
import { CollectionFormatService } from './services/CollectionFormatService';
7+
import { ComplexService } from './services/ComplexService';
8+
import { DefaultService } from './services/DefaultService';
9+
import { DefaultsService } from './services/DefaultsService';
10+
import { DuplicateService } from './services/DuplicateService';
11+
import { ErrorService } from './services/ErrorService';
12+
import { HeaderService } from './services/HeaderService';
13+
import { MultipleTags1Service } from './services/MultipleTags1Service';
14+
import { MultipleTags2Service } from './services/MultipleTags2Service';
15+
import { MultipleTags3Service } from './services/MultipleTags3Service';
16+
import { NoContentService } from './services/NoContentService';
17+
import { ParametersService } from './services/ParametersService';
18+
import { ResponseService } from './services/ResponseService';
19+
import { SimpleService } from './services/SimpleService';
20+
import { TypesService } from './services/TypesService';
21+
22+
@Component({
23+
selector: 'app-root',
24+
templateUrl: `<div>Angular</div>`,
25+
})
26+
export class AppComponent {}
27+
28+
@NgModule({
29+
imports: [BrowserModule, HttpClientModule],
30+
providers: [
31+
CollectionFormatService,
32+
ComplexService,
33+
DefaultService,
34+
DefaultsService,
35+
DuplicateService,
36+
ErrorService,
37+
HeaderService,
38+
MultipleTags1Service,
39+
MultipleTags2Service,
40+
MultipleTags3Service,
41+
NoContentService,
42+
ParametersService,
43+
ResponseService,
44+
SimpleService,
45+
TypesService,
46+
],
47+
declarations: [AppComponent],
48+
bootstrap: [AppComponent],
49+
})
50+
export class AppModule {}
51+
52+
platformBrowserDynamic().bootstrapModule(AppModule);

‎test/e2e/assets/angular-openapi-v3.ts

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import { HttpClientModule } from '@angular/common/http';
2+
import { Component, NgModule } from '@angular/core';
3+
import { BrowserModule } from '@angular/platform-browser';
4+
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
5+
6+
import { CollectionFormatService } from './services/CollectionFormatService';
7+
import { ComplexService } from './services/ComplexService';
8+
import { DefaultService } from './services/DefaultService';
9+
import { DefaultsService } from './services/DefaultsService';
10+
import { DuplicateService } from './services/DuplicateService';
11+
import { ErrorService } from './services/ErrorService';
12+
import { FormDataService } from './services/FormDataService';
13+
import { HeaderService } from './services/HeaderService';
14+
import { MultipartService } from './services/MultipartService';
15+
import { MultipleTags1Service } from './services/MultipleTags1Service';
16+
import { MultipleTags2Service } from './services/MultipleTags2Service';
17+
import { MultipleTags3Service } from './services/MultipleTags3Service';
18+
import { NoContentService } from './services/NoContentService';
19+
import { ParametersService } from './services/ParametersService';
20+
import { RequestBodyService } from './services/RequestBodyService';
21+
import { ResponseService } from './services/ResponseService';
22+
import { SimpleService } from './services/SimpleService';
23+
import { TypesService } from './services/TypesService';
24+
import { UploadService } from './services/UploadService';
25+
26+
@Component({
27+
selector: 'app-root',
28+
templateUrl: `<div>Angular</div>`,
29+
})
30+
export class AppComponent {}
31+
32+
@NgModule({
33+
imports: [BrowserModule, HttpClientModule],
34+
providers: [
35+
CollectionFormatService,
36+
ComplexService,
37+
DefaultService,
38+
DefaultsService,
39+
DuplicateService,
40+
ErrorService,
41+
FormDataService,
42+
HeaderService,
43+
MultipartService,
44+
MultipleTags1Service,
45+
MultipleTags2Service,
46+
MultipleTags3Service,
47+
NoContentService,
48+
ParametersService,
49+
RequestBodyService,
50+
ResponseService,
51+
SimpleService,
52+
TypesService,
53+
UploadService,
54+
],
55+
})
56+
export class AppModule {}
57+
58+
platformBrowserDynamic().bootstrapModule(AppModule);

‎test/e2e/client.babel.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import server from './scripts/server';
77
describe('v3.babel', () => {
88
beforeAll(async () => {
99
await generate('client/babel', 'v3', 'fetch', true, true, 'AppClient');
10-
await copy('client/babel');
10+
await copy('script.js', 'client/babel/script.js');
1111
compileWithBabel('client/babel');
1212
await server.start('client/babel');
1313
await browser.start();

‎test/e2e/client.fetch.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import server from './scripts/server';
77
describe('v3.fetch', () => {
88
beforeAll(async () => {
99
await generate('client/fetch', 'v3', 'fetch', false, false, 'AppClient');
10-
await copy('client/fetch');
10+
await copy('script.js', 'client/fetch/script.js');
1111
compileWithTypescript('client/fetch');
1212
await server.start('client/fetch');
1313
await browser.start();

‎test/e2e/client.xhr.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import server from './scripts/server';
77
describe('v3.xhr', () => {
88
beforeAll(async () => {
99
await generate('client/xhr', 'v3', 'xhr', false, false, 'AppClient');
10-
await copy('client/xhr');
10+
await copy('script.js', 'client/xhr/script.js');
1111
compileWithTypescript('client/xhr');
1212
await server.start('client/xhr');
1313
await browser.start();

‎test/e2e/scripts/compileWithTypescript.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ export const compileWithTypescript = (dir: string) => {
2727
strict: true,
2828
skipLibCheck: true,
2929
allowSyntheticDefaultImports: true,
30+
experimentalDecorators: true,
3031
},
31-
include: ['./index.ts'],
32+
include: ['./index.ts', './main.ts'],
3233
};
3334

3435
// Compile files to JavaScript (ES6 modules)

‎test/e2e/scripts/copy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { copyFileSync } from 'fs';
22

3-
export const copy = (dir: string) => {
4-
copyFileSync('./test/e2e/assets/script.js', `./test/e2e/generated/${dir}/script.js`);
3+
export const copy = (fileNameIn: string, fileNameOut: string) => {
4+
copyFileSync(`./test/e2e/assets/${fileNameIn}`, `./test/e2e/generated/${fileNameOut}`);
55
};

0 commit comments

Comments
 (0)