test: fix tests for github action

.github/workflows/unit-test.yml

@@ -1,35 +1,35 @@
-# name: Unit Test
+name: Unit Test
 
-# on:
-#   pull_request:
-#     types: [assigned,  opened,  synchronize,  reopened]
+on:
+  pull_request:
+    types: [assigned,  opened,  synchronize,  reopened]
 
-# jobs:
-#   unit-test:
-#     permissions: write-all
-#     runs-on: ubuntu-latest
-#     steps:
-#     - uses: actions/checkout@v1
-#     - name: Setup GitHub Action
-#       uses: actions/setup-node@v1
-#       with:
-#         node-version: 14.18
-#     - name: Install dependencies
-#       run: npm install
-#     - name: Test
-#       run: npm run unit_test:ci
-#       env:
-#         FYLE_CLIENT_ID: "lolo" 
-#         CALLBACK_URI: "http://lolo.fyle.tech/callback"
-#         API_URL: "http://lolo.fyle.tech"
-#         FYLE_APP_URL: "http://lolo.fyle.tech"
-#         SI_API_URL: "http://lolo.fyle.tech"
-#         SAGE300_API_URL: "http://lolo.fyle.tech"
-#     - name: Unit Test Coverage
-#       uses: fylein/comment-test-coverage@master
-#       with:
-#         token: ${{ secrets.GITHUB_TOKEN }}
-#         path: coverage/coverage-summary.json
-#         title: Unit Test Coverage
-#     - name: Upload coverage to Codecov
-#       uses: codecov/codecov-action@v3
+jobs:
+  unit-test:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Setup GitHub Action
+      uses: actions/setup-node@v1
+      with:
+        node-version: 22.2.0
+    - name: Install dependencies
+      run: npm install
+    - name: Test
+      run: npm run unit_test:ci
+      env:
+        FYLE_CLIENT_ID: "lolo" 
+        CALLBACK_URI: "http://lolo.fyle.tech/callback"
+        CLUSTER_DOMAIN_API_URL: "http://lolo.fyle.tech"
+        FYLE_APP_URL: "http://lolo.fyle.tech"
+        SI_API_URL: "http://lolo.fyle.tech"
+        SAGE300_API_URL: "http://lolo.fyle.tech"
+    - name: Unit Test Coverage
+      uses: fylein/comment-test-coverage@master
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        path: coverage/coverage-summary.json
+        title: Unit Test Coverage
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3

package.json

@@ -7,7 +7,7 @@
     "build": "npm run setup:env && npm run setup:branding && ng build && npm run sentry:sourcemaps",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
-    "unit_test:ci": "npm run setup:env && ng test --watch=false --browsers=ChromeHeadlessCustom",
+    "unit_test:ci": "npm run setup:env && npm run setup:branding && ng test --watch=false --browsers=ChromeHeadlessCustom",
     "setup:env": "node scripts/setup_env.js",
     "setup:branding": "node scripts/setup_branding_config.js",
     "lint": "ng lint",

src/app/core/interceptor/jwt.interceptor.spec.ts

@@ -17,7 +17,7 @@ xdescribe('JwtInterceptor', () => {
   let interceptor: JwtInterceptor;
   let authService: AuthService;
   let jwtHelperService: JwtHelperService;
-  const API_BASE_URL = environment.api_url;
+  const API_BASE_URL = environment.cluster_domain_api_url;
 
   beforeEach(() => {
     const service1 = {

src/app/core/services/bamboo-hr/bamboo-hr.service.spec.ts

@@ -11,7 +11,7 @@ xdescribe('BambooHrService', () => {
   let injector: TestBed;
   let httpMock: HttpTestingController;
   let orgService: OrgService;
-  const API_BASE_URL = environment.api_url;
+  const API_BASE_URL = environment.cluster_domain_api_url;
   const service1 = {
     getOrgId: () => 1
   };

src/app/core/services/common/api.service.spec.ts

@@ -15,7 +15,7 @@ xdescribe('ApiService', () => {
     statusText: 'Bad request'
   };
 
-  const API_BASE_URL = environment.api_url;
+  const API_BASE_URL = environment.cluster_domain_api_url;
 
   beforeEach(() => {
     TestBed.configureTestingModule({

src/app/core/services/common/auth.service.spec.ts

@@ -11,7 +11,7 @@ xdescribe('AuthService', () => {
   let injector: TestBed;
   let httpMock: HttpTestingController;
   let userService: UserService;
-  const API_BASE_URL = environment.api_url;
+  const API_BASE_URL = environment.cluster_domain_api_url;
   const routerSpy = { navigate: jasmine.createSpy('navigate'), url: '/auth/login' };
 
   const service1 = {

src/app/core/services/common/clone-setting.service.spec.ts

@@ -8,7 +8,7 @@ xdescribe('CloneSettingService', () => {
   let service: CloneSettingService;
   let injector: TestBed;
   let httpMock: HttpTestingController;
-  const API_BASE_URL = environment.api_url;
+  const API_BASE_URL = environment.cluster_domain_api_url;
   const workspace_id = 1;
 
   beforeEach(() => {

src/app/core/services/org/org.service.spec.ts

@@ -13,7 +13,7 @@ xdescribe('OrgService', () => {
   let injector: TestBed;
   let httpMock: HttpTestingController;
   let storageService: StorageService;
-  const API_BASE_URL = environment.api_url;
+  const API_BASE_URL = environment.cluster_domain_api_url;
 
   const service1 = {
     get: () => '1'

src/app/core/services/travelperk/travelperk.service.spec.ts

@@ -11,7 +11,7 @@ xdescribe('TravelperkService', () => {
   let injector: TestBed;
   let httpMock: HttpTestingController;
   let orgService: OrgService;
-  const API_BASE_URL = environment.api_url;
+  const API_BASE_URL = environment.cluster_domain_api_url;
   const service1 = {
     getOrgId: () => 1
   };

src/app/integrations/intacct/intacct-shared/intacct-c1-import-settings/intacct-c1-import-settings.component.spec.ts

@@ -412,10 +412,14 @@ describe('IntacctC1ImportSettingsComponent', () => {
       expect((component.importSettingsForm.get('expenseFields') as FormArray).length).toBe(initialLength + 1);
     });
 
-    it('closeModel should reset customFieldForm and close dialog', () => {
+    it('closeModel should close the dialog and reset the form and the source field', () => {
       component.customFieldForm.patchValue({ attribute_type: 'TEST' });
+      component.customFieldControl = component['createFormGroup'](blankMapping);
       component.showDialog = true;
+
       component.closeModel();
+
+      expect(component.customFieldControl.get('source_field')?.value).toBeNull();
       expect(component.customFieldForm.value).toEqual({ attribute_type: null, display_name: null, source_placeholder: null });
       expect(component.showDialog).toBeFalse();
     });

src/app/integrations/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.spec.ts

@@ -13,7 +13,7 @@ import { TrackingService } from 'src/app/core/services/integration/tracking.serv
 import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
 import { StorageService } from 'src/app/core/services/common/storage.service';
 import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service';
-import { configuration, costCodeFieldValue, costTypeFieldValue, customField, customFieldValue, fyleFields, groupedDestinationAttributes, importSettings, importSettingsWithProjectMapping, intacctImportCodeConfig, locationEntityMapping, sageIntacctFields, sageIntacctFieldsSortedByPriority, settingsWithDependentFields } from '../../intacct.fixture';
+import { blankMapping, configuration, costCodeFieldValue, costTypeFieldValue, customField, customFieldValue, fyleFields, groupedDestinationAttributes, importSettings, importSettingsWithProjectMapping, intacctImportCodeConfig, locationEntityMapping, sageIntacctFields, sageIntacctFieldsSortedByPriority, settingsWithDependentFields } from '../../intacct.fixture';
 import { IntacctCategoryDestination, IntacctOnboardingState, IntacctUpdateEvent, MappingSourceField, Page, ProgressPhase, SageIntacctField, ToastSeverity, TrackingApp } from 'src/app/core/models/enum/enum.model';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { Org } from 'src/app/core/models/org/org.model';
@@ -485,14 +485,16 @@ describe('IntacctImportSettingsComponent', () => {
       expect(component.expenseFieldsGetter.length).toBe(initialLength + 1);
     });
 
-    it('closeModel should reset form and close dialog', () => {
+    it('closeModel should close the dialog and reset the form and the source field', () => {
       component.customFieldForm = component['formBuilder'].group({
         testField: ['value']
       });
+      component.customFieldControl = component['createFormGroup'](blankMapping);
       component.showDialog = true;
 
       component.closeModel();
 
+      expect(component.customFieldControl.get('source_field')?.value).toBeNull();
       expect(component.customFieldForm.get('testField')?.value).toBeNull();
       expect(component.showDialog).toBeFalse();
     });