From bf276d0073868c77a584d0cdc7eb87f2f3e69e93 Mon Sep 17 00:00:00 2001 From: "fabio.formosa" Date: Sun, 10 May 2020 13:38:26 +0200 Subject: [PATCH 1/2] #12 fixed test --- .../src/app/app.component.spec.ts | 17 +++-------------- .../app/views/signup/signup.component.spec.ts | 9 ++++++--- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/quartz-manager-frontend/src/app/app.component.spec.ts b/quartz-manager-frontend/src/app/app.component.spec.ts index e3809f7..608acc0 100644 --- a/quartz-manager-frontend/src/app/app.component.spec.ts +++ b/quartz-manager-frontend/src/app/app.component.spec.ts @@ -2,21 +2,12 @@ import { TestBed, async } from '@angular/core/testing'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { RouterTestingModule } from '@angular/router/testing'; import { AppComponent } from './app.component'; -import { ManagerComponent } from './views/manager'; -import { LoginComponent } from './views/login'; import { MockApiService } from './services/mocks/api.service.mock'; -import { LoginGuard } from './guards'; -import { NotFoundComponent } from './views/not-found'; -import { - FooterComponent, - GithubComponent, -} from './components'; +import { FooterComponent} from './components'; -import { - MatToolbarModule, - MatIconRegistry -} from '@angular/material'; +import {MatIconRegistry} from '@angular/material/icon'; +import {MatToolbarModule} from '@angular/material/toolbar'; import { @@ -26,8 +17,6 @@ import { ConfigService } from './services'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - describe('AppComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ diff --git a/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts b/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts index db38407..7fd156d 100644 --- a/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts +++ b/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts @@ -1,8 +1,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { - MatCardModule, MatInputModule, MatProgressSpinnerModule, MatProgressBarModule - } from '@angular/material'; + +import { MatCardModule} from '@angular/material/card'; +import { MatInputModule} from '@angular/material/input'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; + import { SignupComponent } from './signup.component'; import { ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; From 7687def758c55c124d53f83508433275ec1fd66c Mon Sep 17 00:00:00 2001 From: "fabio.formosa" Date: Mon, 11 May 2020 23:16:02 +0200 Subject: [PATCH 2/2] #12 added jest --- quartz-manager-frontend/angular.json | 17 ----------------- quartz-manager-frontend/jest.setup.ts | 1 + quartz-manager-frontend/package.json | 8 +++++++- .../src/{test.ts => _test.ts} | 0 .../src/app/services/api.service.ts | 2 +- .../change-password.component.ts | 2 +- .../app/views/signup/signup.component.spec.ts | 4 ++-- .../{src => }/tsconfig.spec.json | 2 +- 8 files changed, 13 insertions(+), 23 deletions(-) create mode 100644 quartz-manager-frontend/jest.setup.ts rename quartz-manager-frontend/src/{test.ts => _test.ts} (100%) rename quartz-manager-frontend/{src => }/tsconfig.spec.json (88%) diff --git a/quartz-manager-frontend/angular.json b/quartz-manager-frontend/angular.json index 563894f..ce967bd 100644 --- a/quartz-manager-frontend/angular.json +++ b/quartz-manager-frontend/angular.json @@ -69,23 +69,6 @@ "browserTarget": "angular-spring-starter:build" } }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "karmaConfig": "./karma.conf.js", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "scripts": [], - "styles": [ - "src/styles.css" - ], - "assets": [ - "src/assets", - "src/favicon.ico" - ] - } - }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { diff --git a/quartz-manager-frontend/jest.setup.ts b/quartz-manager-frontend/jest.setup.ts new file mode 100644 index 0000000..fa3402d --- /dev/null +++ b/quartz-manager-frontend/jest.setup.ts @@ -0,0 +1 @@ +import 'jest-preset-angular'; \ No newline at end of file diff --git a/quartz-manager-frontend/package.json b/quartz-manager-frontend/package.json index d442d69..8e7cf69 100644 --- a/quartz-manager-frontend/package.json +++ b/quartz-manager-frontend/package.json @@ -6,7 +6,7 @@ "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json", "build": "ng build", - "test": "ng test", + "test": "jest", "lint": "ng lint", "e2e": "ng e2e" }, @@ -50,6 +50,8 @@ "codelyzer": "^5.1.2", "jasmine-core": "2.6.4", "jasmine-spec-reporter": "4.1.1", + "jest": "^26.0.1", + "jest-preset-angular": "^8.2.0", "karma": "1.7.1", "karma-chrome-launcher": "2.1.1", "karma-cli": "1.0.1", @@ -60,5 +62,9 @@ "ts-node": "3.0.6", "tslint": "5.7.0", "typescript": "3.8.3" + }, + "jest": { + "preset": "jest-preset-angular", + "setupFilesAfterEnv": ["/jest.setup.ts"] } } diff --git a/quartz-manager-frontend/src/test.ts b/quartz-manager-frontend/src/_test.ts similarity index 100% rename from quartz-manager-frontend/src/test.ts rename to quartz-manager-frontend/src/_test.ts diff --git a/quartz-manager-frontend/src/app/services/api.service.ts b/quartz-manager-frontend/src/app/services/api.service.ts index bf84c6f..d4feb83 100644 --- a/quartz-manager-frontend/src/app/services/api.service.ts +++ b/quartz-manager-frontend/src/app/services/api.service.ts @@ -2,7 +2,7 @@ import { HttpClient, HttpHeaders, HttpResponse, HttpRequest, HttpEventType, Http import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { catchError, map, filter, tap } from 'rxjs/operators' -import { serialize } from 'app/shared/utilities/serialize'; +import { serialize } from '../shared/utilities/serialize'; export enum RequestMethod { Get = 'GET', diff --git a/quartz-manager-frontend/src/app/views/change-password/change-password.component.ts b/quartz-manager-frontend/src/app/views/change-password/change-password.component.ts index 3514b2a..36b13c3 100644 --- a/quartz-manager-frontend/src/app/views/change-password/change-password.component.ts +++ b/quartz-manager-frontend/src/app/views/change-password/change-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { AuthService } from 'app/services'; +import { AuthService } from '../../services'; import { Router } from '@angular/router'; import { DisplayMessage } from '../../shared/models/display-message'; import { delay, mergeMap } from 'rxjs/operators'; diff --git a/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts b/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts index 7fd156d..4c0da8f 100644 --- a/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts +++ b/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts @@ -12,13 +12,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { MockUserService, MockApiService - } from 'app/services/mocks'; + } from '../../services/mocks'; import { UserService, AuthService, ApiService, ConfigService - } from 'app/services'; + } from '../../services'; describe('SignupComponent', () => { let component: SignupComponent; diff --git a/quartz-manager-frontend/src/tsconfig.spec.json b/quartz-manager-frontend/tsconfig.spec.json similarity index 88% rename from quartz-manager-frontend/src/tsconfig.spec.json rename to quartz-manager-frontend/tsconfig.spec.json index 9c56a51..a9b5332 100644 --- a/quartz-manager-frontend/src/tsconfig.spec.json +++ b/quartz-manager-frontend/tsconfig.spec.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/spec", "baseUrl": "",