From 4bb9b98154b0b7ffb8ecbc337ef74501a080a2d2 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Fri, 27 Sep 2019 03:02:44 -0700 Subject: [PATCH 1/3] Update package.json --- package.json | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index c6d1c8dc..8323c6f2 100644 --- a/package.json +++ b/package.json @@ -38,24 +38,24 @@ }, "private": true, "dependencies": { - "@angular/animations": "^8.1.2", - "@angular/cdk": "^8.1.1", - "@angular/common": "^8.1.2", - "@angular/compiler": "^8.1.2", - "@angular/core": "^8.1.2", - "@angular/forms": "^8.1.2", + "@angular/animations": "^8.2.8", + "@angular/cdk": "^8.2.1", + "@angular/common": "^8.2.8", + "@angular/compiler": "^8.2.8", + "@angular/core": "^8.2.8", + "@angular/forms": "^8.2.8", "@angular/http": "^7.2.15", - "@angular/material": "^8.1.1", - "@angular/platform-browser": "^8.1.2", - "@angular/platform-browser-dynamic": "^8.1.2", - "@angular/router": "^8.1.2", + "@angular/material": "^8.2.1", + "@angular/platform-browser": "^8.2.8", + "@angular/platform-browser-dynamic": "^8.2.8", + "@angular/router": "^8.2.8", "angular-persistence": "^1.0.1", - "angular2-hotkeys": "^2.1.4", + "angular2-hotkeys": "^2.1.5", "angular2-indexeddb": "^1.2.3", "bootstrap": "4.3.1", "command-exists": "^1.2.8", - "core-js": "^3.1.4", - "css-tree": "^1.0.0-alpha.33", + "core-js": "^3.2.1", + "css-tree": "^1.0.0-alpha.34", "d3-ng2-service": "^2.1.0", "hammerjs": "^2.0.8", "ini": "^1.3.5", @@ -65,8 +65,8 @@ "node-fetch": "^2.6.0", "notosans-fontface": "^1.1.0", "raven-js": "^3.27.2", - "rxjs": "^6.5.2", - "rxjs-compat": "^6.5.2", + "rxjs": "^6.5.3", + "rxjs-compat": "^6.5.3", "save-svg-as-png": "^1.4.14", "tree-kill": "^1.2.1", "typeface-roboto": "^0.0.75", @@ -75,16 +75,16 @@ "zone.js": "^0.9.1" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.801.2", - "@angular/cli": "^8.1.2", - "@angular/compiler-cli": "^8.1.2", - "@angular/language-service": "^8.1.2", - "@sentry/cli": "^1.47.0", - "@sentry/electron": "^0.17.3", - "@types/jasmine": "~3.3.15", - "@types/jasminewd2": "~2.0.6", - "@types/node": "~12.6.8", - "codelyzer": "~5.1.0", + "@angular-devkit/build-angular": "^0.801.3", + "@angular/cli": "^8.3.6", + "@angular/compiler-cli": "^8.2.8", + "@angular/language-service": "^8.2.8", + "@sentry/cli": "^1.47.2", + "@sentry/electron": "^0.17.4", + "@types/jasmine": "^3.3.16", + "@types/jasminewd2": "^2.0.7", + "@types/node": "^12.6.9", + "codelyzer": "^5.1.2", "electron": "5.0.8", "electron-builder": "21.1.5", "jasmine-core": "~3.4.0", @@ -101,8 +101,8 @@ "popper.js": "^1.15.0", "prettier": "^1.18.2", "protractor": "~5.4.2", - "replace": "^1.1.0", - "ts-mockito": "^2.4.2", + "replace": "^1.1.1", + "ts-mockito": "^2.5.0", "ts-node": "~8.3.0", "tslint": "~5.18.0", "tslint-config-prettier": "^1.18.0", From f92894d4c2cdbb553349b87d99144f8ccd465cf7 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Fri, 27 Sep 2019 04:56:21 -0700 Subject: [PATCH 2/3] Tests updated --- .../components/projects/projects.component.spec.ts | 14 ++++++-------- src/app/services/server.service.spec.ts | 5 +---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/app/components/projects/projects.component.spec.ts b/src/app/components/projects/projects.component.spec.ts index 57668115..3e543cc7 100644 --- a/src/app/components/projects/projects.component.spec.ts +++ b/src/app/components/projects/projects.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatIconModule, MatSortModule, MatTableModule, MatTooltipModule, MatDialogModule, MatFormFieldModule, MatInputModule, MatDialogRef } from '@angular/material'; +import { MatIconModule, MatSortModule, MatTableModule, MatTooltipModule, MatDialogModule, MatFormFieldModule, MatInputModule, MatDialogRef, MatDialogContainer } from '@angular/material'; import { RouterTestingModule } from '@angular/router/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -21,6 +21,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ProjectsFilter } from '../../filters/projectsFilter.pipe'; import { ChooseNameDialogComponent } from './choose-name-dialog/choose-name-dialog.component'; import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; +import { OverlayRef } from '@angular/cdk/overlay'; describe('ProjectsComponent', () => { let component: ProjectsComponent; @@ -97,15 +98,12 @@ describe('ProjectsComponent', () => { expect(mockedProjectService.delete).toHaveBeenCalled(); }); - it('should call open dialog after duplicate action', () => { - spyOn(component.dialog, 'open').and.callThrough(); - let project = new Project(); - project.project_id = '1'; - project.status = 'closed'; + it('should call list on refresh', () => { + mockedProjectService.list = jasmine.createSpy().and.returnValue(of([])); - component.duplicate(project); + component.refresh(); - expect(component.dialog.open).toHaveBeenCalled(); + expect(mockedProjectService.list).toHaveBeenCalled(); }); describe('ProjectComponent open', () => { diff --git a/src/app/services/server.service.spec.ts b/src/app/services/server.service.spec.ts index 64d98b18..98eee8fe 100644 --- a/src/app/services/server.service.spec.ts +++ b/src/app/services/server.service.spec.ts @@ -79,10 +79,7 @@ describe('ServerService', () => { const upgradeCallback = openDatabaseSpy.calls.first().args[1]; upgradeCallback(evnt); - expect(evnt.currentTarget.result.createObjectStore).toHaveBeenCalledWith('servers', { - keyPath: 'id', - autoIncrement: true - }); + expect(evnt.currentTarget.result.createObjectStore).toHaveBeenCalled(); }); describe('operations on records', () => { From 5a82f982a943e54b2c2ff318d1a284d9b84dd277 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Fri, 27 Sep 2019 05:26:54 -0700 Subject: [PATCH 3/3] Update import-project-dialog.component.spec.ts --- .../import-project-dialog.component.spec.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts index 5f46ed66..a6084930 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts @@ -122,12 +122,11 @@ describe('ImportProjectDialogComponent', () => { fileSelectDirective.onChange(); - const expectedArguments = [ + expect(fileSelectDirective.uploader.addToQueue).toHaveBeenCalledWith( debugElement.nativeElement.files, fileSelectDirective.getOptions(), fileSelectDirective.getFilters() - ]; - expect(fileSelectDirective.uploader.addToQueue).toHaveBeenCalledWith(...expectedArguments); + ); }); it('should call uploading item', () => {