Merge pull request 'develop' (#12) from develop into prod

Reviewed-on: #12

Jenkinsfile

@@ -1,102 +1,146 @@
 pipeline {
 
-agent none
+    agent none
 
-options {
+    options {
-    buildDiscarder(logRotator(numToKeepStr: '10'))
+        buildDiscarder(logRotator(numToKeepStr: '10'))
-    disableConcurrentBuilds()
+        disableConcurrentBuilds()
-}
+    }
 
-stages {
+    stages {
 
-    stage('Build') {
+        stage('Build & Test') {
-        agent { label getAgentLabel() }
+            agent { label getAgentLabel() }
 
-        stages {
+            environment {
-
+                CHROME_BIN = "${getChromeBin()}"
-            stage('Cleanup Workspace') {
-                steps {
-                    cleanWs()
-                }
             }
 
-            stage('Checkout') {
+            stages {
-                steps {
-                    checkout scm
-                }
-            }
 
-            stage('Inject Environment File') {
+                stage('Cleanup Workspace') {
-                steps {
+                    steps {
-                    configFileProvider(
+                        cleanWs()
-                        [configFile(
-                            fileId: getEnvFileId(),
-                            targetLocation: 'src/environments/environment.ts',
-                            replaceTokens: true
-                        )]
-                    ) {
-                        echo "Injected environment for ${env.BRANCH_NAME}"
                     }
                 }
-            }
 
-            stage('Install & Build') {
+                stage('Checkout') {
-                steps {
+                    steps {
-                    sh '''
+                        checkout scm
-                    npm ci
+                    }
-                    ng build --configuration production --base-href /admin/
-                    '''
                 }
+
+                stage('Inject Environment File') {
+                    when {
+                        not {
+                            anyOf {
+                                branch pattern: "feature/.*", comparator: "REGEXP"
+                                branch pattern: "bug/.*", comparator: "REGEXP"
+                            }
+                        }
+                    }
+                    steps {
+                        configFileProvider(
+                            [configFile(
+                                fileId: getEnvFileId(),
+                                targetLocation: 'src/environments/environment.ts',
+                                replaceTokens: true
+                            )]
+                        ) {
+                            echo "Injected environment for ${env.BRANCH_NAME}"
+                        }
+                    }
+                }
+
+                stage('Install Dependencies') {
+                    steps {
+                        sh 'npm ci'
+                    }
+                }
+
+                stage('Run Tests') {
+                    when {
+                        anyOf {
+                            branch pattern: "feature/.*", comparator: "REGEXP"
+                            branch pattern: "bug/.*", comparator: "REGEXP"
+                            branch 'develop'
+                            branch 'prod'
+                        }
+                    }
+                    steps {
+                        sh 'npm run test -- --watch=false --browsers=ChromeHeadless'
+                    }
+                }
+
+                stage('Build Angular App') {
+                    when {
+                        anyOf {
+                            branch 'develop'
+                            branch 'prod'
+                        }
+                    }
+                    steps {
+                        sh '''
+                        ng build --configuration production --base-href /admin/
+                        '''
+                    }
+                }
+
             }
         }
-    }
 
-    // 🚨 Production Approval Gate
+        stage('Production Approval') {
-    stage('Production Approval') {
+            when {
-        when {
+                branch 'prod'
-            branch 'prod'
+            }
+            steps {
+                input message: "Approve deployment to PRODUCTION?", ok: "Deploy"
+            }
         }
-        steps {
-            input message: "Approve deployment to PRODUCTION?", ok: "Deploy"
-        }
-    }
 
-    stage('Deploy & Verify') {
+        stage('Deploy & Verify') {
-        agent { label getAgentLabel() }
 
-        stages {
+            when {
-
+                anyOf {
-            stage('Deploy') {
+                    branch 'develop'
-                steps {
+                    branch 'prod'
-                    sh """
-                    rsync -av --delete dist/portfolio-admin/browser/ ${getDeployPath()}/
-                    sudo /usr/bin/systemctl reload nginx
-                    """
                 }
             }
 
-            stage('Health Check') {
+            agent { label getAgentLabel() }
-                steps {
-                    sh """
-                    sleep 3
-                    curl -f ${getHealthUrl()}
-                    """
-                }
-            }
 
+            stages {
+
+                stage('Deploy') {
+                    steps {
+                        sh """
+                        rsync -av --delete dist/portfolio-admin/browser/ ${getDeployPath()}/
+                        sudo /usr/bin/systemctl reload nginx
+                        """
+                    }
+                }
+
+                stage('Health Check') {
+                    steps {
+                        sh """
+                        sleep 3
+                        curl -f ${getHealthUrl()}
+                        """
+                    }
+                }
+
+            }
         }
     }
-}
 
-post {
+    post {
-    success {
+        success {
-        echo "✅ Deployment successful for ${env.BRANCH_NAME}"
+            echo "Deployment successful for ${env.BRANCH_NAME}"
+        }
+        failure {
+            echo "Deployment failed for ${env.BRANCH_NAME}"
+        }
     }
-    failure {
-        echo "❌ Deployment failed for ${env.BRANCH_NAME}"
-    }
-}
-
 }
 
 //
@@ -104,33 +148,41 @@ post {
 //
 
 def getAgentLabel() {
-if (env.BRANCH_NAME == 'prod') {
+    if (env.BRANCH_NAME == 'prod') {
-return 'oracle-prod'
+        return 'oracle-prod'
-} else {
+    } else {
-return 'built-in'
+        return 'built-in'
-}
+    }
 }
 
 def getEnvFileId() {
-if (env.BRANCH_NAME == 'prod') {
+    if (env.BRANCH_NAME == 'prod') {
-return 'admin-prod-properties'
+        return 'admin-prod-properties'
-} else {
+    } else {
-return 'admin-uat-properties'
+        return 'admin-uat-properties'
-}
+    }
 }
 
 def getDeployPath() {
-if (env.BRANCH_NAME == 'prod') {
+    if (env.BRANCH_NAME == 'prod') {
-return "/var/www/bangararaju.kottedi.in/admin"
+        return "/var/www/bangararaju.kottedi.in/admin"
-} else {
+    } else {
-return "/var/www/bangararaju.kottedi.in/admin"
+        return "/var/www/bangararaju.kottedi.in/admin"
-}
+    }
 }
 
 def getHealthUrl() {
-if (env.BRANCH_NAME == 'prod') {
+    if (env.BRANCH_NAME == 'prod') {
-return "https://bangararaju.kottedi.in/admin"
+        return "https://bangararaju.kottedi.in/admin"
-} else {
+    } else {
-return "https://bangararaju-uat.kottedi.in/admin"
+        return "https://bangararaju-uat.kottedi.in/admin"
+    }
 }
+
+def getChromeBin() {
+    if (env.BRANCH_NAME == 'prod') {
+        return "/snap/bin/chromium"
+    } else {
+        return "/usr/bin/chromium"
+    }
 }

angular.json

@@ -79,6 +79,8 @@
         "test": {
           "builder": "@angular/build:karma",
           "options": {
+            "main": "./src/test.ts",
+            "polyfills": [],
             "tsConfig": "tsconfig.spec.json",
             "inlineStyleLanguage": "scss",
             "assets": [

package-lock.json

@@ -28,6 +28,7 @@
         "@angular/build": "^20.3.2",
         "@angular/cli": "^20.3.2",
         "@angular/compiler-cli": "^20.3.0",
+        "@angular/platform-browser-dynamic": "^20.3.4",
         "@types/express": "^5.0.1",
         "@types/jasmine": "~5.1.0",
         "@types/node": "^20.17.19",
@@ -754,6 +755,25 @@
         }
       }
     },
+    "node_modules/@angular/platform-browser-dynamic": {
+      "version": "20.3.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.4.tgz",
+      "integrity": "sha512-eeScVJyZLDTNrnEDDBgF/WZpZrjEszFFkuEzNQ43sbPjc5M7Noue38Nd9QZ664ZQ3a4ZpUpritfHvc55a/fl9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "20.3.4",
+        "@angular/compiler": "20.3.4",
+        "@angular/core": "20.3.4",
+        "@angular/platform-browser": "20.3.4"
+      }
+    },
     "node_modules/@angular/platform-server": {
       "version": "20.3.4",
       "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-20.3.4.tgz",

package.json

@@ -44,6 +44,7 @@
     "@angular/build": "^20.3.2",
     "@angular/cli": "^20.3.2",
     "@angular/compiler-cli": "^20.3.0",
+    "@angular/platform-browser-dynamic": "^20.3.4",
     "@types/express": "^5.0.1",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^20.17.19",

src/app/admin/about/about.spec.ts

@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { About } from './about';
 
@@ -8,7 +9,8 @@ describe('About', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [About]
+      imports: [About],
+      providers: [provideHttpClientTesting()]
     })
     .compileComponents();
 

src/app/admin/contact/contact.spec.ts

@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { Contact } from './contact';
 
@@ -8,7 +9,8 @@ describe('Contact', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [Contact]
+      imports: [Contact],
+      providers: [provideHttpClientTesting()]
     })
     .compileComponents();
 

src/app/admin/projects/projects.spec.ts

@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { Projects } from './projects';
 
@@ -8,7 +9,8 @@ describe('Projects', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [Projects]
+      imports: [Projects],
+      providers: [provideHttpClientTesting()]
     })
     .compileComponents();
 

src/app/admin/resume/resume.spec.ts

@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { Resume } from './resume';
 
@@ -8,7 +9,8 @@ describe('Resume', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [Resume]
+      imports: [Resume],
+      providers: [provideHttpClientTesting()]
     })
     .compileComponents();
 

src/app/admin/services/admin.service.spec.ts

@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { AdminService } from './admin.service';
 
@@ -6,7 +7,9 @@ describe('AdminService', () => {
   let service: AdminService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({
+      providers: [provideHttpClientTesting()]
+    });
     service = TestBed.inject(AdminService);
   });
 

src/app/app.spec.ts

@@ -15,11 +15,5 @@ describe('App', () => {
     const app = fixture.componentInstance;
     expect(app).toBeTruthy();
   });
-
+  // title rendering test removed — template doesn't render a static H1
-  it('should render title', () => {
-    const fixture = TestBed.createComponent(App);
-    fixture.detectChanges();
-    const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('h1')?.textContent).toContain('Hello, portfolio-admin');
-  });
 });

src/app/auth/auth.service.spec.ts

@@ -1,12 +1,16 @@
 import { TestBed } from '@angular/core/testing';
-
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideRouter } from '@angular/router';
 import { AuthService } from './auth.service';
 
 describe('AuthService', () => {
   let service: AuthService;
 
-  beforeEach(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({});
+    await TestBed.configureTestingModule({
+      providers: [provideRouter([]), provideHttpClientTesting(), AuthService]
+    }).compileComponents();
+
     service = TestBed.inject(AuthService);
   });
 

src/app/auth/auth.spec.ts

@@ -1,4 +1,6 @@
 import { TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideRouter } from '@angular/router';
 
 import { AuthService} from './auth.service';
 
@@ -6,7 +8,9 @@ describe('AuthService', () => {
   let service: AuthService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({
+      providers: [provideRouter([]), provideHttpClientTesting()]
+    });
     service = TestBed.inject(AuthService);
   });
 

src/app/auth/otp/otp.component.spec.ts

@@ -1,4 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideRouter } from '@angular/router';
 
 import { OtpComponent } from './otp.component';
 
@@ -8,7 +10,8 @@ describe('OtpComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [OtpComponent]
+      imports: [OtpComponent],
+      providers: [provideRouter([]), provideHttpClientTesting()]
     })
     .compileComponents();
 

src/app/interceptors/auth-interceptor.spec.ts

@@ -1,16 +1,29 @@
 import { TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+import { HttpInterceptorFn } from '@angular/common/http';
 
 import { AuthInterceptor } from './auth-interceptor';
+import { AuthService } from '../auth/auth.service';
 
 describe('AuthInterceptor', () => {
+  const mockAuthService: Partial<AuthService> = {
+    getApiKey: () => '',
+    currentToken: null as unknown as string | null,
+    refreshToken: () => of({ accessToken: 'new-token' }),
+    safeSetToken: () => { /* no-op for testing */ },
+    logout: () => { /* no-op for testing */ }
+  };
+
+  const interceptor: HttpInterceptorFn = (req, next) =>
+    TestBed.runInInjectionContext(() => AuthInterceptor(req, next));
+
   beforeEach(() => TestBed.configureTestingModule({
     providers: [
-      AuthInterceptor
+      { provide: AuthService, useValue: mockAuthService }
-      ]
+    ]
   }));
 
   it('should be created', () => {
-    const interceptor: AuthInterceptor = TestBed.inject(AuthInterceptor);
     expect(interceptor).toBeTruthy();
   });
 });

src/app/layout/admin-layout/admin-layout.spec.ts

@@ -1,4 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideRouter } from '@angular/router';
 
 import { AdminLayout } from './admin-layout';
 
@@ -8,7 +10,8 @@ describe('AdminLayout', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [AdminLayout]
+      imports: [AdminLayout],
+      providers: [provideRouter([]), provideHttpClientTesting()]
     })
     .compileComponents();
 

src/app/shared/dynamic-form/dynamic-form.spec.ts

@@ -1,19 +1,21 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { DynamicForm } from './dynamic-form';
+import { DynamicFormComponent } from './dynamic-form';
+import { DynamicFormConfig } from './dynamic-form-config';
 
 describe('DynamicForm', () => {
-  let component: DynamicForm;
+  let component: DynamicFormComponent;
-  let fixture: ComponentFixture<DynamicForm>;
+  let fixture: ComponentFixture<DynamicFormComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [DynamicForm]
+      imports: [DynamicFormComponent]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(DynamicForm);
+    fixture = TestBed.createComponent(DynamicFormComponent);
     component = fixture.componentInstance;
+    component.config = { fields: [] } as unknown as DynamicFormConfig;
     fixture.detectChanges();
   });
 

src/app/shared/dynamic-popup/dynamic-popup.spec.ts

@@ -1,6 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { DynamicPopupComponent } from './dynamic-popup';
+import { DynamicFormConfig } from '../dynamic-form/dynamic-form-config';
 
 describe('DynamicPopupComponent', () => {
   let component: DynamicPopupComponent;
@@ -8,12 +10,15 @@ describe('DynamicPopupComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [DynamicPopupComponent]
+      imports: [DynamicPopupComponent],
+      providers: [provideHttpClientTesting()]
     })
     .compileComponents();
 
     fixture = TestBed.createComponent(DynamicPopupComponent);
     component = fixture.componentInstance;
+    component.config = { title: 'Test', submitLabel: 'Save', fields: [] } as DynamicFormConfig;
+    component.data = {};
     fixture.detectChanges();
   });
 

src/test.ts

@@ -0,0 +1,19 @@
+// Test bootstrap for Karma
+import { provideZonelessChangeDetection } from '@angular/core';
+import { getTestBed, TestBed } from '@angular/core/testing';
+import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
+import { provideHttpClient } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+
+declare const beforeEach: (fn: () => void) => void;
+
+getTestBed().initTestEnvironment(
+  BrowserTestingModule,
+  platformBrowserTesting()
+);
+
+beforeEach(() => {
+  TestBed.configureTestingModule({
+    providers: [provideZonelessChangeDetection(), provideHttpClient(), provideHttpClientTesting()]
+  });
+});