Fixed failing test cases

Author: nloyola

.dir-locals.el

@@ -1,4 +1,4 @@
 ((nil . ((fill-column . 96)
          (eval . (progn
-                   (use-package angular :load-path "~/.emacs.d")
+                   (use-package nl-angular :load-path "~/.emacs.d")
                    (setq dumb-jump-default-project (projectile-project-root)))))))

src/app/domain/access/user-role.model.ts

@@ -1,6 +1,6 @@
-import { AccessItem } from './access-item.model';
+import { AccessItem, IAccessItem } from './access-item.model';
 
-export class UserRole extends AccessItem {
+export class UserRole extends AccessItem implements IAccessItem {
 
   hasAnyRoleOf(...roleIds: string[]) {
     const ids = Array.of(this.id).concat(this.childData.map(info => info.id));

src/app/modules/admin-access/components/access-admin/access-admin.component.spec.ts

@@ -1,20 +1,28 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { AccessAdminComponent } from './access-admin.component';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { StoreModule } from '@ngrx/store';
+import { AuthStoreReducer } from '@app/root-store';
 
-describe('UsersAdminComponent', () => {
-  let component: UsersAdminComponent;
-  let fixture: ComponentFixture<UsersAdminComponent>;
+describe('AccessAdminComponent', () => {
+  let component: AccessAdminComponent;
+  let fixture: ComponentFixture<AccessAdminComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ UsersAdminComponent ]
+      imports: [
+        StoreModule.forRoot({
+          'auth': AuthStoreReducer.reducer
+        })
+      ],
+      declarations: [ AccessAdminComponent ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(UsersAdminComponent);
+    fixture = TestBed.createComponent(AccessAdminComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/modules/admin-access/components/access-admin/access-admin.component.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { User } from '@app/domain/users';
 import { AuthStoreSelectors, RootStoreState } from '@app/root-store';
 import { select, Store } from '@ngrx/store';
@@ -15,7 +15,7 @@ interface Permissions {
   templateUrl: './access-admin.component.html',
   styleUrls: ['./access-admin.component.scss']
 })
-export class AccessAdminComponent {
+export class AccessAdminComponent implements OnInit {
 
   permissions$: Observable<Permissions>;
 

src/app/modules/admin-access/components/membership-add/membership-add.component.spec.ts

@@ -1,14 +1,33 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
+import { SpinnerStoreReducer } from '@app/root-store/spinner';
+import { StudyStoreReducer } from '@app/root-store/study';
+import { StoreModule } from '@ngrx/store';
+import { ToastrModule } from 'ngx-toastr';
 import { MembershipAddComponent } from './membership-add.component';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('MembershipAddComponent', () => {
   let component: MembershipAddComponent;
   let fixture: ComponentFixture<MembershipAddComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ MembershipAddComponent ]
+      imports: [
+        FormsModule,
+        HttpClientTestingModule,
+        ReactiveFormsModule,
+        RouterTestingModule,
+        StoreModule.forRoot({
+          'membership': StudyStoreReducer.reducer,
+          'spinner': SpinnerStoreReducer.reducer
+        }),
+        ToastrModule.forRoot()
+      ],
+      declarations: [ MembershipAddComponent ],
+      schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
     })
     .compileComponents();
   }));

src/app/modules/admin-access/components/membership-add/membership-add.component.ts

@@ -8,8 +8,6 @@ import { select, Store } from '@ngrx/store';
 import { ToastrService } from 'ngx-toastr';
 import { Observable, Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
-import { EntityInfo } from '@app/domain';
-import { UserAddTypeahead } from '@app/shared/typeaheads/user-add-typeahead';
 
 @Component({
   selector: 'app-membership-add',

src/app/modules/admin-access/components/membership-view/membership-view.component.html

@@ -263,8 +263,8 @@ <h1>{{ membership?.name }} <small i18n>Membership</small></h1>
 </ng-template>
 
 <ng-template #removeMembershipModal let-modal>
-  <app-modal-input (onConfirm)="modal.close()"
-                   (onDismiss)="modal.dismiss()">
+  <app-modal-input (confirm)="modal.close()"
+                   (dismiss)="modal.dismiss()">
     <span class="title">Remove Membership</span>
     <div class="body">
       Are you sure you want to remove this membership?

src/app/modules/admin-access/components/membership-view/membership-view.component.spec.ts

@@ -1,5 +1,12 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StudyStoreReducer } from '@app/root-store';
+import { SpinnerStoreReducer } from '@app/root-store/spinner';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { StoreModule } from '@ngrx/store';
+import { ToastrModule } from 'ngx-toastr';
 import { MembershipViewComponent } from './membership-view.component';
 
 describe('MembershipViewComponent', () => {
@@ -8,7 +15,19 @@ describe('MembershipViewComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ MembershipViewComponent ]
+      imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        NgbModule,
+        RouterTestingModule,
+        StoreModule.forRoot({
+          'membership': StudyStoreReducer.reducer,
+          'spinner': SpinnerStoreReducer.reducer
+        }),
+        ToastrModule.forRoot()
+      ],
+      declarations: [ MembershipViewComponent ],
+      schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
     })
     .compileComponents();
   }));

src/app/modules/admin-access/components/membership-view/membership-view.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
+import { Component, OnInit, TemplateRef, ViewChild, OnDestroy } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { EntityInfo } from '@app/domain';
 import { Membership } from '@app/domain/access';
@@ -25,7 +25,7 @@ import { CentreRemoveModalComponent } from '@app/modules/modals/components/centr
   templateUrl: './membership-view.component.html',
   styleUrls: ['./membership-view.component.scss']
 })
-export class MembershipViewComponent implements OnInit {
+export class MembershipViewComponent implements OnInit, OnDestroy {
 
   @ViewChild('updateNameModal') updateNameModal: TemplateRef<any>;
   @ViewChild('updateDescriptionModal') updateDescriptionModal: TemplateRef<any>;

src/app/modules/admin-access/components/memberships-admin/memberships-admin.component.spec.ts

@@ -1,14 +1,22 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { MembershipStoreReducer } from '@app/root-store';
+import { StoreModule } from '@ngrx/store';
 import { MembershipsAdminComponent } from './memberships-admin.component';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 
 describe('MembershipsAdminComponent', () => {
   let component: MembershipsAdminComponent;
   let fixture: ComponentFixture<MembershipsAdminComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ MembershipsAdminComponent ]
+      imports: [
+        StoreModule.forRoot({
+          'membership': MembershipStoreReducer.reducer
+        })
+      ],
+      declarations: [ MembershipsAdminComponent ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
     })
     .compileComponents();
   }));