Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0a55437743
@ -39,7 +39,8 @@ module.exports = function(config) {
|
||||
colors: true,
|
||||
logLevel: config.LOG_INFO,
|
||||
autoWatch: true,
|
||||
browsers: ['Chrome', 'ChromeHeadless'],
|
||||
// browsers: ['Chrome', 'ChromeHeadless'],
|
||||
browsers: ['ChromeHeadless'],
|
||||
customLaunchers: {
|
||||
ChromeHeadless: {
|
||||
base: 'Chrome',
|
||||
|
||||
17
frontend/package-lock.json
generated
17
frontend/package-lock.json
generated
@ -9524,6 +9524,23 @@
|
||||
"minimatch": "^3.0.4"
|
||||
}
|
||||
},
|
||||
"karma-htmlfile-reporter": {
|
||||
"version": "0.3.8",
|
||||
"resolved": "https://registry.npmjs.org/karma-htmlfile-reporter/-/karma-htmlfile-reporter-0.3.8.tgz",
|
||||
"integrity": "sha512-Hd4c/vqPXYjdNYXeDJRMMq2DMMxPxqOR+TPeiLz2qbqO0qCCQMeXwFGhNDFr+GsvYhcOyn7maTbWusUFchS/4A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"xmlbuilder": "^10.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"xmlbuilder": {
|
||||
"version": "10.1.1",
|
||||
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz",
|
||||
"integrity": "sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"karma-jasmine": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
|
||||
|
||||
@ -58,6 +58,7 @@
|
||||
"karma": "~4.4.1",
|
||||
"karma-chrome-launcher": "~3.1.0",
|
||||
"karma-coverage-istanbul-reporter": "~2.1.1",
|
||||
"karma-htmlfile-reporter": "0.3.8",
|
||||
"karma-jasmine": "~2.0.1",
|
||||
"karma-jasmine-html-reporter": "^1.5.4",
|
||||
"ngx-material-file-input": "^2.1.1",
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { DialogComponent } from './dialog.component';
|
||||
|
||||
describe('DialogComponent', () => {
|
||||
let component: DialogComponent;
|
||||
let fixture: ComponentFixture<DialogComponent>;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ DialogComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(DialogComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
5
frontend/src/app/component/smoke.spec.ts
Normal file
5
frontend/src/app/component/smoke.spec.ts
Normal file
@ -0,0 +1,5 @@
|
||||
describe('smoke', () => {
|
||||
it('should succeed', () => {
|
||||
expect(true).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -10,7 +10,7 @@
|
||||
},
|
||||
"files": [
|
||||
"src/test.ts",
|
||||
"polyfills.ts"
|
||||
"src/polyfills.ts"
|
||||
],
|
||||
"include": [
|
||||
"**/*.spec.ts",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user