Merge pull request #448 from hannaeko/avoid-bundling-tests-fixture-prod

Avoid bundling the mock interceptor in prod env
zonemaster · Jun 17, 2024 · 2081722 · 2081722
2 parents 63824b2 + 2d257ed
commit 2081722
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { NgModule, APP_INITIALIZER } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule, Routes } from '@angular/router';
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { environment } from '../environments/environment';
@@ -29,11 +29,6 @@ import { AlertService } from './services/alert.service';
 import { NavigationService } from './services/navigation.service';
 import { HeaderComponent } from './components/header/header.component';
 
-import { HttpRequestInterceptor } from './interceptors/request.interceptor';
-import { HttpMockRequestInterceptor } from './interceptors/mock.interceptor';
-
-export const isMock = environment.mock;
-
 const appRoutes: Routes = [
   { path: 'run-test/:domain', component: DomainComponent },
   { path: 'run-test', component: DomainComponent },
@@ -82,19 +77,15 @@ const appRoutes: Routes = [
     DnsCheckService,
     AlertService,
     NavigationService,
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: isMock ? HttpMockRequestInterceptor : HttpRequestInterceptor,
-      multi: true
-    },
     {
       provide: APP_INITIALIZER,
       useFactory: (appService: AppService) => {
         return () => appService.loadConfig()
       },
       multi: true,
       deps: [AppService]
-    }
+    },
+    ...environment.extraProvider,
   ],
   bootstrap: [AppComponent]
 })

diff --git a/src/app/interceptors/request.interceptor.ts b/src/app/interceptors/request.interceptor.ts
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -4,5 +4,6 @@ export const environment = {
   ...common,
   production: true,
   apiEndpoint: '/api',
-  mock: false
+  mock: false,
+  extraProvider: [],
 };
diff --git a/src/environments/environment.tests.ts b/src/environments/environment.tests.ts
@@ -1,4 +1,6 @@
 import { common } from "./common";
+import { HTTP_INTERCEPTORS } from "@angular/common/http";
+import { HttpMockRequestInterceptor } from "../app/interceptors/mock.interceptor";
 
 export const environment = {
   ...common,
@@ -8,4 +10,11 @@ export const environment = {
   // Use a non existent file to always load the config from the environment file
   configUrl: 'assets/app.config.non-existent.json',
   pollingInterval: 0.1 * 1000,
+  extraProvider: [
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: HttpMockRequestInterceptor,
+      multi: true
+    }
+  ]
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -3,10 +3,19 @@
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 import { common } from "./common";
+import { HttpMockRequestInterceptor } from "../app/interceptors/mock.interceptor";
+import { HTTP_INTERCEPTORS } from "@angular/common/http";
 
 export const environment = {
   ...common,
   production: false,
   apiEndpoint: '/api',
-  mock: true
+  mock: true,
+  extraProvider: [
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: HttpMockRequestInterceptor,
+      multi: true
+    }
+  ]
 };