Fix tests and lock typescript

This commit is contained in:
ziajka 2018-04-11 09:11:18 +02:00
parent 21e9932cbc
commit 0a754a70e5
3 changed files with 16 additions and 46 deletions

View File

@ -80,7 +80,7 @@
"ts-mockito": "^2.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "^2.8.1"
"typescript": ">=2.4.2 <2.7.0"
},
"greenkeeper": {
"ignore": [

View File

@ -49,7 +49,7 @@ describe('SelectionTool', () => {
it('path should be visible and have parameters', () => {
expect(path_selection.attr('visibility')).toEqual('visible');
expect(path_selection.attr('d')).toEqual('M95,86 l0,0 l0,0 l0,0z');
expect(path_selection.attr('d')).toEqual('M92,100 l0,0 l0,0 l0,0z');
});
});
@ -60,7 +60,7 @@ describe('SelectionTool', () => {
});
it('path should have got changed parameters', () => {
expect(path_selection.attr('d')).toEqual('M95,86 l200,0 l0,200 l-200,0z');
expect(path_selection.attr('d')).toEqual('M92,100 l200,0 l0,200 l-200,0z');
});
});
@ -76,7 +76,7 @@ describe('SelectionTool', () => {
});
it('rectangle should be selected', () => {
expect(selected_rectangle).toEqual(new Rectangle(95, 86, 100, 100));
expect(selected_rectangle).toEqual(new Rectangle(92, 100, 100, 100));
});
describe('SelectionTool can deselect after click outside', () => {
@ -86,7 +86,7 @@ describe('SelectionTool', () => {
});
it('rectangle should be selected', () => {
expect(selected_rectangle).toEqual(new Rectangle(295, 286, 0, 0));
expect(selected_rectangle).toEqual(new Rectangle(292, 300, 0, 0));
});
});
});
@ -99,7 +99,7 @@ describe('SelectionTool', () => {
});
it('rectangle should be selected', () => {
expect(selected_rectangle).toEqual(new Rectangle(95, 86, 100, 100));
expect(selected_rectangle).toEqual(new Rectangle(92, 100, 100, 100));
});
});
@ -122,7 +122,7 @@ describe('SelectionTool', () => {
});
it('path should have d adjusted for transformation', () => {
expect(path_selection.attr('d')).toEqual('M-5,-14 l0,0 l0,0 l0,0z');
expect(path_selection.attr('d')).toEqual('M-8,0 l0,0 l0,0 l0,0z');
});
});
});

View File

@ -607,14 +607,14 @@ ansi-html@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
ansi-regex@*, ansi-regex@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
ansi-regex@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
ansi-regex@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@ -2566,7 +2566,7 @@ debug@~2.2.0:
dependencies:
ms "0.7.1"
debuglog@*, debuglog@^1.0.1:
debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@ -4434,7 +4434,7 @@ import-local@^1.0.0:
pkg-dir "^2.0.0"
resolve-cwd "^2.0.0"
imurmurhash@*, imurmurhash@^0.1.4:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@ -5360,10 +5360,6 @@ lockfile@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.3.tgz#2638fc39a0331e9cac1a04b71799931c9c50df79"
lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
lodash._baseuniq@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@ -5371,28 +5367,10 @@ lodash._baseuniq@~4.6.0:
lodash._createset "~4.0.0"
lodash._root "~3.0.0"
lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
dependencies:
lodash._getnative "^3.0.0"
lodash._createset@~4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
lodash._root@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@ -5421,10 +5399,6 @@ lodash.mergewith@^4.3.1, lodash.mergewith@^4.6.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
lodash.tail@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@ -7302,7 +7276,7 @@ readable-stream@~2.1.5:
string_decoder "~0.10.x"
util-deprecate "~1.0.1"
readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
readdir-scoped-modules@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
dependencies:
@ -8970,11 +8944,7 @@ typeface-roboto@^0.0.54:
version "0.0.54"
resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz#8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2"
typescript@^2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
typescript@~2.6.2:
"typescript@>=2.4.2 <2.7.0", typescript@~2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
@ -9261,7 +9231,7 @@ uws@~9.14.0:
version "9.14.0"
resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
validate-npm-package-license@*, validate-npm-package-license@^3.0.1:
validate-npm-package-license@^3.0.1:
version "3.0.3"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
dependencies: