fix(tests): get angular e2e tests working

hey-api · Mar 23, 2024 · 78e3230 · 78e3230
1 parent 7ac131b
commit 78e3230
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 37 deletions.
diff --git a/test/e2e/assets/main-angular-module.ts b/test/e2e/assets/main-angular-module.ts
@@ -3,23 +3,23 @@ import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { ApiModule } from './ApiModule';
-import { OpenAPI } from './core/OpenAPI';
-import { CollectionFormatService } from './services/CollectionFormatService';
-import { ComplexService } from './services/ComplexService';
-import { DefaultService } from './services/DefaultService';
-import { DefaultsService } from './services/DefaultsService';
-import { DuplicateService } from './services/DuplicateService';
-import { ErrorService } from './services/ErrorService';
-import { HeaderService } from './services/HeaderService';
-import { MultipleTags1Service } from './services/MultipleTags1Service';
-import { MultipleTags2Service } from './services/MultipleTags2Service';
-import { MultipleTags3Service } from './services/MultipleTags3Service';
-import { NoContentService } from './services/NoContentService';
-import { ParametersService } from './services/ParametersService';
-import { ResponseService } from './services/ResponseService';
-import { SimpleService } from './services/SimpleService';
-import { TypesService } from './services/TypesService';
+import { ApiModule } from './client/ApiModule';
+import { OpenAPI } from './client/core/OpenAPI';
+import { CollectionFormatService } from './client/services/CollectionFormatService';
+import { ComplexService } from './client/services/ComplexService';
+import { DefaultService } from './client/services/DefaultService';
+import { DefaultsService } from './client/services/DefaultsService';
+import { DuplicateService } from './client/services/DuplicateService';
+import { ErrorService } from './client/services/ErrorService';
+import { HeaderService } from './client/services/HeaderService';
+import { MultipleTags1Service } from './client/services/MultipleTags1Service';
+import { MultipleTags2Service } from './client/services/MultipleTags2Service';
+import { MultipleTags3Service } from './client/services/MultipleTags3Service';
+import { NoContentService } from './client/services/NoContentService';
+import { ParametersService } from './client/services/ParametersService';
+import { ResponseService } from './client/services/ResponseService';
+import { SimpleService } from './client/services/SimpleService';
+import { TypesService } from './client/services/TypesService';
 
 @Component({
     selector: 'app-root',

diff --git a/test/e2e/assets/main-angular.ts b/test/e2e/assets/main-angular.ts
@@ -3,22 +3,22 @@ import { Component, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { OpenAPI } from './core/OpenAPI';
-import { CollectionFormatService } from './services/CollectionFormatService';
-import { ComplexService } from './services/ComplexService';
-import { DefaultService } from './services/DefaultService';
-import { DefaultsService } from './services/DefaultsService';
-import { DuplicateService } from './services/DuplicateService';
-import { ErrorService } from './services/ErrorService';
-import { HeaderService } from './services/HeaderService';
-import { MultipleTags1Service } from './services/MultipleTags1Service';
-import { MultipleTags2Service } from './services/MultipleTags2Service';
-import { MultipleTags3Service } from './services/MultipleTags3Service';
-import { NoContentService } from './services/NoContentService';
-import { ParametersService } from './services/ParametersService';
-import { ResponseService } from './services/ResponseService';
-import { SimpleService } from './services/SimpleService';
-import { TypesService } from './services/TypesService';
+import { OpenAPI } from './client/core/OpenAPI';
+import { CollectionFormatService } from './client/services/CollectionFormatService';
+import { ComplexService } from './client/services/ComplexService';
+import { DefaultService } from './client/services/DefaultService';
+import { DefaultsService } from './client/services/DefaultsService';
+import { DuplicateService } from './client/services/DuplicateService';
+import { ErrorService } from './client/services/ErrorService';
+import { HeaderService } from './client/services/HeaderService';
+import { MultipleTags1Service } from './client/services/MultipleTags1Service';
+import { MultipleTags2Service } from './client/services/MultipleTags2Service';
+import { MultipleTags3Service } from './client/services/MultipleTags3Service';
+import { NoContentService } from './client/services/NoContentService';
+import { ParametersService } from './client/services/ParametersService';
+import { ResponseService } from './client/services/ResponseService';
+import { SimpleService } from './client/services/SimpleService';
+import { TypesService } from './client/services/TypesService';
 
 @Component({
     selector: 'app-root',

diff --git a/test/e2e/client.angular.spec.ts b/test/e2e/client.angular.spec.ts
@@ -12,7 +12,7 @@ describe('client.angular', () => {
     beforeAll(async () => {
         cleanup('client/angular');
         createAngularProject('client/angular', 'app');
-        await generateClient('client/angular/app/src', 'v3', 'angular', false, 'ApiModule');
+        await generateClient('client/angular/app/src/client', 'v3', 'angular', false, 'ApiModule');
         copyAsset('main-angular-module.ts', 'client/angular/app/src/main.ts');
         buildAngularProject('client/angular', 'app', 'dist');
         await server.start('client/angular/app/dist/browser');

diff --git a/test/e2e/v2.angular.spec.ts b/test/e2e/v2.angular.spec.ts
@@ -12,7 +12,7 @@ describe('v2.angular', () => {
     beforeAll(async () => {
         cleanup('v2/angular');
         createAngularProject('v2/angular', 'app');
-        await generateClient('v2/angular/app/src', 'v2', 'angular');
+        await generateClient('v2/angular/app/src/client', 'v2', 'angular');
         copyAsset('main-angular.ts', 'v2/angular/app/src/main.ts');
         buildAngularProject('v2/angular', 'app', 'dist');
         await server.start('v2/angular/app/dist/browser');

diff --git a/test/e2e/v3.angular.spec.ts b/test/e2e/v3.angular.spec.ts
@@ -12,7 +12,7 @@ describe('v3.angular', () => {
     beforeAll(async () => {
         cleanup('v3/angular');
         createAngularProject('v3/angular', 'app');
-        await generateClient('v3/angular/app/src', 'v3', 'angular');
+        await generateClient('v3/angular/app/src/client', 'v3', 'angular');
         copyAsset('main-angular.ts', 'v3/angular/app/src/main.ts');
         buildAngularProject('v3/angular', 'app', 'dist');
         await server.start('v3/angular/app/dist/browser');

diff --git a/vitest.config.e2e.ts b/vitest.config.e2e.ts
@@ -11,7 +11,6 @@ export default defineConfig({
         // And that the port was not previously taken.
         fileParallelism: false,
         include: ['test/e2e/**/*.spec.ts'],
-        exclude: ['test/e2e/**/*.angular.spec.ts'],
         root: fileURLToPath(new URL('./', import.meta.url)),
     },
 });