diff --git a/src/_mocks/FilterKeysPipeMock.ts b/src/_mocks/_pipes/FilterKeysPipeMock.ts similarity index 100% rename from src/_mocks/FilterKeysPipeMock.ts rename to src/_mocks/_pipes/FilterKeysPipeMock.ts diff --git a/src/_mocks/JustafewPipeMock.ts b/src/_mocks/_pipes/JustafewPipeMock.ts similarity index 100% rename from src/_mocks/JustafewPipeMock.ts rename to src/_mocks/_pipes/JustafewPipeMock.ts diff --git a/src/_mocks/QuizAdminFilterPipeMock.ts b/src/_mocks/_pipes/QuizAdminFilterPipeMock.ts similarity index 100% rename from src/_mocks/QuizAdminFilterPipeMock.ts rename to src/_mocks/_pipes/QuizAdminFilterPipeMock.ts diff --git a/src/_mocks/SearchFilterPipeMock.ts b/src/_mocks/_pipes/SearchFilterPipeMock.ts similarity index 100% rename from src/_mocks/SearchFilterPipeMock.ts rename to src/_mocks/_pipes/SearchFilterPipeMock.ts diff --git a/src/_mocks/SortPipeMock.ts b/src/_mocks/_pipes/SortPipeMock.ts similarity index 100% rename from src/_mocks/SortPipeMock.ts rename to src/_mocks/_pipes/SortPipeMock.ts diff --git a/src/_mocks/TranslatePipeMock.ts b/src/_mocks/_pipes/TranslatePipeMock.ts similarity index 100% rename from src/_mocks/TranslatePipeMock.ts rename to src/_mocks/_pipes/TranslatePipeMock.ts diff --git a/src/_mocks/UnusedKeyFilterPipeMock.ts b/src/_mocks/_pipes/UnusedKeyFilterPipeMock.ts similarity index 100% rename from src/_mocks/UnusedKeyFilterPipeMock.ts rename to src/_mocks/_pipes/UnusedKeyFilterPipeMock.ts diff --git a/src/_mocks/_services/AuthorizeApiServiceMock.ts b/src/_mocks/_services/AuthorizeApiServiceMock.ts new file mode 100644 index 0000000000000000000000000000000000000000..f442be23c992bb21aa720a3aeecbed3676a2f0a5 --- /dev/null +++ b/src/_mocks/_services/AuthorizeApiServiceMock.ts @@ -0,0 +1,36 @@ +import { Observable, of } from 'rxjs'; +import { MessageProtocol, StatusProtocol } from '../../app/lib/enums/Message'; +import { IMessage } from '../../app/lib/interfaces/communication/IMessage'; + +export class AuthorizeApiServiceMock { + public getAuthorizationForToken(token): Observable { + return token === 'no-token' ? of({ + status: StatusProtocol.Failed, + step: MessageProtocol.Authenticate, + payload: {}, + }) : of({ + status: StatusProtocol.Success, + step: MessageProtocol.Authenticate, + payload: { casTicket: 'test-ticket' }, + }); + } + + public postAuthorizationForStaticLogin(data): Observable { + return data.username ? of({ + status: StatusProtocol.Success, + step: MessageProtocol.Authenticate, + payload: { token: 'test-token' }, + }) : data.tokenHash ? of({ + status: StatusProtocol.Success, + step: MessageProtocol.Authenticate, + payload: { + token: 'test-token', + username: 'test-token-user', + }, + }) : of({ + status: StatusProtocol.Failed, + step: MessageProtocol.Authenticate, + payload: {}, + }); + } +} diff --git a/src/_mocks/SwUpdateMock.ts b/src/_mocks/_services/SwUpdateMock.ts similarity index 100% rename from src/_mocks/SwUpdateMock.ts rename to src/_mocks/_services/SwUpdateMock.ts diff --git a/src/_mocks/TranslateServiceMock.ts b/src/_mocks/_services/TranslateServiceMock.ts similarity index 100% rename from src/_mocks/TranslateServiceMock.ts rename to src/_mocks/_services/TranslateServiceMock.ts diff --git a/src/app/admin/admin-overview/admin-overview.component.spec.ts b/src/app/admin/admin-overview/admin-overview.component.spec.ts index 4fb85f027ce97db60e8f61c9c5559e8f4f7d79dc..2fda22744c57a00c37e3d78da4e72e83e11e1376 100644 --- a/src/app/admin/admin-overview/admin-overview.component.spec.ts +++ b/src/app/admin/admin-overview/admin-overview.component.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; import { ConnectionService } from '../../service/connection/connection.service'; diff --git a/src/app/admin/quiz-admin/quiz-admin.component.spec.ts b/src/app/admin/quiz-admin/quiz-admin.component.spec.ts index 9167ec400379d17ede741e4d64fae0c55666a753..b7ef9029aed8a0bb2481891161b6425b77dccd60 100644 --- a/src/app/admin/quiz-admin/quiz-admin.component.spec.ts +++ b/src/app/admin/quiz-admin/quiz-admin.component.spec.ts @@ -7,8 +7,8 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { Observable, of } from 'rxjs'; import { QuizMock } from '../../../_mocks/_fixtures/quiz.mock'; -import { QuizAdminFilterPipeMock } from '../../../_mocks/QuizAdminFilterPipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { QuizAdminFilterPipeMock } from '../../../_mocks/_pipes/QuizAdminFilterPipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { QuizState } from '../../lib/enums/QuizState'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { AdminApiService } from '../../service/api/admin/admin-api.service'; diff --git a/src/app/admin/user-admin/user-admin.component.spec.ts b/src/app/admin/user-admin/user-admin.component.spec.ts index 695d83258af35f51569c3231f2fdf5e4613b98b0..efd77b5a561b5cbe15d02906e42e9d339116fafa 100644 --- a/src/app/admin/user-admin/user-admin.component.spec.ts +++ b/src/app/admin/user-admin/user-admin.component.spec.ts @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { Observable, of } from 'rxjs'; import { UserMock } from '../../../_mocks/_fixtures/user.mock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { AdminApiService } from '../../service/api/admin/admin-api.service'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; diff --git a/src/app/footer/additional-data/additional-data.component.spec.ts b/src/app/footer/additional-data/additional-data.component.spec.ts index 084f29a7c843756cf8b05eeb52e0cb5b565f3932..87543d5a597d1be4369ac9776561b57c4353837f 100644 --- a/src/app/footer/additional-data/additional-data.component.spec.ts +++ b/src/app/footer/additional-data/additional-data.component.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { QuizMockService } from '../../service/quiz/quiz-mock.service'; import { QuizService } from '../../service/quiz/quiz.service'; import { TrackingMockService } from '../../service/tracking/tracking.mock.service'; diff --git a/src/app/footer/footer-bar/footer-bar.component.spec.ts b/src/app/footer/footer-bar/footer-bar.component.spec.ts index e400fe29e2cb7405c6088a082ff45510ed37a33a..81cf11d38c4095bb1dc48caa6c31d001aa629bba 100644 --- a/src/app/footer/footer-bar/footer-bar.component.spec.ts +++ b/src/app/footer/footer-bar/footer-bar.component.spec.ts @@ -6,7 +6,7 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; import { ConnectionService } from '../../service/connection/connection.service'; diff --git a/src/app/header/header/header.component.spec.ts b/src/app/header/header/header.component.spec.ts index 3b745694f2824624084d0ab44c3102e0dafc08e2..770558493e6b1f515e7ab589f28338e746ea21e9 100644 --- a/src/app/header/header/header.component.spec.ts +++ b/src/app/header/header/header.component.spec.ts @@ -6,8 +6,8 @@ import { SwUpdate } from '@angular/service-worker'; import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { TOAST_CONFIG } from 'ngx-toastr'; -import { SwUpdateMock } from '../../../_mocks/SwUpdateMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { SwUpdateMock } from '../../../_mocks/_services/SwUpdateMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; import { ConnectionService } from '../../service/connection/connection.service'; import { HeaderLabelService } from '../../service/header-label/header-label.service'; diff --git a/src/app/i18n-manager/i18n-manager-overview/i18n-manager-overview.component.spec.ts b/src/app/i18n-manager/i18n-manager-overview/i18n-manager-overview.component.spec.ts index 15629fae3cd3e9f6905b5dd46e61f9af7d14e8b3..e13403740765ee018da815c903d09effe5f47959 100644 --- a/src/app/i18n-manager/i18n-manager-overview/i18n-manager-overview.component.spec.ts +++ b/src/app/i18n-manager/i18n-manager-overview/i18n-manager-overview.component.spec.ts @@ -7,7 +7,7 @@ import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { PipesModule } from '../../pipes/pipes.module'; import { FooterBarService } from '../../service/footer-bar/footer-bar.service'; diff --git a/src/app/i18n-manager/key-output/key-output.component.spec.ts b/src/app/i18n-manager/key-output/key-output.component.spec.ts index 67434c1d3e158d7eb21201703d11cf4a2fc2ecac..ed9df6e13b141ee807f2a1a1b8c7a7e6bb775891 100644 --- a/src/app/i18n-manager/key-output/key-output.component.spec.ts +++ b/src/app/i18n-manager/key-output/key-output.component.spec.ts @@ -4,11 +4,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { FilterKeysPipeMock } from '../../../_mocks/FilterKeysPipeMock'; -import { JustafewPipeMock } from '../../../_mocks/JustafewPipeMock'; -import { SearchFilterPipeMock } from '../../../_mocks/SearchFilterPipeMock'; -import { SortPipeMock } from '../../../_mocks/SortPipeMock'; -import { UnusedKeyFilterPipeMock } from '../../../_mocks/UnusedKeyFilterPipeMock'; +import { FilterKeysPipeMock } from '../../../_mocks/_pipes/FilterKeysPipeMock'; +import { JustafewPipeMock } from '../../../_mocks/_pipes/JustafewPipeMock'; +import { SearchFilterPipeMock } from '../../../_mocks/_pipes/SearchFilterPipeMock'; +import { SortPipeMock } from '../../../_mocks/_pipes/SortPipeMock'; +import { UnusedKeyFilterPipeMock } from '../../../_mocks/_pipes/UnusedKeyFilterPipeMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { CasLoginService } from '../../service/login/cas-login.service'; import { StorageService } from '../../service/storage/storage.service'; diff --git a/src/app/live-preview/live-preview/live-preview.component.spec.ts b/src/app/live-preview/live-preview/live-preview.component.spec.ts index 2e4278087e18b91820beb9d3220502f6f8a0febb..4fe06646b8fd9f01bd64594d2639a76231aae316 100644 --- a/src/app/live-preview/live-preview/live-preview.component.spec.ts +++ b/src/app/live-preview/live-preview/live-preview.component.spec.ts @@ -7,9 +7,9 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; import { TOAST_CONFIG } from 'ngx-toastr'; -import { SwUpdateMock } from '../../../_mocks/SwUpdateMock'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { SwUpdateMock } from '../../../_mocks/_services/SwUpdateMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { DEVICE_TYPES, LIVE_PREVIEW_ENVIRONMENT } from '../../../environments/environment'; import { HeaderModule } from '../../header/header.module'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; diff --git a/src/app/markdown/markdown-bar/markdown-bar.component.spec.ts b/src/app/markdown/markdown-bar/markdown-bar.component.spec.ts index d99c453b64ea6340674d73d38ff13649c4692618..1a9d727de98a42e3bb16c20a005abf50b1dc684b 100644 --- a/src/app/markdown/markdown-bar/markdown-bar.component.spec.ts +++ b/src/app/markdown/markdown-bar/markdown-bar.component.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { faBold, faCode, faGlobe, faHeading, faImage, faItalic, faListUl, faStrikethrough } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { TrackingMockService } from '../../service/tracking/tracking.mock.service'; import { TrackingService } from '../../service/tracking/tracking.service'; import { SharedModule } from '../../shared/shared.module'; diff --git a/src/app/modals/available-quizzes/available-quizzes.component.spec.ts b/src/app/modals/available-quizzes/available-quizzes.component.spec.ts index 6e0c9839e33db7b6dea388d40cca3861d78170ea..2ded90a08ffbc28c70f1bf4cfd5142cd05a97691 100644 --- a/src/app/modals/available-quizzes/available-quizzes.component.spec.ts +++ b/src/app/modals/available-quizzes/available-quizzes.component.spec.ts @@ -4,7 +4,7 @@ import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { MemberApiService } from '../../service/api/member/member-api.service'; import { QuizApiService } from '../../service/api/quiz/quiz-api.service'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; diff --git a/src/app/modals/quiz-save/quiz-save.component.spec.ts b/src/app/modals/quiz-save/quiz-save.component.spec.ts index 70a6ccc73d97226f33a9d2cf0e008e6a5646a49d..272ab55e4fd42341bfdf2e59e4f88cdd236318c7 100644 --- a/src/app/modals/quiz-save/quiz-save.component.spec.ts +++ b/src/app/modals/quiz-save/quiz-save.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; import { QuizSaveComponent } from './quiz-save.component'; diff --git a/src/app/modals/server-unavailable-modal/server-unavailable-modal.component.spec.ts b/src/app/modals/server-unavailable-modal/server-unavailable-modal.component.spec.ts index 667f371fa6cfb4fbde39f1bab8f165b9c55f99fc..2a1ada057fc960ee25ea87f27cbe23d78a92d92c 100644 --- a/src/app/modals/server-unavailable-modal/server-unavailable-modal.component.spec.ts +++ b/src/app/modals/server-unavailable-modal/server-unavailable-modal.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { HeaderLabelService } from '../../service/header-label/header-label.service'; import { ServerUnavailableModalComponent } from './server-unavailable-modal.component'; diff --git a/src/app/pipes/generic-filter/generic-filter.pipe.spec.ts b/src/app/pipes/generic-filter/generic-filter.pipe.spec.ts index 0b0ed73553df6a56cfd13cfbf9d15a2578ff2e8c..f5457412a6ad8ce496d291f667c832745a5f6fa3 100644 --- a/src/app/pipes/generic-filter/generic-filter.pipe.spec.ts +++ b/src/app/pipes/generic-filter/generic-filter.pipe.spec.ts @@ -1,4 +1,4 @@ -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { GenericFilterPipe } from './generic-filter.pipe'; describe('GenericFilterPipe', () => { diff --git a/src/app/quiz/quiz-duplicate/quiz-duplicate.component.spec.ts b/src/app/quiz/quiz-duplicate/quiz-duplicate.component.spec.ts index 4fb7edd358367d85a20e808f256927d9098fc2a5..0c86a6791b5a9955411ac0aaa730f177b8020fb6 100644 --- a/src/app/quiz/quiz-duplicate/quiz-duplicate.component.spec.ts +++ b/src/app/quiz/quiz-duplicate/quiz-duplicate.component.spec.ts @@ -6,7 +6,7 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { QuizDuplicateComponent } from './quiz-duplicate.component'; diff --git a/src/app/quiz/quiz-flow/confidence-rate/confidence-rate.component.spec.ts b/src/app/quiz/quiz-flow/confidence-rate/confidence-rate.component.spec.ts index 9ad87762052a79f16b037f9f789c82aac0b651c4..2b45dfc9ddab6148c3ec223486776fba337a37dd 100644 --- a/src/app/quiz/quiz-flow/confidence-rate/confidence-rate.component.spec.ts +++ b/src/app/quiz/quiz-flow/confidence-rate/confidence-rate.component.spec.ts @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; import { Subscription } from 'rxjs'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { ServerUnavailableModalComponent } from '../../../modals/server-unavailable-modal/server-unavailable-modal.component'; import { MemberApiService } from '../../../service/api/member/member-api.service'; diff --git a/src/app/quiz/quiz-flow/leaderboard/leaderboard.component.spec.ts b/src/app/quiz/quiz-flow/leaderboard/leaderboard.component.spec.ts index 9d3384fb86eb37e4fdf2ed7884344c590f2378a1..ddd136f6f2c2b96deb39b75e06bdd28a293bd31d 100644 --- a/src/app/quiz/quiz-flow/leaderboard/leaderboard.component.spec.ts +++ b/src/app/quiz/quiz-flow/leaderboard/leaderboard.component.spec.ts @@ -10,7 +10,7 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { Language } from '../../../lib/enums/enums'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { ServerUnavailableModalComponent } from '../../../modals/server-unavailable-modal/server-unavailable-modal.component'; diff --git a/src/app/quiz/quiz-flow/quiz-lobby/modals/edit-mode-confirm/edit-mode-confirm.component.spec.ts b/src/app/quiz/quiz-flow/quiz-lobby/modals/edit-mode-confirm/edit-mode-confirm.component.spec.ts index 7ecf92e52e69152cb55e42f307c65b27d610848f..ca72633570192a08ce7b894e1a32532778f383ee 100644 --- a/src/app/quiz/quiz-flow/quiz-lobby/modals/edit-mode-confirm/edit-mode-confirm.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-lobby/modals/edit-mode-confirm/edit-mode-confirm.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { EditModeConfirmComponent } from './edit-mode-confirm.component'; diff --git a/src/app/quiz/quiz-flow/quiz-lobby/quiz-lobby.component.spec.ts b/src/app/quiz/quiz-flow/quiz-lobby/quiz-lobby.component.spec.ts index b6eb0f6842fc53b9db0ca60ff139252f43c6efa1..5ed73b9b64d066ada263b43d78a29271260b2619 100644 --- a/src/app/quiz/quiz-flow/quiz-lobby/quiz-lobby.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-lobby/quiz-lobby.component.spec.ts @@ -10,7 +10,7 @@ import { RxStompService } from '@stomp/ng2-stompjs'; import { QRCodeModule } from 'angularx-qrcode'; import { SimpleMQ } from 'ng2-simple-mq'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { ServerUnavailableModalComponent } from '../../../modals/server-unavailable-modal/server-unavailable-modal.component'; import { MemberApiService } from '../../../service/api/member/member-api.service'; import { QuizApiService } from '../../../service/api/quiz/quiz-api.service'; diff --git a/src/app/quiz/quiz-flow/quiz-results/confidence-rate/confidence-rate.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/confidence-rate/confidence-rate.component.spec.ts index e4495631695270d213fabea4270f7a250eac98ba..6e0afac9f1f024aed63b71a90f56aed3db73fb42 100644 --- a/src/app/quiz/quiz-flow/quiz-results/confidence-rate/confidence-rate.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/confidence-rate/confidence-rate.component.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { AttendeeMockService } from '../../../../service/attendee/attendee.mock.service'; import { AttendeeService } from '../../../../service/attendee/attendee.service'; import { ConnectionMockService } from '../../../../service/connection/connection.mock.service'; diff --git a/src/app/quiz/quiz-flow/quiz-results/modals/to-lobby-confirm/to-lobby-confirm.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/modals/to-lobby-confirm/to-lobby-confirm.component.spec.ts index b69cb19caa3b9bd7a44a191058f04824b11c764c..c9074591c43352f159c26552d1828dff1bd42cbf 100644 --- a/src/app/quiz/quiz-flow/quiz-results/modals/to-lobby-confirm/to-lobby-confirm.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/modals/to-lobby-confirm/to-lobby-confirm.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ToLobbyConfirmComponent } from './to-lobby-confirm.component'; diff --git a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-anonymous/progress-bar-anonymous.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-anonymous/progress-bar-anonymous.component.spec.ts index 0752b054f1841cff88507009c649d7172b8834db..d222cb7fe9a4f0dcd7e81bdc763d6ea3db15ffc2 100644 --- a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-anonymous/progress-bar-anonymous.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-anonymous/progress-bar-anonymous.component.spec.ts @@ -2,8 +2,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ProgressBarAnonymousComponent } from './progress-bar-anonymous.component'; diff --git a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-freetext/progress-bar-freetext.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-freetext/progress-bar-freetext.component.spec.ts index 5d5065332d8cd25d40f9a270fc62f0504bc8905c..05c19b4c48b63e52bce01b9e1bb76fb7275e5859 100644 --- a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-freetext/progress-bar-freetext.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-freetext/progress-bar-freetext.component.spec.ts @@ -4,8 +4,8 @@ import { DomSanitizer } from '@angular/platform-browser'; import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ProgressBarFreetextComponent } from './progress-bar-freetext.component'; diff --git a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-multiple-choice/progress-bar-multiple-choice.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-multiple-choice/progress-bar-multiple-choice.component.spec.ts index 9c875c12e334e10c237d3546e06699b0e7e52f60..9ebfdee5830b06ca911b83121c42e6cf6f56c896 100644 --- a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-multiple-choice/progress-bar-multiple-choice.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-multiple-choice/progress-bar-multiple-choice.component.spec.ts @@ -4,8 +4,8 @@ import { DomSanitizer } from '@angular/platform-browser'; import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ProgressBarMultipleChoiceComponent } from './progress-bar-multiple-choice.component'; diff --git a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-ranged/progress-bar-ranged.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-ranged/progress-bar-ranged.component.spec.ts index 964d323ff2fb8bde390f3ced6fb156dcaaacdc2f..b3088386f17702819853fdfe4ed7ca9d4fd8a653 100644 --- a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-ranged/progress-bar-ranged.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-ranged/progress-bar-ranged.component.spec.ts @@ -4,8 +4,8 @@ import { DomSanitizer } from '@angular/platform-browser'; import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ProgressBarRangedComponent } from './progress-bar-ranged.component'; diff --git a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-single-choice/progress-bar-single-choice.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-single-choice/progress-bar-single-choice.component.spec.ts index 7effc9033025d036ab186b958ea18412c890735e..1ef2a32506f992a8d57483bedb556e7837cae61a 100644 --- a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-single-choice/progress-bar-single-choice.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-single-choice/progress-bar-single-choice.component.spec.ts @@ -4,8 +4,8 @@ import { DomSanitizer } from '@angular/platform-browser'; import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ProgressBarSingleChoiceComponent } from './progress-bar-single-choice.component'; diff --git a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-survey/progress-bar-survey.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-survey/progress-bar-survey.component.spec.ts index b51d14d14a27dfa3d7ea11d604a440cc0b806041..79a660e76bd0500d5130ed893005a3416f59ac7a 100644 --- a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-survey/progress-bar-survey.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar-survey/progress-bar-survey.component.spec.ts @@ -4,8 +4,8 @@ import { DomSanitizer } from '@angular/platform-browser'; import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ProgressBarSurveyComponent } from './progress-bar-survey.component'; diff --git a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar.component.spec.ts index 485158d0835715670beff1c80db1c5e46569f060..b5191c9a44cf2430abb303bbf6bcea80a82e0fa3 100644 --- a/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/progress-bar/progress-bar.component.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { Attendee } from '../../../../lib/attendee/attendee'; import { AbstractChoiceQuestionEntity } from '../../../../lib/entities/question/AbstractChoiceQuestionEntity'; import { AttendeeMockService } from '../../../../service/attendee/attendee.mock.service'; diff --git a/src/app/quiz/quiz-flow/quiz-results/question-details/question-details.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/question-details/question-details.component.spec.ts index a969aef5d44cb90a291babb11c0144fefda8e7d6..e9460a22e846483a11fe8725ef1c5b10ff20b2c2 100644 --- a/src/app/quiz/quiz-flow/quiz-results/question-details/question-details.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/question-details/question-details.component.spec.ts @@ -10,7 +10,7 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../../lib/jwt.factory'; import { ServerUnavailableModalComponent } from '../../../../modals/server-unavailable-modal/server-unavailable-modal.component'; import { AttendeeMockService } from '../../../../service/attendee/attendee.mock.service'; diff --git a/src/app/quiz/quiz-flow/quiz-results/quiz-results.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/quiz-results.component.spec.ts index 06a0635c1aa21b306d0bde798e8fde2aa28af57d..a6eca7d2ba8bc0178007bada709e7ff1696146e4 100644 --- a/src/app/quiz/quiz-flow/quiz-results/quiz-results.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/quiz-results.component.spec.ts @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { Attendee } from '../../../lib/attendee/attendee'; import { SurveyQuestionEntity } from '../../../lib/entities/question/SurveyQuestionEntity'; import { Language } from '../../../lib/enums/enums'; diff --git a/src/app/quiz/quiz-flow/quiz-results/reading-confirmation-progress/reading-confirmation-progress.component.spec.ts b/src/app/quiz/quiz-flow/quiz-results/reading-confirmation-progress/reading-confirmation-progress.component.spec.ts index 295bb6d96d981e6dbaee177349a512fe6b9ab6bf..cf11cd1b549df52cec37dd3f31a6a12df5e62422 100644 --- a/src/app/quiz/quiz-flow/quiz-results/reading-confirmation-progress/reading-confirmation-progress.component.spec.ts +++ b/src/app/quiz/quiz-flow/quiz-results/reading-confirmation-progress/reading-confirmation-progress.component.spec.ts @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { I18nService } from '../../../../service/i18n/i18n.service'; import { StorageService } from '../../../../service/storage/storage.service'; import { StorageServiceMock } from '../../../../service/storage/storage.service.mock'; diff --git a/src/app/quiz/quiz-flow/reading-confirmation/reading-confirmation.component.spec.ts b/src/app/quiz/quiz-flow/reading-confirmation/reading-confirmation.component.spec.ts index dc0d19e4d7f99fe43e67d0ee46639f434196619b..636ebbe473e841311917462ecbb7df854cca80ea 100644 --- a/src/app/quiz/quiz-flow/reading-confirmation/reading-confirmation.component.spec.ts +++ b/src/app/quiz/quiz-flow/reading-confirmation/reading-confirmation.component.spec.ts @@ -10,7 +10,7 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { ServerUnavailableModalComponent } from '../../../modals/server-unavailable-modal/server-unavailable-modal.component'; import { AttendeeMockService } from '../../../service/attendee/attendee.mock.service'; diff --git a/src/app/quiz/quiz-flow/voting/voting.component.spec.ts b/src/app/quiz/quiz-flow/voting/voting.component.spec.ts index 9b080d8178548436ba469c6435146c1cf198f638..a719a9e0d3498d864592d7edc5295933463cbb05 100644 --- a/src/app/quiz/quiz-flow/voting/voting.component.spec.ts +++ b/src/app/quiz/quiz-flow/voting/voting.component.spec.ts @@ -11,8 +11,8 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { ServerUnavailableModalComponent } from '../../../modals/server-unavailable-modal/server-unavailable-modal.component'; import { MemberApiService } from '../../../service/api/member/member-api.service'; diff --git a/src/app/quiz/quiz-join/quiz-join.component.spec.ts b/src/app/quiz/quiz-join/quiz-join.component.spec.ts index 4d4a87e5ceeb1eba3b62a4b7bce07aebd71b97c9..797286b2d8e8d9fc252106d1d964f42fa0173e9e 100644 --- a/src/app/quiz/quiz-join/quiz-join.component.spec.ts +++ b/src/app/quiz/quiz-join/quiz-join.component.spec.ts @@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { MessageProtocol, StatusProtocol } from '../../lib/enums/Message'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { QuizApiService } from '../../service/api/quiz/quiz-api.service'; diff --git a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-default/answeroptions-default.component.spec.ts b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-default/answeroptions-default.component.spec.ts index c7787b572a201b0bb1f5222dbb2990bebbe63f0b..b66308519ab4d5bc836afb5ca09d6b5654311d2e 100644 --- a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-default/answeroptions-default.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-default/answeroptions-default.component.spec.ts @@ -10,9 +10,9 @@ import { AngularSvgIconModule } from 'angular-svg-icon'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; import { TOAST_CONFIG } from 'ngx-toastr'; import { of } from 'rxjs'; -import { SwUpdateMock } from '../../../../../../_mocks/SwUpdateMock'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { SwUpdateMock } from '../../../../../../_mocks/_services/SwUpdateMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { HeaderComponent } from '../../../../../header/header/header.component'; import { SurveyQuestionEntity } from '../../../../../lib/entities/question/SurveyQuestionEntity'; import { LivePreviewComponent } from '../../../../../live-preview/live-preview/live-preview.component'; diff --git a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-freetext/answeroptions-freetext.component.spec.ts b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-freetext/answeroptions-freetext.component.spec.ts index 417d0df27aedc41a292f6ec4ec1adc4a56c641c7..0fab3e4bcf68c88b8c520e6415b4cc7e5973a8a7 100644 --- a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-freetext/answeroptions-freetext.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-freetext/answeroptions-freetext.component.spec.ts @@ -4,8 +4,8 @@ import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { FreeTextAnswerEntity } from '../../../../../lib/entities/answer/FreetextAnwerEntity'; import { ConnectionMockService } from '../../../../../service/connection/connection.mock.service'; import { ConnectionService } from '../../../../../service/connection/connection.service'; diff --git a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-ranged/answeroptions-ranged.component.spec.ts b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-ranged/answeroptions-ranged.component.spec.ts index ec56fae56b09e6d3614da0593f8b4bec3f08b9f4..6b907f387f20c2b2af952ea2252b77389c165f73 100644 --- a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-ranged/answeroptions-ranged.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions-ranged/answeroptions-ranged.component.spec.ts @@ -5,8 +5,8 @@ import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { TranslatePipeMock } from '../../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../../_mocks/_services/TranslateServiceMock'; import { ConnectionMockService } from '../../../../../service/connection/connection.mock.service'; import { ConnectionService } from '../../../../../service/connection/connection.service'; import { FooterBarService } from '../../../../../service/footer-bar/footer-bar.service'; diff --git a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions.component.spec.ts b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions.component.spec.ts index 4218e3e5693a3e1825ce7e9af6fd85a2f1b6b7a1..2db7a600228dfa556548b6e12eca9ecde301bbbc 100644 --- a/src/app/quiz/quiz-manager/details/answeroptions/answeroptions.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/answeroptions/answeroptions.component.spec.ts @@ -13,9 +13,9 @@ import { RxStompService } from '@stomp/ng2-stompjs'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { TOAST_CONFIG } from 'ngx-toastr'; import { of } from 'rxjs'; -import { SwUpdateMock } from '../../../../../_mocks/SwUpdateMock'; -import { TranslatePipeMock } from '../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../_mocks/_pipes/TranslatePipeMock'; +import { SwUpdateMock } from '../../../../../_mocks/_services/SwUpdateMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { HeaderComponent } from '../../../../header/header/header.component'; import { jwtOptionsFactory } from '../../../../lib/jwt.factory'; import { LivePreviewComponent } from '../../../../live-preview/live-preview/live-preview.component'; diff --git a/src/app/quiz/quiz-manager/details/countdown/countdown.component.spec.ts b/src/app/quiz/quiz-manager/details/countdown/countdown.component.spec.ts index 441ffe39830269f3a891daf89bbb72597ca40d79..f962d66ea0ff90af73416993086cef4894f6327f 100644 --- a/src/app/quiz/quiz-manager/details/countdown/countdown.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/countdown/countdown.component.spec.ts @@ -10,8 +10,8 @@ import { faHourglass } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { of } from 'rxjs'; -import { TranslatePipeMock } from '../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../../lib/jwt.factory'; import { ConnectionMockService } from '../../../../service/connection/connection.mock.service'; import { ConnectionService } from '../../../../service/connection/connection.service'; diff --git a/src/app/quiz/quiz-manager/details/details-overview/quiz-manager-details-overview.component.spec.ts b/src/app/quiz/quiz-manager/details/details-overview/quiz-manager-details-overview.component.spec.ts index 34999fbdf654baf7501b2a53d73cfac2e3faa092..19f5b7b019e21d9d78967d92ec7ff2076d3b7dbb 100644 --- a/src/app/quiz/quiz-manager/details/details-overview/quiz-manager-details-overview.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/details-overview/quiz-manager-details-overview.component.spec.ts @@ -7,8 +7,8 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { of } from 'rxjs'; -import { TranslatePipeMock } from '../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../../lib/jwt.factory'; import { ConnectionMockService } from '../../../../service/connection/connection.mock.service'; import { ConnectionService } from '../../../../service/connection/connection.service'; diff --git a/src/app/quiz/quiz-manager/details/questiontext/questiontext.component.spec.ts b/src/app/quiz/quiz-manager/details/questiontext/questiontext.component.spec.ts index 7fb72ec08a339eb38dccdeaa323d61d50e96b1ce..558f9ee7a02b23b9b9ba60fad50088c3970a257d 100644 --- a/src/app/quiz/quiz-manager/details/questiontext/questiontext.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/questiontext/questiontext.component.spec.ts @@ -13,9 +13,9 @@ import { AngularSvgIconModule } from 'angular-svg-icon'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; import { TOAST_CONFIG } from 'ngx-toastr'; import { of } from 'rxjs'; -import { SwUpdateMock } from '../../../../../_mocks/SwUpdateMock'; -import { TranslatePipeMock } from '../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../_mocks/_pipes/TranslatePipeMock'; +import { SwUpdateMock } from '../../../../../_mocks/_services/SwUpdateMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { HeaderComponent } from '../../../../header/header/header.component'; import { jwtOptionsFactory } from '../../../../lib/jwt.factory'; import { LivePreviewComponent } from '../../../../live-preview/live-preview/live-preview.component'; diff --git a/src/app/quiz/quiz-manager/details/questiontype/questiontype.component.spec.ts b/src/app/quiz/quiz-manager/details/questiontype/questiontype.component.spec.ts index 17f7de33b2409fe715e3ebb078e62d8f0933809e..93092ebd0217533f52877525012d037a42ad8367 100644 --- a/src/app/quiz/quiz-manager/details/questiontype/questiontype.component.spec.ts +++ b/src/app/quiz/quiz-manager/details/questiontype/questiontype.component.spec.ts @@ -7,8 +7,8 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { of } from 'rxjs'; -import { TranslatePipeMock } from '../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { QuestionType } from '../../../../lib/enums/QuestionType'; import { jwtOptionsFactory } from '../../../../lib/jwt.factory'; import { ConnectionMockService } from '../../../../service/connection/connection.mock.service'; diff --git a/src/app/quiz/quiz-manager/member-group-manager/member-group-manager.component.spec.ts b/src/app/quiz/quiz-manager/member-group-manager/member-group-manager.component.spec.ts index ebf9604d3a8d39efc4d5e12d72bbf5a6e8c7ea7f..385cba5d3fe472692c5fdebb85be815ff4f4311e 100644 --- a/src/app/quiz/quiz-manager/member-group-manager/member-group-manager.component.spec.ts +++ b/src/app/quiz/quiz-manager/member-group-manager/member-group-manager.component.spec.ts @@ -7,8 +7,8 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { ConnectionMockService } from '../../../service/connection/connection.mock.service'; import { ConnectionService } from '../../../service/connection/connection.service'; diff --git a/src/app/quiz/quiz-manager/nickname-manager/nickname-manager.component.spec.ts b/src/app/quiz/quiz-manager/nickname-manager/nickname-manager.component.spec.ts index eb70eedc8488d6d9539aa21bef25179b150b8e96..26d6f23078381bb998c92b221358181f78559a36 100644 --- a/src/app/quiz/quiz-manager/nickname-manager/nickname-manager.component.spec.ts +++ b/src/app/quiz/quiz-manager/nickname-manager/nickname-manager.component.spec.ts @@ -8,9 +8,9 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { JustafewPipeMock } from '../../../../_mocks/JustafewPipeMock'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { JustafewPipeMock } from '../../../../_mocks/_pipes/JustafewPipeMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { ConnectionMockService } from '../../../service/connection/connection.mock.service'; import { ConnectionService } from '../../../service/connection/connection.service'; diff --git a/src/app/quiz/quiz-manager/quiz-manager/quiz-manager.component.spec.ts b/src/app/quiz/quiz-manager/quiz-manager/quiz-manager.component.spec.ts index e02e33bd90291f835de7ed0605aa23821995e88a..b16b5994d5e2b523be4aed7d5c2ee31233fb5ff4 100644 --- a/src/app/quiz/quiz-manager/quiz-manager/quiz-manager.component.spec.ts +++ b/src/app/quiz/quiz-manager/quiz-manager/quiz-manager.component.spec.ts @@ -7,8 +7,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { NgbPopoverModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { FooterModule } from '../../../footer/footer.module'; import { availableQuestionTypes } from '../../../lib/available-question-types'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; diff --git a/src/app/quiz/quiz-manager/quiz-manager/quiz-type-select-modal/quiz-type-select-modal.component.spec.ts b/src/app/quiz/quiz-manager/quiz-manager/quiz-type-select-modal/quiz-type-select-modal.component.spec.ts index a6ead99176590ea7739edb25dce0884dd03dfa5b..98f541c2b01deb184d44646065d0e5a9155003e4 100644 --- a/src/app/quiz/quiz-manager/quiz-manager/quiz-type-select-modal/quiz-type-select-modal.component.spec.ts +++ b/src/app/quiz/quiz-manager/quiz-manager/quiz-type-select-modal/quiz-type-select-modal.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { TranslatePipeMock } from '../../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../../_mocks/_services/TranslateServiceMock'; import { QuizTypeSelectModalComponent } from './quiz-type-select-modal.component'; @Pipe({ diff --git a/src/app/quiz/quiz-manager/sound-manager/sound-manager.component.spec.ts b/src/app/quiz/quiz-manager/sound-manager/sound-manager.component.spec.ts index 425de2089cb16f9d953ac9742126781f8e16ea3c..e7888ce9618ea97cbb1118f9612c801cec9cc51f 100644 --- a/src/app/quiz/quiz-manager/sound-manager/sound-manager.component.spec.ts +++ b/src/app/quiz/quiz-manager/sound-manager/sound-manager.component.spec.ts @@ -7,8 +7,8 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { ConnectionMockService } from '../../../service/connection/connection.mock.service'; import { ConnectionService } from '../../../service/connection/connection.service'; diff --git a/src/app/quiz/quiz-overview/quiz-overview.component.spec.ts b/src/app/quiz/quiz-overview/quiz-overview.component.spec.ts index 978a5a3cfb2ebd051b431403ccc0d9e21380940f..d77dec746fb614dced266b73ec801fc7bf8986a9 100644 --- a/src/app/quiz/quiz-overview/quiz-overview.component.spec.ts +++ b/src/app/quiz/quiz-overview/quiz-overview.component.spec.ts @@ -7,8 +7,8 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { DefaultSettings } from '../../lib/default.settings'; import { DefaultAnswerEntity } from '../../lib/entities/answer/DefaultAnswerEntity'; import { SingleChoiceQuestionEntity } from '../../lib/entities/question/SingleChoiceQuestionEntity'; diff --git a/src/app/quiz/quiz-public/quiz-public.component.spec.ts b/src/app/quiz/quiz-public/quiz-public.component.spec.ts index fd899e11447ebefec9082ff021e1259f1ad0a487..12ec222cee7dc1633b00e5b7cc14c11ef9b540a9 100644 --- a/src/app/quiz/quiz-public/quiz-public.component.spec.ts +++ b/src/app/quiz/quiz-public/quiz-public.component.spec.ts @@ -7,8 +7,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { of } from 'rxjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { FileUploadMockService } from '../../service/file-upload/file-upload.mock.service'; import { FileUploadService } from '../../service/file-upload/file-upload.service'; diff --git a/src/app/quiz/quiz-rename/quiz-rename.component.spec.ts b/src/app/quiz/quiz-rename/quiz-rename.component.spec.ts index 0e5646904fdf4f52987f0e1bb2d04017f77a5edb..370176c141688639a72bbd3c8aea613437486aed 100644 --- a/src/app/quiz/quiz-rename/quiz-rename.component.spec.ts +++ b/src/app/quiz/quiz-rename/quiz-rename.component.spec.ts @@ -6,8 +6,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; import { ConnectionService } from '../../service/connection/connection.service'; diff --git a/src/app/root/home/home.component.spec.ts b/src/app/root/home/home.component.spec.ts index 22c65e539d5969e82820222bc5bd6cc1b3e767a9..90e3f9d5848ec195a62f60da8b99ec2f5c302020 100644 --- a/src/app/root/home/home.component.spec.ts +++ b/src/app/root/home/home.component.spec.ts @@ -11,8 +11,8 @@ import { faThumbsUp } from '@fortawesome/free-solid-svg-icons'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { AttendeeMockService } from '../../service/attendee/attendee.mock.service'; import { AttendeeService } from '../../service/attendee/attendee.service'; diff --git a/src/app/root/info/info.component.spec.ts b/src/app/root/info/info.component.spec.ts index db9f53dd171a6ff86baf90846095a112136a4047..6489be27bc988be892abaa1776563955d9fe41a0 100644 --- a/src/app/root/info/info.component.spec.ts +++ b/src/app/root/info/info.component.spec.ts @@ -5,8 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; import { ConnectionService } from '../../service/connection/connection.service'; diff --git a/src/app/root/language-switcher/language-switcher.component.spec.ts b/src/app/root/language-switcher/language-switcher.component.spec.ts index 33af4f29b68a28f87b2bcdf0ffd7ed0ae6c43430..4bdb600ebc79e343c84088d75e6e1fab792dde98 100644 --- a/src/app/root/language-switcher/language-switcher.component.spec.ts +++ b/src/app/root/language-switcher/language-switcher.component.spec.ts @@ -5,8 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; import { ConnectionService } from '../../service/connection/connection.service'; diff --git a/src/app/root/login/login.component.spec.ts b/src/app/root/login/login.component.spec.ts index 1d2812ee23fa9315216e9d37f949ab63eb5641bf..b53e250750aa16b3152e436a290c905f9c703924 100644 --- a/src/app/root/login/login.component.spec.ts +++ b/src/app/root/login/login.component.spec.ts @@ -9,8 +9,8 @@ import { FaIconLibrary, FontAwesomeModule } from '@fortawesome/angular-fontaweso import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { FooterBarService } from '../../service/footer-bar/footer-bar.service'; import { HeaderLabelService } from '../../service/header-label/header-label.service'; diff --git a/src/app/root/nickname-chooser/member-group-select/member-group-select.component.spec.ts b/src/app/root/nickname-chooser/member-group-select/member-group-select.component.spec.ts index 8a8ab9f5022db7daf8ed030451ce85bf2c5a170b..d9896e885b96629dbb8a0c993c8b3f473b486222 100644 --- a/src/app/root/nickname-chooser/member-group-select/member-group-select.component.spec.ts +++ b/src/app/root/nickname-chooser/member-group-select/member-group-select.component.spec.ts @@ -4,8 +4,8 @@ import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { AttendeeMockService } from '../../../service/attendee/attendee.mock.service'; import { AttendeeService } from '../../../service/attendee/attendee.service'; import { ConnectionMockService } from '../../../service/connection/connection.mock.service'; diff --git a/src/app/root/nickname-chooser/nickname-input/nickname-input.component.spec.ts b/src/app/root/nickname-chooser/nickname-input/nickname-input.component.spec.ts index 725067b3d1c6722da79fb018c7cac9b6ae711288..e0a181013b536e2a4710db86fdd83cf45ff3bbc2 100644 --- a/src/app/root/nickname-chooser/nickname-input/nickname-input.component.spec.ts +++ b/src/app/root/nickname-chooser/nickname-input/nickname-input.component.spec.ts @@ -8,8 +8,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { AttendeeMockService } from '../../../service/attendee/attendee.mock.service'; import { AttendeeService } from '../../../service/attendee/attendee.service'; diff --git a/src/app/root/nickname-chooser/nickname-select/nickname-select.component.spec.ts b/src/app/root/nickname-chooser/nickname-select/nickname-select.component.spec.ts index 8f4bc82fb172b92d4ff3fdb20997d88ddab0aba8..bf222f037495fc363118e0730c34e855f68dafeb 100644 --- a/src/app/root/nickname-chooser/nickname-select/nickname-select.component.spec.ts +++ b/src/app/root/nickname-chooser/nickname-select/nickname-select.component.spec.ts @@ -10,8 +10,8 @@ import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { SimpleMQ } from 'ng2-simple-mq'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslatePipeMock } from '../../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../../lib/jwt.factory'; import { AttendeeMockService } from '../../../service/attendee/attendee.mock.service'; import { AttendeeService } from '../../../service/attendee/attendee.service'; diff --git a/src/app/root/root/root.component.spec.ts b/src/app/root/root/root.component.spec.ts index fdbd17b3a570bb52651fcf28ee1497f8d29ec2f8..7d2a6d8faae3fb93c443d7cceadc7cabede6cdc2 100644 --- a/src/app/root/root/root.component.spec.ts +++ b/src/app/root/root/root.component.spec.ts @@ -12,9 +12,9 @@ import { AngularSvgIconModule } from 'angular-svg-icon'; import { SimpleMQ } from 'ng2-simple-mq'; import { TOAST_CONFIG } from 'ngx-toastr'; import { of } from 'rxjs'; -import { SwUpdateMock } from '../../../_mocks/SwUpdateMock'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { SwUpdateMock } from '../../../_mocks/_services/SwUpdateMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { AdditionalDataComponent } from '../../footer/additional-data/additional-data.component'; import { FooterBarComponent } from '../../footer/footer-bar/footer-bar.component'; import { HeaderComponent } from '../../header/header/header.component'; diff --git a/src/app/root/theme-switcher/theme-switcher.component.spec.ts b/src/app/root/theme-switcher/theme-switcher.component.spec.ts index ca9e8c36539d34cc015fcaec73efff16172914c4..6d844821c1f7ddb7ebe89f499cb15183af0eafb2 100644 --- a/src/app/root/theme-switcher/theme-switcher.component.spec.ts +++ b/src/app/root/theme-switcher/theme-switcher.component.spec.ts @@ -5,8 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; import { ConnectionMockService } from '../../service/connection/connection.mock.service'; import { ConnectionService } from '../../service/connection/connection.service'; diff --git a/src/app/service/header-label/header-label.service.spec.ts b/src/app/service/header-label/header-label.service.spec.ts index e38c87097ce1d5660748b832877a208b352ec334..42c5679ea3b7eb19f7773159f8fef9ba8c91c342 100644 --- a/src/app/service/header-label/header-label.service.spec.ts +++ b/src/app/service/header-label/header-label.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, inject, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { HeaderLabelService } from './header-label.service'; describe('HeaderLabelService', () => { diff --git a/src/app/service/i18n/i18n.service.spec.ts b/src/app/service/i18n/i18n.service.spec.ts index a3bca0fd5e08f26785ce6fff77ee236791c644c5..94a118fec96755a4d5fa3bb5ee9c821cd8cc589c 100644 --- a/src/app/service/i18n/i18n.service.spec.ts +++ b/src/app/service/i18n/i18n.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { async, inject, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { StorageService } from '../storage/storage.service'; import { StorageServiceMock } from '../storage/storage.service.mock'; diff --git a/src/app/service/quiz/quiz.service.spec.ts b/src/app/service/quiz/quiz.service.spec.ts index 731ccf5fbd63bbeef05eefecf1f894d362952e9d..a025ef67508bfef8f25b3e8745508e890243dd05 100644 --- a/src/app/service/quiz/quiz.service.spec.ts +++ b/src/app/service/quiz/quiz.service.spec.ts @@ -6,7 +6,7 @@ import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; import { TranslateService } from '@ngx-translate/core'; import { RxStompService } from '@stomp/ng2-stompjs'; import { MarkdownService, MarkedOptions } from 'ngx-markdown'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { DefaultSettings } from '../../lib/default.settings'; import { SingleChoiceQuestionEntity } from '../../lib/entities/question/SingleChoiceQuestionEntity'; import { QuizEntity } from '../../lib/entities/QuizEntity'; diff --git a/src/app/service/themes/themes.service.spec.ts b/src/app/service/themes/themes.service.spec.ts index 9312fc09cb76e2bfc5ba2ab4421a4409e6825e6a..35bcac1ef028b4fa9bf54dbe86f6f10ab0925e9a 100644 --- a/src/app/service/themes/themes.service.spec.ts +++ b/src/app/service/themes/themes.service.spec.ts @@ -3,7 +3,7 @@ import { async, inject, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { DefaultSettings } from '../../lib/default.settings'; import { MessageProtocol, StatusProtocol } from '../../lib/enums/Message'; import { ConnectionMockService } from '../connection/connection.mock.service'; diff --git a/src/app/service/update-check/update-check.service.spec.ts b/src/app/service/update-check/update-check.service.spec.ts index 17901f776e0805b76954648845b13f90c37bbcc6..edfb2c50ac19678f6bb7a742347020693e5816fa 100644 --- a/src/app/service/update-check/update-check.service.spec.ts +++ b/src/app/service/update-check/update-check.service.spec.ts @@ -3,8 +3,8 @@ import { SwUpdate } from '@angular/service-worker'; import { TranslateService } from '@ngx-translate/core'; import { TOAST_CONFIG, ToastrService } from 'ngx-toastr'; import { of, Subject } from 'rxjs'; -import { SwUpdateMock } from '../../../_mocks/SwUpdateMock'; -import { TranslateServiceMock } from '../../../_mocks/TranslateServiceMock'; +import { SwUpdateMock } from '../../../_mocks/_services/SwUpdateMock'; +import { TranslateServiceMock } from '../../../_mocks/_services/TranslateServiceMock'; import { UpdateCheckService } from './update-check.service'; describe('UpdateCheckService', () => { diff --git a/src/app/service/user/user.service.spec.ts b/src/app/service/user/user.service.spec.ts index c6f16340b06018fb56924c3f6c97ce14efe54316..8c17f2cfe6d393168afd37359c8ac2ddef039d05 100644 --- a/src/app/service/user/user.service.spec.ts +++ b/src/app/service/user/user.service.spec.ts @@ -1,9 +1,12 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { PLATFORM_ID } from '@angular/core'; -import { async, inject, TestBed } from '@angular/core/testing'; +import { async, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { JWT_OPTIONS, JwtModule } from '@auth0/angular-jwt'; +import { JWT_OPTIONS, JwtHelperService, JwtModule } from '@auth0/angular-jwt'; +import { AuthorizeApiServiceMock } from '../../../_mocks/_services/AuthorizeApiServiceMock'; +import { UserRole } from '../../lib/enums/UserRole'; import { jwtOptionsFactory } from '../../lib/jwt.factory'; +import { AuthorizeApiService } from '../api/authorize/authorize-api.service'; import { QuizMockService } from '../quiz/quiz-mock.service'; import { QuizService } from '../quiz/quiz.service'; import { StorageService } from '../storage/storage.service'; @@ -29,12 +32,142 @@ describe('UserService', () => { }, UserService, { provide: QuizService, useClass: QuizMockService, + }, { + provide: AuthorizeApiService, + useClass: AuthorizeApiServiceMock, }, ], }); })); - it('should be created', async(inject([UserService], (service: UserService) => { + beforeEach(() => { + sessionStorage.clear(); + }); + + afterEach(() => { + sessionStorage.clear(); + }); + + it('should be created', () => { + const service = TestBed.get(UserService); expect(service).toBeTruthy(); - }))); + }); + + it('should set the username if a login token is provided', () => { + const service: UserService = TestBed.get(UserService); + const jwtHelper: JwtHelperService = TestBed.get(JwtHelperService); + spyOn(jwtHelper, 'decodeToken').and.callFake(() => ( + { name: 'test-name' } + )); + service['_staticLoginToken'] = 'test-token'; + + service.isLoggedIn = true; + expect(jwtHelper.decodeToken).toHaveBeenCalled(); + expect(service.username).toEqual('test-name'); + }); + + it('should logout a user', () => { + const service: UserService = TestBed.get(UserService); + const jwtHelper: JwtHelperService = TestBed.get(JwtHelperService); + spyOn(jwtHelper, 'decodeToken').and.callFake(() => ( + { name: 'test-name' } + )); + service['_staticLoginToken'] = 'test-token'; + service.isLoggedIn = true; + + service.logout(); + expect(service.isLoggedIn).toBe(false); + }); + + it('should succeed if a casTicket is provided', done => { + const service: UserService = TestBed.get(UserService); + const jwtHelper: JwtHelperService = TestBed.get(JwtHelperService); + spyOn(jwtHelper, 'decodeToken').and.callFake(() => ( + { name: 'test-name' } + )); + service['_staticLoginToken'] = 'test-token'; + + service.authenticateThroughCas('').then(succeeded => { + expect(succeeded).toBe(true); + expect(service.isLoggedIn).toBe(true); + expect(service.casTicket).toEqual('test-ticket'); + done(); + }); + }); + + it('should not succeed if no casTicket is provided', done => { + const service: UserService = TestBed.get(UserService); + + service.authenticateThroughCas('no-token').then(succeeded => { + expect(succeeded).toBe(false); + expect(service.isLoggedIn).toBe(false); + expect(service.casTicket).toEqual(null); + done(); + }); + }); + + it('should authenticate through the username:password login', done => { + const service: UserService = TestBed.get(UserService); + const jwtHelper: JwtHelperService = TestBed.get(JwtHelperService); + spyOn(jwtHelper, 'decodeToken').and.callFake(() => ( + { name: 'test-name' } + )); + + service.authenticateThroughLogin('test-name', 'test-pass').then(succeeded => { + expect(succeeded).toBe(true); + expect(service.isLoggedIn).toBe(true); + expect(service['_staticLoginToken']).toEqual('test-token'); + done(); + }); + }); + + it('should authenticate with a login token', done => { + const service: UserService = TestBed.get(UserService); + const jwtHelper: JwtHelperService = TestBed.get(JwtHelperService); + spyOn(jwtHelper, 'decodeToken').and.callFake(() => ( + { name: service.username } + )); + + service.authenticateThroughLoginToken('test-token-hash').then(succeeded => { + expect(succeeded).toBe(true); + expect(service.isLoggedIn).toBe(true); + expect(service['_staticLoginToken']).toEqual('test-token'); + expect(service.username).toEqual('test-token-user'); + done(); + }); + }); + + it('should hash a password', () => { + const service: UserService = TestBed.get(UserService); + expect(service.hashPassword('my-user', 'my-password')).toEqual('25f4044f7c85492260cbae4b7d66c1c9a2e50bce'); + }); + + it('should hash a token', () => { + const service: UserService = TestBed.get(UserService); + expect(service.hashToken('my-token')).toEqual('6578fca8b62f49457e4cd7e66554a310a1a64be8'); + }); + + it('should return true if a user is authorized for a role', () => { + const service: UserService = TestBed.get(UserService); + service['_staticLoginTokenContent'] = { + name: null, + passwordHash: null, + gitlabToken: null, + userAuthorizations: [UserRole.CreateQuiz], + }; + + expect(service.isAuthorizedFor(UserRole.CreateQuiz)).toEqual(true); + }); + + it('should return false if a user is not authorized for a role', () => { + const service: UserService = TestBed.get(UserService); + service['_staticLoginTokenContent'] = { + name: null, + passwordHash: null, + gitlabToken: null, + userAuthorizations: [UserRole.CreateQuiz], + }; + + expect(service.isAuthorizedFor(UserRole.CreateExpiredQuiz)).toEqual(false); + }); }); diff --git a/src/app/service/user/user.service.ts b/src/app/service/user/user.service.ts index f76d5dcdc8c68147360b2ae8767de01337657992..b9e26d1a4d2dfe0452aefab34f60ee371baee125 100644 --- a/src/app/service/user/user.service.ts +++ b/src/app/service/user/user.service.ts @@ -120,6 +120,7 @@ export class UserService { resolve(false); } } catch (e) { + console.error('UserService: Error while authenticating through CAS', e); resolve(false); } }); @@ -187,9 +188,7 @@ export class UserService { } public isAuthorizedFor(authorization: Array): boolean; - public isAuthorizedFor(authorization: UserRole): boolean; - public isAuthorizedFor(authorization: UserRole | Array): boolean { if (!this.staticLoginTokenContent) { return false; @@ -273,7 +272,9 @@ export class UserService { private tohex(i2: number): string { for (let h = '', s = 28; ; s -= 4) { - h += (i2 >>> s & 0xf).toString(16); + h += ( + i2 >>> s & 0xf + ).toString(16); if (!s) { return h; } @@ -295,7 +296,9 @@ export class UserService { wa.push(0); } wa.push(ml >>> 29); - wa.push((ml << 3) & M); + wa.push(( + ml << 3 + ) & M); for (let bo = 0; bo < wa.length; bo += 16) { for (i = 0; i < 16; i++) { W[i] = wa[bo + i]; @@ -305,16 +308,32 @@ export class UserService { } let A = H0, B = H1, C = H2, D = H3, E = H4; for (i = 0; i <= 19; i++) { - t = (this.rotl(A, 5) + (B & C | ~B & D) + E + W[i] + 0x5A827999) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; + t = ( + this.rotl(A, 5) + ( + B & C | ~B & D + ) + E + W[i] + 0x5A827999 + ) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; } for (i = 20; i <= 39; i++) { - t = (this.rotl(A, 5) + (B ^ C ^ D) + E + W[i] + 0x6ED9EBA1) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; + t = ( + this.rotl(A, 5) + ( + B ^ C ^ D + ) + E + W[i] + 0x6ED9EBA1 + ) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; } for (i = 40; i <= 59; i++) { - t = (this.rotl(A, 5) + (B & C | B & D | C & D) + E + W[i] + 0x8F1BBCDC) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; + t = ( + this.rotl(A, 5) + ( + B & C | B & D | C & D + ) + E + W[i] + 0x8F1BBCDC + ) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; } for (i = 60; i <= 79; i++) { - t = (this.rotl(A, 5) + (B ^ C ^ D) + E + W[i] + 0xCA62C1D6) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; + t = ( + this.rotl(A, 5) + ( + B ^ C ^ D + ) + E + W[i] + 0xCA62C1D6 + ) & M, E = D, D = C, C = this.rotl(B, 30), B = A, A = t; } H0 = H0 + A & M; H1 = H1 + B & M; diff --git a/src/app/shared/no-data-error/no-data-error.component.spec.ts b/src/app/shared/no-data-error/no-data-error.component.spec.ts index 6e2aeb4c466f7ab638bffaefe1316077c659130c..bf4636f0498569f841ea35511e2a7a8abd754d1b 100644 --- a/src/app/shared/no-data-error/no-data-error.component.spec.ts +++ b/src/app/shared/no-data-error/no-data-error.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { TranslatePipeMock } from '../../../_mocks/TranslatePipeMock'; +import { TranslatePipeMock } from '../../../_mocks/_pipes/TranslatePipeMock'; import { NoDataErrorComponent } from './no-data-error.component';