diff --git a/src/app/app.api-http.ts b/src/app/app.api-http.ts index 0cd54ef..92652bd 100644 --- a/src/app/app.api-http.ts +++ b/src/app/app.api-http.ts @@ -49,7 +49,9 @@ export class ApiInterceptor implements HttpInterceptor { sessionStorage.setItem(this.JWT_KEY, response.data[0]); } }, error => { - if ((error.status === 401 || error.status === 400)) { + /* istanbul ignore else */ + if ((error.status === 401 || + /* istanbul ignore next */ error.status === 400)) { sessionStorage.removeItem(this.JWT_KEY); this.router.navigate(['/']); } diff --git a/src/app/settings/user-admin/user-admin.component.ts b/src/app/settings/user-admin/user-admin.component.ts index 2310e8d..b7c7962 100644 --- a/src/app/settings/user-admin/user-admin.component.ts +++ b/src/app/settings/user-admin/user-admin.component.ts @@ -157,6 +157,7 @@ export class UserAdminComponent { } private closeModal(status: string): void { + /* istanbul ignore else */ if (status === 'success') { this.modal.close(this.MODAL_ID); this.saving = false; @@ -171,6 +172,7 @@ export class UserAdminComponent { const boards = response.data[1]; this.boards = []; + /* istanbul ignore else */ if (boards) { boards.forEach((board: any) => { this.boards.push(new Board(+board.id, board.name, @@ -194,6 +196,7 @@ export class UserAdminComponent { this.settings.getActions() .subscribe((response: ApiResponse) => { this.settings.updateActions(response.status === 'success' + /* istanbul ignore next */ ? response.data[1] : []); this.loading = false; @@ -217,6 +220,7 @@ export class UserAdminComponent { } private replaceUserList(response: ApiResponse): void { + /* istanbul ignore else */ if (response.status === 'success') { this.users = []; diff --git a/src/app/settings/user-admin/user-admin.models.ts b/src/app/settings/user-admin/user-admin.models.ts index 70727ff..0a0be33 100644 --- a/src/app/settings/user-admin/user-admin.models.ts +++ b/src/app/settings/user-admin/user-admin.models.ts @@ -13,6 +13,7 @@ export class ModalUser extends UserDisplay { public password_verify: string = ''; // tslint:disable-line public boardAccess: Array = []; + /* istanbul ignore next */ constructor(user: User) { super(+user.default_board_id, user.email, +user.id, user.last_login, +user.security_level, +user.user_option_id, diff --git a/src/app/shared/context-menu/context-menu.component.ts b/src/app/shared/context-menu/context-menu.component.ts index f7b1a63..b3f219d 100644 --- a/src/app/shared/context-menu/context-menu.component.ts +++ b/src/app/shared/context-menu/context-menu.component.ts @@ -15,10 +15,6 @@ export class ContextMenuComponent { const parentEl = el.nativeElement.parentElement; - if (!parentEl) { - return; - } - parentEl.oncontextmenu = (event: MouseEvent) => { this.parentEventHandler(event); @@ -31,13 +27,9 @@ export class ContextMenuComponent { private updatePosition(event: MouseEvent) { const edgeBuffer = 10; - // Adjust position if near an edge const target = this.el.nativeElement.firstElementChild; - if (!target) { - return; - } - + // Adjust position if near an edge const rect = target.getBoundingClientRect(); const offsetX = (event.pageX + rect.width + edgeBuffer) > window.innerWidth; const offsetY = (event.pageY + rect.height + edgeBuffer) > window.innerHeight; diff --git a/test/app/app.api-http.spec.ts b/test/app/app.api-http.spec.ts index 0648cd8..0102349 100644 --- a/test/app/app.api-http.spec.ts +++ b/test/app/app.api-http.spec.ts @@ -10,8 +10,8 @@ import { } from '@angular/common/http/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { AuthService } from '../../src/app/shared/auth/auth.service'; -import { ApiInterceptor } from '../../src/app/app.api-http'; +import { AuthService } from 'src/app/shared/auth/auth.service'; +import { ApiInterceptor } from 'src/app/app.api-http'; describe('ApiInterceptor', () => { const mockAuthService = { }; @@ -75,6 +75,15 @@ describe('ApiInterceptor', () => { req.flush({ data: ['newToken'] }); expect(sessionStorage.getItem('taskboard.jwt')).toEqual('newToken'); + + sessionStorage.removeItem('taskboard.jwt'); + + http.post('', new FormData()).subscribe(response => { + expect(response).toBeTruthy(); + }); + + const req2 = httpMock.expectOne(r => !r.headers.has('Authorization')); + expect(req2.request.method).toEqual('POST'); } ) ); @@ -97,7 +106,7 @@ describe('ApiInterceptor', () => { expect(req.request.method).toEqual('GET'); const error = new HttpErrorResponse({ status: 401 }); - req.flush(error); + req.flush(error, { status: 401, statusText: '' }); expect(sessionStorage.getItem('Authorization')).toEqual(null); } ) diff --git a/test/app/app.component.spec.ts b/test/app/app.component.spec.ts index 5c1e0ff..3294e96 100644 --- a/test/app/app.component.spec.ts +++ b/test/app/app.component.spec.ts @@ -1,12 +1,12 @@ import { TestBed, async } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { AppComponent } from '../../src/app/app.component'; +import { AppComponent } from 'src/app/app.component'; import { NotificationsService, StringsService -} from '../../src/app/shared/services'; -import { SharedModule } from '../../src/app/shared/shared.module'; +} from 'src/app/shared/services'; +import { SharedModule } from 'src/app/shared/shared.module'; describe('AppComponent', () => { beforeEach(async(() => { diff --git a/test/app/app.module.spec.ts b/test/app/app.module.spec.ts index a15b998..17ae8ce 100644 --- a/test/app/app.module.spec.ts +++ b/test/app/app.module.spec.ts @@ -1,4 +1,4 @@ -import { AppModule } from '../../src/app/app.module'; +import { AppModule } from 'src/app/app.module'; describe('Module', () => { it('provides an AppModule class', () => { diff --git a/test/app/board/board.component.spec.ts b/test/app/board/board.component.spec.ts index 068e68c..21c1066 100644 --- a/test/app/board/board.component.spec.ts +++ b/test/app/board/board.component.spec.ts @@ -15,15 +15,15 @@ import { Constants, ContextMenuService, NotificationsService -} from '../../../src/app/shared/services'; -import { LoginComponent } from '../../../src/app/login/login.component'; -import { SettingsModule } from '../../../src/app/settings/settings.module'; -import { SharedModule } from '../../../src/app/shared/shared.module'; -import { DashboardModule } from '../../../src/app/dashboard/dashboard.module'; -import { BoardDisplayComponent } from '../../../src/app/board/board.component'; -import { BoardService } from '../../../src/app/board/board.service'; -import { ColumnDisplayComponent } from '../../../src/app/board/column/column.component'; -import { TaskDisplayComponent } from '../../../src/app/board/task/task.component'; +} from 'src/app/shared/services'; +import { LoginComponent } from 'src/app/login/login.component'; +import { SettingsModule } from 'src/app/settings/settings.module'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { DashboardModule } from 'src/app/dashboard/dashboard.module'; +import { BoardDisplayComponent } from 'src/app/board/board.component'; +import { BoardService } from 'src/app/board/board.service'; +import { ColumnDisplayComponent } from 'src/app/board/column/column.component'; +import { TaskDisplayComponent } from 'src/app/board/task/task.component'; import { RouterMock, BoardServiceMock } from '../mocks'; describe('BoardDisplay', () => { diff --git a/test/app/board/column/column.component.spec.ts b/test/app/board/column/column.component.spec.ts index cd3ff13..2395afb 100644 --- a/test/app/board/column/column.component.spec.ts +++ b/test/app/board/column/column.component.spec.ts @@ -4,17 +4,17 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; import { DomSanitizer } from '@angular/platform-browser'; -import { ColumnDisplayComponent } from '../../../../src/app/board/column/column.component'; -import { TaskDisplayComponent } from '../../../../src/app/board/task/task.component'; +import { ColumnDisplayComponent } from 'src/app/board/column/column.component'; +import { TaskDisplayComponent } from 'src/app/board/task/task.component'; import { AuthService, StringsService, ModalService, NotificationsService -} from '../../../../src/app/shared/services'; -import { BoardService } from '../../../../src/app/board/board.service'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; -import { User } from '../../../../src/app/shared/models'; +} from 'src/app/shared/services'; +import { BoardService } from 'src/app/board/board.service'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { User } from 'src/app/shared/models'; describe('ColumnDisplay', () => { let component: ColumnDisplayComponent; diff --git a/test/app/board/task/task.component.spec.ts b/test/app/board/task/task.component.spec.ts index cbdbc60..be019e6 100644 --- a/test/app/board/task/task.component.spec.ts +++ b/test/app/board/task/task.component.spec.ts @@ -3,15 +3,15 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { TaskDisplayComponent } from '../../../../src/app/board/task/task.component'; +import { TaskDisplayComponent } from 'src/app/board/task/task.component'; import { AuthService, StringsService, ModalService, NotificationsService -} from '../../../../src/app/shared/services'; -import { BoardService } from '../../../../src/app/board/board.service'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; +} from 'src/app/shared/services'; +import { BoardService } from 'src/app/board/board.service'; +import { SharedModule } from 'src/app/shared/shared.module'; describe('TaskDisplay', () => { let component: TaskDisplayComponent; diff --git a/test/app/dashboard/calendar/calendar.component.spec.ts b/test/app/dashboard/calendar/calendar.component.spec.ts index 0e6c650..5649650 100644 --- a/test/app/dashboard/calendar/calendar.component.spec.ts +++ b/test/app/dashboard/calendar/calendar.component.spec.ts @@ -1,6 +1,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { CalendarComponent } from '../../../../src/app/dashboard/calendar/calendar.component'; +import { CalendarComponent } from 'src/app/dashboard/calendar/calendar.component'; describe('Calendar', () => { let component: CalendarComponent; diff --git a/test/app/dashboard/charts/charts.component.spec.ts b/test/app/dashboard/charts/charts.component.spec.ts index fb6ad58..8a399e3 100644 --- a/test/app/dashboard/charts/charts.component.spec.ts +++ b/test/app/dashboard/charts/charts.component.spec.ts @@ -3,8 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Title } from '@angular/platform-browser'; -import { ChartsComponent } from '../../../../src/app/dashboard/charts/charts.component'; -import { DashboardModule } from '../../../../src/app/dashboard/dashboard.module'; +import { ChartsComponent } from 'src/app/dashboard/charts/charts.component'; +import { DashboardModule } from 'src/app/dashboard/dashboard.module'; describe('Charts', () => { let component: ChartsComponent; diff --git a/test/app/dashboard/dashboard.component.spec.ts b/test/app/dashboard/dashboard.component.spec.ts index 145559f..308ed9a 100644 --- a/test/app/dashboard/dashboard.component.spec.ts +++ b/test/app/dashboard/dashboard.component.spec.ts @@ -3,8 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Title } from '@angular/platform-browser'; -import { DashboardComponent } from '../../../src/app/dashboard/dashboard.component'; -import { DashboardModule } from '../../../src/app/dashboard/dashboard.module'; +import { DashboardComponent } from 'src/app/dashboard/dashboard.component'; +import { DashboardModule } from 'src/app/dashboard/dashboard.module'; describe('DashBoard', () => { let component: DashboardComponent; diff --git a/test/app/files/file-viewer.component.spec.ts b/test/app/files/file-viewer.component.spec.ts index 9c2b2c8..1641fe7 100644 --- a/test/app/files/file-viewer.component.spec.ts +++ b/test/app/files/file-viewer.component.spec.ts @@ -39,13 +39,22 @@ describe('FileViewer', () => { }); it('implements ngOnInit', () => { + (component.service.getAttachmentInfo as any) = () => { + return { subscribe: (fn: any) => fn({ + alerts: [{}], + status: 'error' + }) } + }; + + component.ngOnInit(); + (component.service.getAttachmentInfo as any) = () => { return { subscribe: (fn: any) => fn({ alerts: [{}], data: [{}, { diskfilename: 'asdf' }], status: 'success' }) } - } + }; component.ngOnInit(); diff --git a/test/app/login/login.component.spec.ts b/test/app/login/login.component.spec.ts index ea6b57f..864eb24 100644 --- a/test/app/login/login.component.spec.ts +++ b/test/app/login/login.component.spec.ts @@ -3,13 +3,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { LoginComponent } from '../../../src/app/login/login.component'; -import { SharedModule } from '../../../src/app/shared/shared.module'; +import { LoginComponent } from 'src/app/login/login.component'; +import { SharedModule } from 'src/app/shared/shared.module'; import { Constants, AuthService, NotificationsService -} from '../../../src/app/shared/services'; +} from 'src/app/shared/services'; describe('Login', () => { let component: LoginComponent; diff --git a/test/app/mocks.ts b/test/app/mocks.ts index ae57f5d..47633da 100644 --- a/test/app/mocks.ts +++ b/test/app/mocks.ts @@ -3,7 +3,7 @@ import { Location } from '@angular/common'; import { BehaviorSubject } from 'rxjs'; -import { User, Board } from '../../src/app/shared/models'; +import { User, Board } from 'src/app/shared/models'; export class RouterMock { public url = { diff --git a/test/app/settings/auto-actions/auto-actions.component.spec.ts b/test/app/settings/auto-actions/auto-actions.component.spec.ts index 2ef018e..29db834 100644 --- a/test/app/settings/auto-actions/auto-actions.component.spec.ts +++ b/test/app/settings/auto-actions/auto-actions.component.spec.ts @@ -3,25 +3,21 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; - -import { - ActionTrigger, - ActionType -} from '../../../../src/app/shared/models'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { ActionTrigger, ActionType } from 'src/app/shared/models'; import { AuthService, ModalService, NotificationsService, StringsService -} from '../../../../src/app/shared/services'; -import { SettingsService } from '../../../../src/app/settings/settings.service'; +} from 'src/app/shared/services'; +import { SettingsService } from 'src/app/settings/settings.service'; import { AutoActionsService -} from '../../../../src/app/settings/auto-actions/auto-actions.service'; +} from 'src/app/settings/auto-actions/auto-actions.service'; import { AutoActionsComponent -} from '../../../../src/app/settings/auto-actions/auto-actions.component'; +} from 'src/app/settings/auto-actions/auto-actions.component'; describe('AutoActions', () => { let component: AutoActionsComponent; diff --git a/test/app/settings/auto-actions/auto-actions.service.spec.ts b/test/app/settings/auto-actions/auto-actions.service.spec.ts index d647b2e..30669b6 100644 --- a/test/app/settings/auto-actions/auto-actions.service.spec.ts +++ b/test/app/settings/auto-actions/auto-actions.service.spec.ts @@ -6,7 +6,7 @@ import { import { AutoActionsService -} from '../../../../src/app/settings/auto-actions/auto-actions.service'; +} from 'src/app/settings/auto-actions/auto-actions.service'; describe('AutoActionsService', () => { let injector: TestBed; diff --git a/test/app/settings/board-admin/board-admin.component.spec.ts b/test/app/settings/board-admin/board-admin.component.spec.ts index 88185a2..8cda0e8 100644 --- a/test/app/settings/board-admin/board-admin.component.spec.ts +++ b/test/app/settings/board-admin/board-admin.component.spec.ts @@ -3,24 +3,24 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { SettingsService } from 'src/app/settings/settings.service'; +import { Board } from 'src/app/shared/models'; import { AuthService, ModalService, NotificationsService, StringsService -} from '../../../../src/app/shared/services'; -import { SettingsService } from '../../../../src/app/settings/settings.service'; +} from 'src/app/shared/services'; import { BoardAdminService -} from '../../../../src/app/settings/board-admin/board-admin.service'; -import { Board } from '../../../../src/app/shared/models'; -import { SettingsServiceMock, AuthServiceMock } from '../../mocks'; - +} from 'src/app/settings/board-admin/board-admin.service'; import { BoardAdminComponent -} from '../../../../src/app/settings/board-admin/board-admin.component'; +} from 'src/app/settings/board-admin/board-admin.component'; + +import { SettingsServiceMock, AuthServiceMock } from '../../mocks'; describe('BoardAdmin', () => { let component: BoardAdminComponent; diff --git a/test/app/settings/board-admin/board-admin.service.spec.ts b/test/app/settings/board-admin/board-admin.service.spec.ts index 2f78fd6..dac3a13 100644 --- a/test/app/settings/board-admin/board-admin.service.spec.ts +++ b/test/app/settings/board-admin/board-admin.service.spec.ts @@ -6,7 +6,7 @@ import { import { BoardAdminService -} from '../../../../src/app/settings/board-admin/board-admin.service'; +} from 'src/app/settings/board-admin/board-admin.service'; describe('BoardAdminService', () => { let injector: TestBed; diff --git a/test/app/settings/board-admin/board-data.model.spec.ts b/test/app/settings/board-admin/board-data.model.spec.ts index 303f506..1bfa42b 100644 --- a/test/app/settings/board-admin/board-data.model.spec.ts +++ b/test/app/settings/board-admin/board-data.model.spec.ts @@ -1,4 +1,4 @@ -import { BoardData } from '../../../../src/app/settings/board-admin/board-data.model'; +import { BoardData } from 'src/app/settings/board-admin/board-data.model'; describe('BoardData', () => { let model: BoardData; diff --git a/test/app/settings/settings.component.spec.ts b/test/app/settings/settings.component.spec.ts index 398dae8..ef2438f 100644 --- a/test/app/settings/settings.component.spec.ts +++ b/test/app/settings/settings.component.spec.ts @@ -4,10 +4,10 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; import { Title } from '@angular/platform-browser'; -import { SettingsComponent } from '../../../src/app/settings/settings.component'; -import { SettingsModule } from '../../../src/app/settings/settings.module'; -import { SettingsService } from '../../../src/app/settings/settings.service'; -import { StringsService } from '../../../src/app/shared/services'; +import { SettingsComponent } from 'src/app/settings/settings.component'; +import { SettingsModule } from 'src/app/settings/settings.module'; +import { SettingsService } from 'src/app/settings/settings.service'; +import { StringsService } from 'src/app/shared/services'; describe('Settings', () => { let component: SettingsComponent; diff --git a/test/app/settings/settings.service.spec.ts b/test/app/settings/settings.service.spec.ts index 69c0a73..b08f154 100644 --- a/test/app/settings/settings.service.spec.ts +++ b/test/app/settings/settings.service.spec.ts @@ -4,7 +4,7 @@ import { HttpTestingController } from '@angular/common/http/testing'; -import { SettingsService } from '../../../src/app/settings/settings.service'; +import { SettingsService } from 'src/app/settings/settings.service'; describe('SettingsService', () => { let injector: TestBed; diff --git a/test/app/settings/user-admin/user-admin.component.spec.ts b/test/app/settings/user-admin/user-admin.component.spec.ts index 8e0c914..de8eebf 100644 --- a/test/app/settings/user-admin/user-admin.component.spec.ts +++ b/test/app/settings/user-admin/user-admin.component.spec.ts @@ -3,27 +3,25 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { SettingsService } from 'src/app/settings/settings.service'; +import { User } from 'src/app/shared/models'; +import { UserDisplay } from 'src/app/settings/user-admin/user-admin.models'; import { AuthService, ModalService, NotificationsService, StringsService -} from '../../../../src/app/shared/services'; -import { SettingsService } from '../../../../src/app/settings/settings.service'; +} from 'src/app/shared/services'; import { UserAdminService -} from '../../../../src/app/settings/user-admin/user-admin.service'; -import { User } from '../../../../src/app/shared/models'; -import { SettingsServiceMock, AuthServiceMock } from '../../mocks'; - -import { - UserDisplay -} from '../../../../src/app/settings/user-admin/user-admin.models'; +} from 'src/app/settings/user-admin/user-admin.service'; import { UserAdminComponent -} from '../../../../src/app/settings/user-admin/user-admin.component'; +} from 'src/app/settings/user-admin/user-admin.component'; + +import { SettingsServiceMock, AuthServiceMock } from '../../mocks'; describe('UserAdmin', () => { let component: UserAdminComponent; @@ -155,7 +153,7 @@ describe('UserAdmin', () => { let called = false; (component.userService as any).addUser = () => { - return { subscribe: fn => { + return { subscribe: (fn: any) => { const user = new User(); fn({ status: 'success', alerts: [{}], data: [{}, [user]] }); called = true; diff --git a/test/app/settings/user-admin/user-admin.service.spec.ts b/test/app/settings/user-admin/user-admin.service.spec.ts index 650ca35..ff47a15 100644 --- a/test/app/settings/user-admin/user-admin.service.spec.ts +++ b/test/app/settings/user-admin/user-admin.service.spec.ts @@ -6,7 +6,7 @@ import { import { UserAdminService -} from '../../../../src/app/settings/user-admin/user-admin.service'; +} from 'src/app/settings/user-admin/user-admin.service'; describe('UserAdminService', () => { let injector: TestBed; diff --git a/test/app/settings/user-settings/user-settings.component.spec.ts b/test/app/settings/user-settings/user-settings.component.spec.ts index ff7c236..1fb24ee 100644 --- a/test/app/settings/user-settings/user-settings.component.spec.ts +++ b/test/app/settings/user-settings/user-settings.component.spec.ts @@ -3,22 +3,21 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; - +import { SharedModule } from 'src/app/shared/shared.module'; +import { SettingsService } from 'src/app/settings/settings.service'; import { AuthService, NotificationsService, StringsService -} from '../../../../src/app/shared/services'; -import { SettingsService } from '../../../../src/app/settings/settings.service'; +} from 'src/app/shared/services'; import { UserSettingsService -} from '../../../../src/app/settings/user-settings/user-settings.service'; -import { SettingsServiceMock, AuthServiceMock } from '../../mocks'; - +} from 'src/app/settings/user-settings/user-settings.service'; import { UserSettingsComponent -} from '../../../../src/app/settings/user-settings/user-settings.component'; +} from 'src/app/settings/user-settings/user-settings.component'; + +import { SettingsServiceMock, AuthServiceMock } from '../../mocks'; describe('UserSettings', () => { let component: UserSettingsComponent; @@ -132,6 +131,18 @@ describe('UserSettings', () => { component.updatePassword(); expect(called).toEqual(true); + + (component.users as any).changePassword = () => { + return { subscribe: (fn: any) => { + fn({ alerts: [], data: [{}, '{}'], status: 'success' }); + called = true; + } }; + }; + + component.changePassword = { current: 'test', newPass: 'tester', verPass: 'tester' } as any; + component.updatePassword(); + + expect(called).toEqual(true); }); it('calls a service to update a user\'s username', () => { diff --git a/test/app/settings/user-settings/user-settings.service.spec.ts b/test/app/settings/user-settings/user-settings.service.spec.ts index 58f6627..63d8ccd 100644 --- a/test/app/settings/user-settings/user-settings.service.spec.ts +++ b/test/app/settings/user-settings/user-settings.service.spec.ts @@ -4,12 +4,12 @@ import { HttpTestingController } from '@angular/common/http/testing'; -import { AuthService } from '../../../../src/app/shared/services'; -import { AuthServiceMock } from '../../mocks'; - +import { AuthService } from 'src/app/shared/services'; import { UserSettingsService -} from '../../../../src/app/settings/user-settings/user-settings.service'; +} from 'src/app/settings/user-settings/user-settings.service'; + +import { AuthServiceMock } from '../../mocks'; describe('UserSettingsService', () => { let injector: TestBed; diff --git a/test/app/shared/auth/auth.guard.spec.ts b/test/app/shared/auth/auth.guard.spec.ts index c0056c9..6f37bcf 100644 --- a/test/app/shared/auth/auth.guard.spec.ts +++ b/test/app/shared/auth/auth.guard.spec.ts @@ -1,7 +1,8 @@ import { TestBed, getTestBed } from '@angular/core/testing' -import { AuthGuard } from '../../../../src/app/shared/auth/auth.guard'; -import { AuthService } from '../../../../src/app/shared/services'; +import { AuthGuard } from 'src/app/shared/auth/auth.guard'; +import { AuthService } from 'src/app/shared/services'; + import { AuthServiceMock } from '../../mocks'; describe('AuthGuard', () => { diff --git a/test/app/shared/auth/auth.service.spec.ts b/test/app/shared/auth/auth.service.spec.ts index c369481..01b9002 100644 --- a/test/app/shared/auth/auth.service.spec.ts +++ b/test/app/shared/auth/auth.service.spec.ts @@ -5,10 +5,9 @@ import { } from '@angular/common/http/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { Constants } from '../../../../src/app/shared/constants'; -import { StringsService } from '../../../../src/app/shared/services'; - -import { AuthService } from '../../../../src/app/shared/auth/auth.service'; +import { Constants } from 'src/app/shared/constants'; +import { StringsService } from 'src/app/shared/services'; +import { AuthService } from 'src/app/shared/auth/auth.service'; describe('AuthService', () => { let injector: TestBed; @@ -57,6 +56,12 @@ describe('AuthService', () => { }); testCall('api/authenticate', 'POST'); + + service.authenticate('', true).subscribe(response => { + expect(response).toEqual(true); + }); + + testCall('api/authenticate', 'POST'); }); it('handles errors on authenticate', () => { diff --git a/test/app/shared/constants.spec.ts b/test/app/shared/constants.spec.ts index 2c8bbb5..b684778 100644 --- a/test/app/shared/constants.spec.ts +++ b/test/app/shared/constants.spec.ts @@ -1,9 +1,7 @@ -import { Injectable } from '@angular/core'; - -import { Constants } from '../../../src/app/shared/constants'; +import { Constants } from 'src/app/shared/constants'; describe('Constants', () => { - let constants; + let constants: any; beforeEach(() => { constants = new Constants(); diff --git a/test/app/shared/context-menu/context-menu-item.spec.ts b/test/app/shared/context-menu/context-menu-item.spec.ts index 950911e..9543819 100644 --- a/test/app/shared/context-menu/context-menu-item.spec.ts +++ b/test/app/shared/context-menu/context-menu-item.spec.ts @@ -3,7 +3,7 @@ import { Component, ViewChild } from '@angular/core'; import { ContextMenuItemComponent -} from '../../../../src/app/shared/context-menu/context-menu-item.component'; +} from 'src/app/shared/context-menu/context-menu-item.component'; @Component({ selector: 'tb-host-component', @@ -51,6 +51,17 @@ describe('ContextMenuItem', () => { expect(pdCalled).toEqual(true); expect(spCalled).toEqual(true); + + pdCalled = false; + spCalled = false; + + hostComponent.menuItem.isSeparator = false; + hostComponent.menuItem.isCustomEvent = false; + + hostComponent.menuItem.el.nativeElement.onclick(evt); + + expect(pdCalled).toEqual(false); + expect(spCalled).toEqual(false); }); it('handles context menu clicks on the element', () => { diff --git a/test/app/shared/context-menu/context-menu.component.spec.ts b/test/app/shared/context-menu/context-menu.component.spec.ts index f43dfad..492bba6 100644 --- a/test/app/shared/context-menu/context-menu.component.spec.ts +++ b/test/app/shared/context-menu/context-menu.component.spec.ts @@ -1,14 +1,13 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { ElementRef } from '@angular/core'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; - +import { SharedModule } from 'src/app/shared/shared.module'; import { ContextMenuService -} from '../../../../src/app/shared/context-menu/context-menu.service'; +} from 'src/app/shared/context-menu/context-menu.service'; import { ContextMenuComponent -} from '../../../../src/app/shared/context-menu/context-menu.component'; +} from 'src/app/shared/context-menu/context-menu.component'; class ElementRefMock { public nativeElement = { parentElement: {} }; diff --git a/test/app/shared/context-menu/context-menu.service.spec.ts b/test/app/shared/context-menu/context-menu.service.spec.ts index e5af817..782ff5d 100644 --- a/test/app/shared/context-menu/context-menu.service.spec.ts +++ b/test/app/shared/context-menu/context-menu.service.spec.ts @@ -1,6 +1,6 @@ import { ContextMenuService -} from '../../../../src/app/shared/context-menu/context-menu.service'; +} from 'src/app/shared/context-menu/context-menu.service'; describe('ContextMenuService', () => { let service: ContextMenuService; @@ -14,7 +14,9 @@ describe('ContextMenuService', () => { }); it('can have a menu registered', () => { - service.registerMenu({}); + const menu = {}; + service.registerMenu(menu as any); + service.registerMenu(menu as any); expect(service['menus'].length).toEqual(1); }); diff --git a/test/app/shared/inline-edit/inline-edit.component.spec.ts b/test/app/shared/inline-edit/inline-edit.component.spec.ts index 26ebfbd..54ae400 100644 --- a/test/app/shared/inline-edit/inline-edit.component.spec.ts +++ b/test/app/shared/inline-edit/inline-edit.component.spec.ts @@ -1,10 +1,9 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; - +import { SharedModule } from 'src/app/shared/shared.module'; import { InlineEditComponent -} from '../../../../src/app/shared/inline-edit/inline-edit.component'; +} from 'src/app/shared/inline-edit/inline-edit.component'; describe('InlineEdit', () => { let component: InlineEditComponent; diff --git a/test/app/shared/modal/modal.component.spec.ts b/test/app/shared/modal/modal.component.spec.ts index 55567a5..011afa1 100644 --- a/test/app/shared/modal/modal.component.spec.ts +++ b/test/app/shared/modal/modal.component.spec.ts @@ -3,10 +3,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; - -import { ModalService } from '../../../../src/app/shared/services'; -import { ModalComponent } from '../../../../src/app/shared/modal/modal.component'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { ModalService } from 'src/app/shared/services'; +import { ModalComponent } from 'src/app/shared/modal/modal.component'; describe('Modal', () => { let component: ModalComponent; diff --git a/test/app/shared/modal/modal.service.spec.ts b/test/app/shared/modal/modal.service.spec.ts index 939a51a..cee156a 100644 --- a/test/app/shared/modal/modal.service.spec.ts +++ b/test/app/shared/modal/modal.service.spec.ts @@ -1,14 +1,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TestBed, getTestBed } from '@angular/core/testing' -import { - HttpClientTestingModule, - HttpTestingController -} from '@angular/common/http/testing'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; -import { AuthService } from '../../../../src/app/shared/services'; - -import { ModalService } from '../../../../src/app/shared/modal/modal.service'; +import { SharedModule } from 'src/app/shared/shared.module'; +import { AuthService } from 'src/app/shared/services'; +import { ModalService } from 'src/app/shared/modal/modal.service'; describe('ModalService', () => { let injector: TestBed; diff --git a/test/app/shared/models/models.spec.ts b/test/app/shared/models/models.spec.ts index fb26423..0429b70 100644 --- a/test/app/shared/models/models.spec.ts +++ b/test/app/shared/models/models.spec.ts @@ -13,7 +13,7 @@ import { Task, UserOptions, User -} from '../../../../src/app/shared/models'; +} from 'src/app/shared/models'; describe('Models', () => { diff --git a/test/app/shared/notifications/notifications.component.spec.ts b/test/app/shared/notifications/notifications.component.spec.ts index ee72e12..2c1a6f3 100644 --- a/test/app/shared/notifications/notifications.component.spec.ts +++ b/test/app/shared/notifications/notifications.component.spec.ts @@ -1,14 +1,14 @@ import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing'; -import { SharedModule } from '../../../../src/app/shared/shared.module'; -import { NotificationsServiceMock } from '../../mocks'; - +import { SharedModule } from 'src/app/shared/shared.module'; import { NotificationsService -} from '../../../../src/app/shared/notifications/notifications.service'; +} from 'src/app/shared/notifications/notifications.service'; import { NotificationsComponent -} from '../../../../src/app/shared/notifications/notifications.component'; +} from 'src/app/shared/notifications/notifications.component'; + +import { NotificationsServiceMock } from '../../mocks'; describe('Notifications', () => { let component: NotificationsComponent; diff --git a/test/app/shared/strings/strings.service.spec.ts b/test/app/shared/strings/strings.service.spec.ts index c91ae12..2ec8ff3 100644 --- a/test/app/shared/strings/strings.service.spec.ts +++ b/test/app/shared/strings/strings.service.spec.ts @@ -5,9 +5,7 @@ import { } from '@angular/common/http/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { - StringsService -} from '../../../../src/app/shared/strings/strings.service'; +import { StringsService } from 'src/app/shared/strings/strings.service'; describe('StringsService', () => { let injector: TestBed; diff --git a/test/app/shared/top-nav/top-nav.component.spec.ts b/test/app/shared/top-nav/top-nav.component.spec.ts index 47e351a..76b77f9 100644 --- a/test/app/shared/top-nav/top-nav.component.spec.ts +++ b/test/app/shared/top-nav/top-nav.component.spec.ts @@ -3,13 +3,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormsModule } from '@angular/forms'; -import { TopNavComponent } from '../../../../src/app/shared/top-nav/top-nav.component'; +import { TopNavComponent } from 'src/app/shared/top-nav/top-nav.component'; import { Constants, AuthService, NotificationsService, StringsService -} from '../../../../src/app/shared/services'; +} from 'src/app/shared/services'; describe('TopNav', () => { let component: TopNavComponent;