Merge pull request #50 from sartography/dev

Dev --> Testing
This commit is contained in:
Aaron Louie 2020-07-31 17:32:29 -04:00 committed by GitHub
commit a36c7db748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions

11
package-lock.json generated
View File

@ -8493,6 +8493,11 @@
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
"dev": true
},
"lodash.isequal": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
},
"lodash.memoize": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@ -12045,9 +12050,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"sartography-workflow-lib": {
"version": "0.0.308",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.308.tgz",
"integrity": "sha512-shHGyjMzdMEnCisgEQSluy3q3M/4tGph7llojP3ZYc0ZqzB/3681Ut4Hnpbhy2KZ0SdNfH/DYkz7/Fngi7vZsQ=="
"version": "0.0.342",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.342.tgz",
"integrity": "sha512-cNW0INFMuN7lFwn69mjWiY9xvv+mIMLpyUzNYt7ZYifPIPLCdt4MU28wZxYvWfTjWC6kY+c+8hovgY56NFpwyg=="
},
"sass": {
"version": "1.26.3",

View File

@ -47,11 +47,12 @@
"dmn-js-properties-panel": "^0.3.5",
"dmn-moddle": "^6.0.0",
"file-saver": "^2.0.2",
"lodash.isequal": "^4.5.0",
"ngx-device-detector": "^1.4.5",
"ngx-file-drop": "^8.0.8",
"ngx-markdown": "^9.1.1",
"rxjs": "~6.5.4",
"sartography-workflow-lib": "0.0.308",
"sartography-workflow-lib": "0.0.342",
"tslib": "^1.13.0",
"uuid": "^7.0.2",
"zone.js": "^0.10.3"

View File

@ -5,7 +5,7 @@ import {MatIconModule} from '@angular/material/icon';
import {MatMenuModule} from '@angular/material/menu';
import {Router} from '@angular/router';
import {RouterTestingModule} from '@angular/router/testing';
import {ApiService, MockEnvironment, mockUser} from 'sartography-workflow-lib';
import {ApiService, MockEnvironment, mockUser0} from 'sartography-workflow-lib';
import { NavbarComponent } from './navbar.component';
@ -48,8 +48,8 @@ describe('NavbarComponent', () => {
const uReq = httpMock.expectOne('apiRoot/user');
expect(uReq.request.method).toEqual('GET');
uReq.flush(mockUser);
expect(component.user).toEqual(mockUser);
uReq.flush(mockUser0);
expect(component.user).toEqual(mockUser0);
});
it('should create', () => {