chore: upgrade many dependencies and restructure tsconfigs (#757)

* chore: upgrade many dependencies and restructure tsconfigs

Summary:
- upgrade many dependencies
- remove dev dependencies from test-serializer and uhk-common
- created root tsconfig.json and test-serializer and uhk-common
  tsconfigs extends it
- fixed e2e test

* chore: upgrade more dependencies
This commit is contained in:
Róbert Kiss
2018-08-22 00:34:16 +02:00
committed by László Monda
parent b41f14192a
commit a7d3b62512
16 changed files with 10209 additions and 5004 deletions

View File

@@ -7,8 +7,8 @@ describe('web App', () => {
page = new WebPage();
});
it('should display welcome message', () => {
it('should display default device name', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to app!');
expect(page.getDeviceName()).toEqual('My UHK');
});
});

View File

@@ -5,7 +5,8 @@ export class WebPage {
return browser.get('/');
}
getParagraphText() {
return element(by.css('app-root h1')).getText();
getDeviceName() {
return element(by.css('body > main-app > side-menu > ul > li:nth-child(1) > div > auto-grow-input > input'))
.getAttribute('value');
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -36,8 +36,8 @@
"@types/electron-devtools-installer": "2.0.2",
"@types/electron-settings": "3.0.0",
"@types/file-saver": "0.0.1",
"@types/jasmine": "2.5.53",
"@types/jasminewd2": "2.0.2",
"@types/jasmine": "2.8.8",
"@types/jasminewd2": "2.0.3",
"@types/jquery": "3.2.9",
"@types/usb": "1.1.3",
"angular-confirmation-popover": "3.2.0",
@@ -50,15 +50,15 @@
"dragula": "3.7.2",
"font-awesome": "4.7.0",
"html-webpack-plugin": "^2.29.0",
"jasmine-core": "2.6.2",
"jasmine-spec-reporter": "4.1.0",
"jasmine-core": "3.2.1",
"jasmine-spec-reporter": "4.2.1",
"jquery": "3.2.1",
"jsonfile": "3.0.1",
"karma": "1.7.0",
"karma-chrome-launcher": "2.1.1",
"karma-coverage-istanbul-reporter": "1.2.1",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"karma": "3.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-coverage-istanbul-reporter": "2.0.1",
"karma-jasmine": "1.1.2",
"karma-jasmine-html-reporter": "1.3.1",
"ng2-dragula": "1.5.0",
"ng2-nouislider": "^1.7.7",
"ngx-clipboard": "10.0.0",
@@ -66,7 +66,7 @@
"ngrx-store-freeze": "0.1.9",
"nouislider": "^11.1.0",
"postcss-url": "^7.1.2",
"protractor": "5.1.2",
"protractor": "5.4.0",
"reselect": "3.0.1",
"rxjs": "5.5.8",
"typescript": "2.6.2",

View File

@@ -12,7 +12,7 @@ exports.config = {
'browserName': 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
baseUrl: 'http://localhost:8080/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,