Merge pull request #15 from fabioformosa/#12_jest

#12 jest
This commit is contained in:
Fabio Formosa
2020-05-11 23:33:06 +02:00
committed by GitHub
9 changed files with 22 additions and 40 deletions

View File

@@ -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": {

View File

@@ -0,0 +1 @@
import 'jest-preset-angular';

View File

@@ -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": ["<rootDir>/jest.setup.ts"]
}
}

View File

@@ -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({

View File

@@ -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',

View File

@@ -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';

View File

@@ -1,21 +1,24 @@
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';
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;

View File

@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "",