DigitaleBibliothek / Frontend / 64f968b2467

Commits

Tim Donohue authored 64f968b2467 02 Oct 2023

Fix subgroups-list specs so they align with new members-list specs

src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts

Modified

-1
+import { CommonModule } from '@angular/common';
-2
+import { NO_ERRORS_SCHEMA, DebugElement } from '@angular/core';
--
+import { ComponentFixture, fakeAsync, flush, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-+
+import { ComponentFixture, fakeAsync, flush, inject, TestBed, waitForAsync } from '@angular/core/testing';
-4
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-5
+import { BrowserModule, By } from '@angular/platform-browser';
-6
+import { Router } from '@angular/router';
-7
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-8
+import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
--
+import { Observable, of as observableOf, BehaviorSubject } from 'rxjs';
-+
+import { Observable, of as observableOf } from 'rxjs';
-10
+import { RestResponse } from '../../../../core/cache/response.models';
-11
+import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
-12
+import { RemoteData } from '../../../../core/data/remote-data';
-13
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
-14
+import { Group } from '../../../../core/eperson/models/group.model';
-15
+import { PageInfo } from '../../../../core/shared/page-info.model';
-16
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-17
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-18
+import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
-19
+import { SubgroupsListComponent } from './subgroups-list.component';
-20
+import {
--
+  createSuccessfulRemoteDataObject$,
--
+  createSuccessfulRemoteDataObject
-+
+  createSuccessfulRemoteDataObject$
-22
+} from '../../../../shared/remote-data.utils';
-23
+import { RouterMock } from '../../../../shared/mocks/router.mock';
-24
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-25
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
-26
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-27
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
--
+import { map } from 'rxjs/operators';
-28
+import { PaginationService } from '../../../../core/pagination/pagination.service';
-29
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
-30
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-31
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
-+
+import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock';
-33
-34
+describe('SubgroupsListComponent', () => {
-35
+  let component: SubgroupsListComponent;
-36
+  let fixture: ComponentFixture<SubgroupsListComponent>;
-37
+  let translateService: TranslateService;
-38
+  let builderService: FormBuilderService;
-39
+  let ePersonDataServiceStub: any;
-40
+  let groupsDataServiceStub: any;
--
+  let activeGroup;
-+
+  let activeGroup: Group;
-42
+  let subgroups: Group[];
--
+  let allGroups: Group[];
-+
+  let groupNonMembers: Group[];
-44
+  let routerStub;
-45
+  let paginationService;
-+
+  // Define a new mock activegroup for all tests below
-+
+  let mockActiveGroup: Group = Object.assign(new Group(), {
-+
+    handle: null,
-+
+    subgroups: [GroupMock2],
-+
+    epersons: [EPersonMock2],
-+
+    selfRegistered: false,
-+
+    permanent: false,
-+
+    _links: {
-+
+        self: {
-+
+            href: 'https://rest.api/server/api/eperson/groups/activegroupid',
-+
+        },
-+
+        subgroups: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/subgroups' },
-+
+        object: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/object' },
-+
+        epersons: { href: 'https://rest.api/server/api/eperson/groups/activegroupid/epersons' }
-+
+    },
-+
+    _name: 'activegroupname',
-+
+    id: 'activegroupid',
-+
+    uuid: 'activegroupid',
-+
+    type: 'group',
-+
+  });
-66
-67
+  beforeEach(waitForAsync(() => {
--
+    activeGroup = GroupMock;
-+
+    activeGroup = mockActiveGroup;
-69
+    subgroups = [GroupMock2];
--
+    allGroups = [GroupMock, GroupMock2];
-+
+    groupNonMembers = [GroupMock];
-71
+    ePersonDataServiceStub = {};
-72
+    groupsDataServiceStub = {
-73
+      activeGroup: activeGroup,
--
+      subgroups$: new BehaviorSubject(subgroups),
-+
+      subgroups: subgroups,
-+
+      groupNonMembers: groupNonMembers,
-76
+      getActiveGroup(): Observable<Group> {
-77
+        return observableOf(this.activeGroup);
-78
+      },
-79
+      getSubgroups(): Group {
--
+        return this.activeGroup;
-+
+        return this.subgroups;
-81
+      },
-+
+      // This method is used to get all the current subgroups
-83
+      findListByHref(_href: string): Observable<RemoteData<PaginatedList<Group>>> {
--
+        return this.subgroups$.pipe(
--
+          map((currentGroups: Group[]) => {
--
+            return createSuccessfulRemoteDataObject(buildPaginatedList<Group>(new PageInfo(), currentGroups));
--
+          })
--
+        );
-+
+        return createSuccessfulRemoteDataObject$(buildPaginatedList<Group>(new PageInfo(), groupsDataServiceStub.getSubgroups()));
-85
+      },
-86
+      getGroupEditPageRouterLink(group: Group): string {
-87
+        return '/access-control/groups/' + group.id;
-88
+      },
-+
+      // This method is used to get all groups which are NOT currently a subgroup member
-90
+      searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
-91
+        if (query === '') {
--
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allGroups));
-+
+          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), groupNonMembers));
-93
+        }
-94
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
-95
+      },
--
+      addSubGroupToGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
--
+        this.subgroups$.next([...this.subgroups$.getValue(), subgroup]);
-+
+      addSubGroupToGroup(parentGroup, subgroupToAdd: Group): Observable<RestResponse> {
-+
+        // Add group to list of subgroups
-+
+        this.subgroups = [...this.subgroups, subgroupToAdd];
-+
+        // Remove group from list of non-members
-+
+        this.groupNonMembers.forEach( (group: Group, index: number) => {
-+
+          if (group.id === subgroupToAdd.id) {
-+
+            this.groupNonMembers.splice(index, 1);
-+
+          }
-+
+        });
-105
+        return observableOf(new RestResponse(true, 200, 'Success'));
-106
+      },
-107
+      clearGroupsRequests() {
-108
+        // empty
-109
+      },
-110
+      clearGroupLinkRequests() {
-111
+        // empty
-112
+      },
--
+      deleteSubGroupFromGroup(parentGroup, subgroup: Group): Observable<RestResponse> {
--
+        this.subgroups$.next(this.subgroups$.getValue().filter((group: Group) => {
--
+          if (group.id !== subgroup.id) {
--
+            return group;
-+
+      deleteSubGroupFromGroup(parentGroup, subgroupToDelete: Group): Observable<RestResponse> {
-+
+        // Remove group from list of subgroups
-+
+        this.subgroups.forEach( (group: Group, index: number) => {
-+
+          if (group.id === subgroupToDelete.id) {
-+
+            this.subgroups.splice(index, 1);
-118
+          }
--
+        }));
-+
+        });
-+
+        // Add group to list of non-members
-+
+        this.groupNonMembers = [...this.groupNonMembers, subgroupToDelete];
-122
+        return observableOf(new RestResponse(true, 200, 'Success'));
-123
+      }
-124
+    };
-125
+    routerStub = new RouterMock();
-126
+    builderService = getMockFormBuilderService();
-127
+    translateService = getMockTranslateService();
-128
-129
+    paginationService = new PaginationServiceStub();
--
+    TestBed.configureTestingModule({
-+
+    return TestBed.configureTestingModule({
-131
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-132
+        TranslateModule.forRoot({
-133
+          loader: {
-134
+            provide: TranslateLoader,
-135
+            useClass: TranslateLoaderMock
-136
+          }
-137
+        }),
-138
+      ],
-139
+      declarations: [SubgroupsListComponent],
-140
+      providers: [SubgroupsListComponent,
-158
+    fixture.destroy();
-159
+    fixture.debugElement.nativeElement.remove();
-160
+    flush();
-161
+    component = null;
-162
+  }));
-163
-164
+  it('should create SubgroupsListComponent', inject([SubgroupsListComponent], (comp: SubgroupsListComponent) => {
-165
+    expect(comp).toBeDefined();
-166
+  }));
-167
--
+  it('should show list of subgroups of current active group', () => {
--
+    const groupIdsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tr td:first-child'));
--
+    expect(groupIdsFound.length).toEqual(1);
--
+    activeGroup.subgroups.map((group: Group) => {
--
+      expect(groupIdsFound.find((foundEl) => {
--
+        return (foundEl.nativeElement.textContent.trim() === group.uuid);
--
+      })).toBeTruthy();
-+
+  describe('current subgroup list', () => {
-+
+    it('should show list of subgroups of current active group', () => {
-+
+      const groupIdsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tr td:first-child'));
-+
+      expect(groupIdsFound.length).toEqual(1);
-+
+      subgroups.map((group: Group) => {
-+
+        expect(groupIdsFound.find((foundEl) => {
-+
+          return (foundEl.nativeElement.textContent.trim() === group.uuid);
-+
+        })).toBeTruthy();
-+
+      });
-177
+    });
--
+  });
-178
--
+  describe('if first group delete button is pressed', () => {
--
+    let groupsFound: DebugElement[];
--
+    beforeEach(fakeAsync(() => {
--
+      const addButton = fixture.debugElement.query(By.css('#subgroupsOfGroup tbody .deleteButton'));
--
+      addButton.triggerEventHandler('click', {
--
+        preventDefault: () => {/**/
--
+        }
-+
+    it('should show a delete button next to each subgroup', () => {
-+
+      const subgroupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
-+
+      subgroupsFound.map((foundGroupRowElement: DebugElement) => {
-+
+        const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
-+
+        const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
-+
+        expect(addButton).toBeNull();
-+
+        expect(deleteButton).not.toBeNull();
-+
+      });
-+
+    });
-+
-+
+    describe('if first group delete button is pressed', () => {
-+
+      let groupsFound: DebugElement[];
-+
+      beforeEach(() => {
-+
+        const deleteButton = fixture.debugElement.query(By.css('#subgroupsOfGroup tbody .deleteButton'));
-+
+        deleteButton.nativeElement.click();
-+
+        fixture.detectChanges();
-+
+      });
-+
+      it('then no subgroup remains as a member of the active group', () => {
-+
+        groupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
-+
+        expect(groupsFound.length).toEqual(0);
-199
+      });
--
+      tick();
--
+      fixture.detectChanges();
--
+    }));
--
+    it('one less subgroup in list from 1 to 0 (of 2 total groups)', () => {
--
+      groupsFound = fixture.debugElement.queryAll(By.css('#subgroupsOfGroup tbody tr'));
--
+      expect(groupsFound.length).toEqual(0);
-200
+    });
-201
+  });
-202
-203
+  describe('search', () => {
-204
+    describe('when searching with empty query', () => {
-205
+      let groupsFound: DebugElement[];
-206
+      beforeEach(fakeAsync(() => {
-207
+        component.search({ query: '' });
-+
+        fixture.detectChanges();
-209
+        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
-210
+      }));
-211
--
+      it('should display all groups', () => {
--
+        fixture.detectChanges();
--
+        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
--
+        expect(groupsFound.length).toEqual(2);
--
+        groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
-+
+      it('should display only non-member groups (i.e. groups that are not a subgroup)', () => {
-213
+        const groupIdsFound: DebugElement[] = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr td:first-child'));
--
+        allGroups.map((group: Group) => {
-+
+        expect(groupIdsFound.length).toEqual(1);
-+
+        groupNonMembers.map((group: Group) => {
-216
+          expect(groupIdsFound.find((foundEl: DebugElement) => {
-217
+            return (foundEl.nativeElement.textContent.trim() === group.uuid);
-218
+          })).toBeTruthy();
-219
+        });
-220
+      });
-221
--
+      describe('if group is already a subgroup', () => {
--
+        it('should have delete button, else it should have add button', () => {
-+
+      it('should display an add button next to non-member groups, not a delete button', () => {
-+
+        groupsFound.map((foundGroupRowElement: DebugElement) => {
-+
+          const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
-+
+          const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
-+
+          expect(addButton).not.toBeNull();
-+
+          expect(deleteButton).toBeNull();
-+
+        });
-+
+      });
-+
-+
+      describe('if first add button is pressed', () => {
-+
+        beforeEach(() => {
-+
+          const addButton: DebugElement = fixture.debugElement.query(By.css('#groupsSearch tbody .fa-plus'));
-+
+          addButton.nativeElement.click();
-235
+          fixture.detectChanges();
-+
+        });
-+
+        it('then all (two) Groups are subgroups of the active group. No non-members left', () => {
-238
+          groupsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr'));
--
+          const getSubgroups = groupsDataServiceStub.getSubgroups().subgroups;
--
+          if (getSubgroups !== undefined && getSubgroups.length > 0) {
--
+            groupsFound.map((foundGroupRowElement: DebugElement) => {
--
+              const groupId: DebugElement = foundGroupRowElement.query(By.css('td:first-child'));
--
+              const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
--
+              const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
--
+              expect(addButton).toBeNull();
--
+              if (activeGroup.id === groupId.nativeElement.textContent) {
--
+                expect(deleteButton).toBeNull();
--
+              } else {
--
+                expect(deleteButton).not.toBeNull();
--
+              }
--
+            });
--
+          } else {
--
+            const subgroupIds: string[] = activeGroup.subgroups.map((group: Group) => group.id);
--
+            groupsFound.map((foundGroupRowElement: DebugElement) => {
--
+              const groupId: DebugElement = foundGroupRowElement.query(By.css('td:first-child'));
--
+              const addButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-plus'));
--
+              const deleteButton: DebugElement = foundGroupRowElement.query(By.css('td:last-child .fa-trash-alt'));
--
+              if (subgroupIds.includes(groupId.nativeElement.textContent)) {
--
+                expect(addButton).toBeNull();
--
+                expect(deleteButton).not.toBeNull();
--
+              } else {
--
+                expect(deleteButton).toBeNull();
--
+                expect(addButton).not.toBeNull();
--
+              }
--
+            });
--
+          }
-+
+          expect(groupsFound.length).toEqual(0);
-240
+        });
-241
+      });
-242
+    });
-243
+  });
-244
-245
+});

Frontend

Commits

Jira Issues

Add shortcut