feat: TT-190 test

Author: LEON12699

src/app/modules/users/components/users-list/users-list.component.html

@@ -10,7 +10,7 @@
       <tr class="d-flex flex-wrap">
         <th class="col-4">User Email</th>
         <th class="col-5">Names</th>
-        <th class="col-3">Roles</th>
+        <th class="col-3">{{ isUserGroupsToggleOn ? "Groups" : "Roles" }}</th>
       </tr>
     </thead>
     <app-loading-bar *ngIf="isLoading$ | async"></app-loading-bar>

src/app/modules/users/components/users-list/users-list.component.spec.ts

@@ -1,28 +1,43 @@
 import { HttpClient } from '@angular/common/http';
 import { FeatureManagerService } from 'src/app/modules/shared/feature-toggles/feature-toggle-manager.service';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { waitForAsync, ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { MockStore, provideMockStore } from '@ngrx/store/testing';
-
 import { NgxPaginationModule } from 'ngx-pagination';
 import { UsersListComponent } from './users-list.component';
-import { UserActionTypes, UserState, LoadUsers, GrantRoleUser, RevokeRoleUser } from '../../store';
+import {
+  UserActionTypes,
+  UserState,
+  LoadUsers,
+  GrantRoleUser,
+  RevokeRoleUser,
+  AddUserToGroup,
+  RemoveUserFromGroup,
+} from '../../store';
 import { ActionsSubject } from '@ngrx/store';
 import { DataTablesModule } from 'angular-datatables';
 import { of } from 'rxjs';
+import { FeatureToggleProvider } from 'src/app/modules/shared/feature-toggles/feature-toggle-provider.service';
+import { AppConfigurationClient } from '@azure/app-configuration';
+import { FeatureFilterProvider } from '../../../shared/feature-toggles/filters/feature-filter-provider.service';
+import { AzureAdB2CService } from '../../../login/services/azure.ad.b2c.service';
+import { FeatureToggleModel } from 'src/app/modules/shared/feature-toggles/feature-toggle.model';
 
 describe('UsersListComponent', () => {
   let component: UsersListComponent;
   let fixture: ComponentFixture<UsersListComponent>;
   let store: MockStore<UserState>;
   const actionSub: ActionsSubject = new ActionsSubject();
-  let featureManagerService: FeatureManagerService;
+  const fakeAppConfigurationConnectionString = 'Endpoint=http://fake.foo;Id=fake.id;Secret=fake.secret';
+  let service: FeatureManagerService;
+  let fakeFeatureToggleProvider;
 
   const state: UserState = {
     data: [
       {
         name: 'name',
         email: 'email',
         roles: ['admin', 'test'],
+        groups: ['time-tracker-admin', 'time-tracker-tester'],
         id: 'id',
         tenant_id: 'tenant id',
         deleted: 'delete',
@@ -34,12 +49,21 @@ describe('UsersListComponent', () => {
 
   beforeEach(
     waitForAsync(() => {
+
+      fakeFeatureToggleProvider = new FeatureToggleProvider(
+        new AppConfigurationClient(fakeAppConfigurationConnectionString),
+        new FeatureFilterProvider(new AzureAdB2CService())
+      );
+      //spyOn(fakeFeatureToggleProvider, 'getFeatureToggle').and.returnValue(of(aFeatureToggle));
+      service = new FeatureManagerService(fakeFeatureToggleProvider);
+
       TestBed.configureTestingModule({
         imports: [NgxPaginationModule, DataTablesModule],
         declarations: [UsersListComponent],
-        providers: [provideMockStore({ initialState: state }), { provide: ActionsSubject, useValue: actionSub }],
+        providers: [provideMockStore({ initialState: state }),
+          { provide: ActionsSubject, useValue: actionSub },
+          { provide: FeatureManagerService, useValue: service}],
       }).compileComponents();
-      featureManagerService = TestBed.inject(FeatureManagerService);
     })
   );
 
@@ -96,6 +120,27 @@ describe('UsersListComponent', () => {
     });
   });
 
+  const actionsGroupsParams = [
+    { actionType: UserActionTypes.ADD_USER_TO_GROUP_SUCCESS },
+    { actionType: UserActionTypes.REMOVE_USER_FROM_GROUP_SUCCESS },
+  ];
+
+  actionsGroupsParams.map((param) => {
+    it(`When action ${param.actionType} is dispatched should triggered load Users action`, () => {
+      spyOn(store, 'dispatch');
+
+      const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
+      const action = {
+        type: param.actionType,
+        payload: state.data,
+      };
+
+      actionSubject.next(action);
+
+      expect(store.dispatch).toHaveBeenCalledWith(new LoadUsers());
+    });
+  });
+
   const grantRoleTypes = [
     { roleId: 'admin', roleValue: 'time-tracker-admin' },
     { roleId: 'test', roleValue: 'time-tracker-tester' },
@@ -116,6 +161,25 @@ describe('UsersListComponent', () => {
     });
   });
 
+  const AddGroupTypes = [
+    { groupName: 'time-tracker-admin' },
+    { groupName: 'time-tracker-tester' }
+  ];
+
+  AddGroupTypes.map((param) => {
+    it(`When user switchGroup to ${param.groupName} and doesn't belong to any group, should add ${param.groupName} group to user`, () => {
+      const groupName = param.groupName;
+      const userGroups = [];
+      const userId = 'userId';
+
+      spyOn(store, 'dispatch');
+
+      component.switchGroup(userId, userGroups, groupName);
+
+      expect(store.dispatch).toHaveBeenCalledWith(new AddUserToGroup(userId, groupName));
+    });
+  });
+
   const revokeRoleTypes = [
     { roleId: 'admin', roleValue: 'time-tracker-admin', userRoles: ['time-tracker-admin'] },
     { roleId: 'test', roleValue: 'time-tracker-tester', userRoles: ['time-tracker-tester'] },
@@ -136,6 +200,25 @@ describe('UsersListComponent', () => {
     });
   });
 
+  const removeGroupTypes = [
+    { groupName: 'time-tracker-admin', userGroups: ['time-tracker-admin'] },
+    { groupName: 'time-tracker-tester', userGroups: ['time-tracker-tester'] },
+  ];
+
+  removeGroupTypes.map((param) => {
+    it(`When user switchGroup to ${param.groupName} and belongs to group, should remove ${param.groupName} group to user`, () => {
+      const groupName = param.groupName;
+      const userGroups = param.userGroups;
+      const userId = 'userId';
+
+      spyOn(store, 'dispatch');
+
+      component.switchGroup(userId, userGroups, groupName);
+
+      expect(store.dispatch).toHaveBeenCalledWith(new RemoveUserFromGroup(userId, groupName));
+    });
+  });
+
   it('on success load users, the data of roles should be an array', () => {
     const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
     const action = {
@@ -150,7 +233,21 @@ describe('UsersListComponent', () => {
     });
   });
 
-  it('on success load users, the datatable should be reloaded', async () => {
+  fit('on success load users, the data of groups should be an array', () => {
+    const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
+    const action = {
+      type: UserActionTypes.LOAD_USERS_SUCCESS,
+      payload: state.data,
+    };
+
+    actionSubject.next(action);
+
+    component.users.map((user) => {
+      expect(user.groups).toEqual(['time-tracker-admin', 'time-tracker-tester']);
+    });
+  });
+
+  fit('on success load users, the datatable should be reloaded', async () => {
     const actionSubject = TestBed.inject(ActionsSubject);
     const action = {
       type: UserActionTypes.LOAD_USERS_SUCCESS,
@@ -163,16 +260,8 @@ describe('UsersListComponent', () => {
     expect(component.dtElement.dtInstance.then).toHaveBeenCalled();
   });
 
-
   fit('When Component is created, should call the feature toggle method', () => {
-
-    // spyOn(service, 'getAll').and.callFake( () => {
-    //   return of(mockUser);
-    // });
-
-    spyOn(component, 'isFeatureToggleActivated').and.callFake(() => {
-      return of(true);
-    });
+    spyOn(component, 'isFeatureToggleActivated').and.returnValue(of(true));
 
     component.ngOnInit();
 
@@ -185,5 +274,4 @@ describe('UsersListComponent', () => {
     component.loadUsersSubscription.unsubscribe();
     fixture.destroy();
   });
-
 });

src/app/modules/users/components/users-list/users-list.component.ts

@@ -11,7 +11,7 @@ import {
   RevokeRoleUser,
   UserActionTypes,
   AddUserToGroup,
-  RemoveUserToGroup,
+  RemoveUserFromGroup,
 } from '../../store/user.actions';
 import { getIsLoading } from '../../store/user.selectors';
 
@@ -59,7 +59,7 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
         filter(
           (action: any) =>
             action.type === UserActionTypes.ADD_USER_TO_GROUP_SUCCESS ||
-            action.type === UserActionTypes.REMOVE_USER_TO_GROUP_SUCCESS
+            action.type === UserActionTypes.REMOVE_USER_FROM_GROUP_SUCCESS
         )
       )
       .subscribe((action) => {
@@ -109,7 +109,7 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
 
   switchGroup(userId: string, userGroups: string[], groupName: string) {
     userGroups.includes(groupName)
-      ? this.store.dispatch(new RemoveUserToGroup(userId, groupName))
+      ? this.store.dispatch(new RemoveUserFromGroup(userId, groupName))
       : this.store.dispatch(new AddUserToGroup(userId, groupName));
   }