From ea8c6c0fcb5ce49a44dacf16949a45c1bf0df203 Mon Sep 17 00:00:00 2001 From: andreiklimenok Date: Wed, 5 Dec 2018 15:19:20 +0100 Subject: [PATCH 1/5] upgrade cypress version --- package-lock.json | 237 ++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 116 insertions(+), 123 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab912b2775..23ae19c216 100644 --- a/package-lock.json +++ b/package-lock.json @@ -200,7 +200,7 @@ "@cypress/xvfb": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.3.tgz", - "integrity": "sha512-yYrK+/bgL3hwoRHMZG4r5fyLniCy1pXex5fimtewAY6vE/jsVs8Q37UsEO03tFlcmiLnQ3rBNMaZBYTi/+C1cw==", + "integrity": "sha1-Yxmv3Nz/fRUF2u6qhEhNBZYYmGA=", "dev": true, "requires": { "debug": "^3.1.0", @@ -210,7 +210,7 @@ "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { "ms": "^2.1.1" @@ -219,7 +219,7 @@ "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", "dev": true } } @@ -4315,25 +4315,25 @@ "@types/blob-util": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/@types/blob-util/-/blob-util-1.3.3.tgz", - "integrity": "sha512-4ahcL/QDnpjWA2Qs16ZMQif7HjGP2cw3AGjHabybjw7Vm1EKu+cfQN1D78BaZbS1WJNa1opSMF5HNMztx7lR0w==", + "integrity": "sha1-rbpkSuNPiOHdmlhkxmrWUcqvYoo=", "dev": true }, "@types/bluebird": { "version": "3.5.18", "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.18.tgz", - "integrity": "sha512-OTPWHmsyW18BhrnG5x8F7PzeZ2nFxmHGb42bZn79P9hl+GI5cMzyPgQTwNjbem0lJhoru/8vtjAFCUOu3+gE2w==", + "integrity": "sha1-amBDXUZj4pDzcJiYpPdQFPJ5xNY=", "dev": true }, "@types/chai": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.8.tgz", - "integrity": "sha512-m812CONwdZn/dMzkIJEY0yAs4apyTkTORgfB2UsMOxgkUbC205AHnm4T8I0I5gPg9MHrFc1dJ35iS75c0CJkjg==", + "integrity": "sha1-0nYA6bovNx4IaV2QoP4ECNice+c=", "dev": true }, "@types/chai-jquery": { "version": "1.1.35", "resolved": "https://registry.npmjs.org/@types/chai-jquery/-/chai-jquery-1.1.35.tgz", - "integrity": "sha512-7aIt9QMRdxuagLLI48dPz96YJdhu64p6FCa6n4qkGN5DQLHnrIjZpD9bXCvV2G0NwgZ1FAmfP214dxc5zNCfgQ==", + "integrity": "sha1-mo8KOewIUbJ2io+MdkFYwqJWjQQ=", "dev": true, "requires": { "@types/chai": "*", @@ -4343,25 +4343,25 @@ "@types/jquery": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.6.tgz", - "integrity": "sha512-403D4wN95Mtzt2EoQHARf5oe/jEPhzBOBNrunk+ydQGW8WmkQ/E8rViRAEB1qEt/vssfGfNVD6ujP4FVeegrLg==", + "integrity": "sha1-WTLq2SYwfKIeWzaAglf3ySawZWU=", "dev": true }, "@types/lodash": { "version": "4.14.87", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.87.tgz", - "integrity": "sha512-AqRC+aEF4N0LuNHtcjKtvF9OTfqZI0iaBoe3dA6m/W+/YZJBZjBmW/QIZ8fBeXC6cnytSY9tBoFBqZ9uSCeVsw==", + "integrity": "sha1-Vfkhg7BIwsZEAq/kcvgzP04xmms=", "dev": true }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "integrity": "sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0=", "dev": true }, "@types/mocha": { "version": "2.2.44", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.44.tgz", - "integrity": "sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw==", + "integrity": "sha1-HUp5jlPzUhL9WtTQQFBiAXHNW14=", "dev": true }, "@types/node": { @@ -4372,13 +4372,13 @@ "@types/sinon": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-4.0.0.tgz", - "integrity": "sha512-cuK4xM8Lg2wd8cxshcQa8RG4IK/xfyB6TNE6tNVvkrShR4xdrYgsV04q6Dp6v1Lp6biEFdzD8k8zg/ujQeiw+A==", + "integrity": "sha1-mpP/pO4TKehRZieKXtmfgdxMg2I=", "dev": true }, "@types/sinon-chai": { "version": "2.7.29", "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-2.7.29.tgz", - "integrity": "sha512-EkI/ZvJT4hglWo7Ipf9SX+J+R9htNOMjW8xiOhce7+0csqvgoF5IXqY5Ae1GqRgNtWCuaywR5HjVa1snkTqpOw==", + "integrity": "sha1-TbAUl+LdGQiyvTDReC9FY1P19yM=", "dev": true, "requires": { "@types/chai": "*", @@ -8042,7 +8042,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "kind-of": { @@ -9216,7 +9216,7 @@ "cachedir": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-1.3.0.tgz", - "integrity": "sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==", + "integrity": "sha1-XgGSi/LZW17dlLCUIYgkZ0Dg28Q=", "dev": true, "requires": { "os-homedir": "^1.0.1" @@ -9861,7 +9861,7 @@ "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=", "dev": true, "requires": { "color-name": "1.1.3" @@ -9941,12 +9941,6 @@ "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", "dev": true }, - "compare-versions": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz", - "integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==", - "dev": true - }, "component-emitter": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", @@ -12271,9 +12265,9 @@ } }, "cypress": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.1.2.tgz", - "integrity": "sha512-anII950IRqmpQcxlo9te3vTcrl4keuGJaWlBQ5hbAb77D2YrcDv7Iux1FvX1vy/ZzzTdMaiiOts5sa8h63iP0g==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.1.3.tgz", + "integrity": "sha512-ZusTQffKBVrLDvcxEinymTH0iCUL7hM1m6q9X+557wDtpd6S4et330QQE1IW10Pnyp+vYIHpkWxDm43B9G14nA==", "dev": true, "requires": { "@cypress/listr-verbose-renderer": "0.4.1", @@ -12294,7 +12288,6 @@ "check-more-types": "2.24.0", "commander": "2.11.0", "common-tags": "1.4.0", - "compare-versions": "3.4.0", "debug": "3.1.0", "execa": "0.10.0", "executable": "4.1.1", @@ -12380,7 +12373,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=", "dev": true }, "concat-stream": { @@ -12397,7 +12390,7 @@ "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", "dev": true, "requires": { "nice-try": "^1.0.4", @@ -12410,7 +12403,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -12419,7 +12412,7 @@ "execa": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", - "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", + "integrity": "sha1-/0Vqj1P5D47MxxqW0Rvfx/CCy1A=", "dev": true, "requires": { "cross-spawn": "^6.0.0", @@ -12564,7 +12557,7 @@ "request": { "version": "2.87.0", "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", + "integrity": "sha1-MvACNc0I1IK00NaNuTqCnA7VdW4=", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -12592,7 +12585,7 @@ "supports-color": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", - "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "integrity": "sha1-BYoCHRthn33fOYDXEuo1kM5949U=", "dev": true, "requires": { "has-flag": "^2.0.0" @@ -12673,18 +12666,18 @@ "abab": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz", - "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==", + "integrity": "sha1-q6CrTF7uLUx500h9hUUPsjduuw8=", "dev": true }, "whatwg-url": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz", - "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==", + "integrity": "sha1-/ekm+lSlmfOt+C3/Jan3vgLcbt0=", "dev": true, "requires": { - "lodash.sortby": "4.7.0", - "tr46": "1.0.1", - "webidl-conversions": "4.0.2" + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" } } } @@ -12692,7 +12685,7 @@ "date-fns": { "version": "1.29.0", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz", - "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==", + "integrity": "sha1-EuYJzcuTUScxHQTTMzTilgoqVOY=", "dev": true }, "date-now": { @@ -16748,7 +16741,7 @@ "executable": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", - "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", + "integrity": "sha1-QVMr/zYdPlevTXY7cFgtsY9dEzw=", "dev": true, "requires": { "pify": "^2.2.0" @@ -18293,7 +18286,7 @@ "getos": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/getos/-/getos-3.1.0.tgz", - "integrity": "sha512-i9vrxtDu5DlLVFcrbqUqGWYlZN/zZ4pGMICCAcZoYsX3JA54nYp8r5EThw5K+m2q3wszkx4Th746JstspB0H4Q==", + "integrity": "sha1-2zqk3xWjKVVXzl6Bqp4+XN+qZWc=", "dev": true, "requires": { "async": "2.4.0" @@ -19519,11 +19512,11 @@ "uglify-js": { "version": "3.4.9", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=", "dev": true, "requires": { - "commander": "2.17.1", - "source-map": "0.6.1" + "commander": "~2.17.1", + "source-map": "~0.6.1" } } } @@ -21721,7 +21714,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -21736,9 +21729,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "chalk": { @@ -21767,7 +21760,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -21776,7 +21769,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "has-flag": { @@ -21797,7 +21790,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "micromatch": { @@ -21806,19 +21799,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "supports-color": { @@ -22004,7 +21997,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -22019,9 +22012,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "expand-brackets": { @@ -22030,7 +22023,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -22039,7 +22032,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-extglob": { @@ -22054,7 +22047,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "micromatch": { @@ -22063,19 +22056,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } } } @@ -22825,7 +22818,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -22837,13 +22830,13 @@ "babel-plugin-istanbul": { "version": "4.1.6", "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz", - "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==", + "integrity": "sha1-NsWbIZLvzoHFs3gyG3QXWt0cmkU=", "dev": true, "requires": { - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "find-up": "2.1.0", - "istanbul-lib-instrument": "1.10.2", - "test-exclude": "4.2.3" + "babel-plugin-syntax-object-rest-spread": "^6.13.0", + "find-up": "^2.1.0", + "istanbul-lib-instrument": "^1.10.1", + "test-exclude": "^4.2.1" } }, "braces": { @@ -22852,9 +22845,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "camelcase": { @@ -22877,12 +22870,12 @@ "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "color-convert": { @@ -22900,7 +22893,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -22909,7 +22902,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "has-flag": { @@ -22930,7 +22923,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "micromatch": { @@ -22939,19 +22932,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "strip-ansi": { @@ -22960,7 +22953,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -22998,7 +22991,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -23845,7 +23838,7 @@ "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "integrity": "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=", "dev": true, "requires": { "chalk": "^2.0.1" @@ -25191,7 +25184,7 @@ "p-map": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", + "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=", "dev": true }, "p-try": { @@ -27666,13 +27659,13 @@ "is-number": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=", "dev": true }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true } } @@ -29138,7 +29131,7 @@ "rxjs": { "version": "5.5.12", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz", - "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==", + "integrity": "sha1-b6YbinfD15PbrycL7i9D9lLXQcw=", "dev": true, "requires": { "symbol-observable": "1.0.1" @@ -29764,9 +29757,9 @@ "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "has-flag": { @@ -29777,7 +29770,7 @@ "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=" }, "supports-color": { "version": "5.5.0", diff --git a/package.json b/package.json index b0708592c9..6c70866893 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "cpx": "=1.5.0", "css-hot-loader": "=1.3.1", "css-loader": "0.28.7", - "cypress": "3.1.2", + "cypress": "3.1.3", "del-cli": "1.1.0", "electron": "1.8.8", "electron-builder": "19.32.2", From e03d215fe6c7c9592cdea75840bac9a289052951 Mon Sep 17 00:00:00 2001 From: andreiklimenok Date: Wed, 5 Dec 2018 15:20:03 +0100 Subject: [PATCH 2/5] :white_check_mark: migrate wallet integration tests --- src/components/request/confirmRequest.js | 4 +- src/components/request/index.js | 4 +- src/components/resultBox/resultBox.js | 2 +- test/constants/selectors.js | 10 ++++ test/cypress/e2e/activity.spec.js | 27 ++++++++-- test/cypress/e2e/transfer.spec.js | 66 ++++++++++++++++++++++++ test/integration/wallet.test.js | 1 + 7 files changed, 106 insertions(+), 8 deletions(-) diff --git a/src/components/request/confirmRequest.js b/src/components/request/confirmRequest.js index 768efe86ac..61267b1692 100644 --- a/src/components/request/confirmRequest.js +++ b/src/components/request/confirmRequest.js @@ -57,7 +57,7 @@ class ConfirmRequest extends React.Component { - {t('Send request via E-mail')} @@ -75,7 +75,7 @@ class ConfirmRequest extends React.Component { finalCallback()} - className='finish-button' + className='okay-button' />
diff --git a/src/components/request/index.js b/src/components/request/index.js index 246bbf1ecc..5255df69c3 100644 --- a/src/components/request/index.js +++ b/src/components/request/index.js @@ -22,13 +22,13 @@ class Request extends React.Component {
-
+
- {t('Send request via E-mail')} diff --git a/src/components/resultBox/resultBox.js b/src/components/resultBox/resultBox.js index 3f70eb0f7c..a6c4da8715 100644 --- a/src/components/resultBox/resultBox.js +++ b/src/components/resultBox/resultBox.js @@ -47,7 +47,7 @@ class ResultBox extends React.Component {
{this.props.success && this.props.recipientId && this.isNotYetFollowed(this.props.recipientId) ? -
this.props.goToTransationPage()} > diff --git a/src/components/receive/receiveConfirmation.test.js b/src/components/receive/receiveConfirmation.test.js index ae3b3043fc..3a486d782b 100644 --- a/src/components/receive/receiveConfirmation.test.js +++ b/src/components/receive/receiveConfirmation.test.js @@ -108,7 +108,7 @@ describe('ReceiveConfirmation', () => { wrapper.update(); wrapper.find('.amount input').simulate('change', { target: { value: '1' } }); wrapper.update(); - wrapper.find('.next').at(0).simulate('click'); + wrapper.find('.okay-button').at(0).simulate('click'); wrapper.update(); expect(props.goToTransationPage).to.have.been.calledWith(); }); diff --git a/src/components/receive/receiveDescription.js b/src/components/receive/receiveDescription.js index 4feb22c157..98962689b3 100644 --- a/src/components/receive/receiveDescription.js +++ b/src/components/receive/receiveDescription.js @@ -32,7 +32,9 @@ const ReceiveDescription = (props) => {

{props.t('This is your Lisk ID shown as a QR code. You can scan it with our Lisk Mobileapp available on Google Play & the AppStore or any QR code reader.')}

- + {props.t('Send request via E-mail')} @@ -50,7 +52,7 @@ const ReceiveDescription = (props) => {
props.nextStep({ address: props.address, status: 'foward' })} > {props.t('Request specific amount')} diff --git a/src/components/receive/receiveDescription.test.js b/src/components/receive/receiveDescription.test.js index 870192f2f0..04dd00ab57 100644 --- a/src/components/receive/receiveDescription.test.js +++ b/src/components/receive/receiveDescription.test.js @@ -56,7 +56,7 @@ describe('ReceiveDescription', () => { }); it('callde the next function', () => { - wrapper.find('.next').at(0).simulate('click'); + wrapper.find('.specify-request').at(0).simulate('click'); wrapper.update(); expect(props.nextStep).to.have.been.calledWith(); }); diff --git a/src/components/receive/receiveHowItWorks.js b/src/components/receive/receiveHowItWorks.js index 051cae50f5..9d03a38c37 100644 --- a/src/components/receive/receiveHowItWorks.js +++ b/src/components/receive/receiveHowItWorks.js @@ -25,7 +25,7 @@ class ReceiveHowItWorks extends React.Component {
- this.disableAndContinue()} > + this.disableAndContinue()} > {this.props.t('Okay')}
diff --git a/src/components/receive/receiveHowItWorks.test.js b/src/components/receive/receiveHowItWorks.test.js index 0aeb35a56c..0a0894a42f 100644 --- a/src/components/receive/receiveHowItWorks.test.js +++ b/src/components/receive/receiveHowItWorks.test.js @@ -65,7 +65,7 @@ describe('ReceiveHowItWorks', () => { }, }); - wrapper.find('.closeIcon').simulate('click'); + wrapper.find('.okay-button').simulate('click'); wrapper.update(); expect(props.nextStep).to.have.been.calledWith(); }); diff --git a/test/constants/selectors.js b/test/constants/selectors.js index 712353ae04..4f6d38eb17 100644 --- a/test/constants/selectors.js +++ b/test/constants/selectors.js @@ -8,13 +8,10 @@ const ss = { seeAllTxsBtn: '.seeAllLink', txDetailsBackButton: '.transaction-details-back-button', recipientInput: '.recipient input', - transferSendTab: '.send-tab', - transferRequestTab: '.request-tab', requestSpecificAmountBtn: '.specify-request', - confirmRequestBtn: '.confirm-request', - qrCode: '.qr-code', + requestLink: '.request-link', emailLink: '.email-link', - confirmRequestBlock: '.confirm-request-step', + backButton: '.back', accountInfoTab: '.account-info', delegateStatisticsTab: '.delegate-statistics ', votedAddress: '.votes .voter-address', @@ -137,8 +134,8 @@ const ss = { followedAccountTitle: '.account-title input', takeTutorial: '.help-onboarding', tutorialTooltip: '.joyride-tooltip__header', - tansactionReceiveButton: '.tx-receive-bt', - tansactionSendButton: '.tx-send-bt', + transactionRequestButton: '.tx-receive-bt', + transactionSendButton: '.tx-send-bt', }; export default ss; diff --git a/test/constants/urls.js b/test/constants/urls.js index 84590a6fca..e31454f195 100644 --- a/test/constants/urls.js +++ b/test/constants/urls.js @@ -2,6 +2,7 @@ const urls = { dashboard: '/dashboard', wallet: '/wallet', send: '/wallet/send', + request: '/wallet/request', help: '/help', settings: '/setting', accounts: '/explorer/accounts', diff --git a/test/cypress/e2e/activity.spec.js b/test/cypress/e2e/activity.spec.js index 77273afc3c..01dbc2dc4f 100644 --- a/test/cypress/e2e/activity.spec.js +++ b/test/cypress/e2e/activity.spec.js @@ -181,7 +181,7 @@ describe('Latest activity', () => { cy.visit(urls.dashboard); cy.get(ss.seeAllTxsBtn).click(); cy.url().should('contain', `${urls.wallet}`); - cy.get(ss.recipientInput); + cy.get(ss.transactionRequestButton); }); }); diff --git a/test/cypress/e2e/request.spec.js b/test/cypress/e2e/request.spec.js new file mode 100644 index 0000000000..827f748630 --- /dev/null +++ b/test/cypress/e2e/request.spec.js @@ -0,0 +1,52 @@ +import accounts from '../../constants/accounts'; +import networks from '../../constants/networks'; +import urls from '../../constants/urls'; +import ss from '../../constants/selectors'; + +describe('Request', () => { + const randomAmount = Math.floor((Math.random() * 10) + 1); + const randomReference = Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 5); + /** + * Request transfer in simple mode + * @expect mail link contains correct message + * @expect address link contains correct address + */ + it('Request LSK', () => { + cy.autologin(accounts.genesis.passphrase, networks.devnet.node); + cy.visit(urls.wallet); + cy.get(ss.transactionRequestButton).click(); + cy.get(ss.requestLink).contains(accounts.genesis.address); + cy.get(ss.emailLink).should('have.prop', 'href').and('include', `mailto:?subject=Requesting%20LSK%20to%20${accounts.genesis.address}&body=Hey%20there,%20%20%20%20here%20is%20a%20link%20you%20can%20use%20to%20send%20me%20LSK%20via%20your%20wallet:%20lisk%3A%2F%2Fwallet%2Fsend%3Frecipient%3D${accounts.genesis.address}`); + }); + + /** + * Request specific amount + * @expect protocol link contains correct parameters + * @expect email link contains correct message + * @expect okay button leads to send tab + * @expect how to use it msg appears only first time + */ + it('Request specific amount', () => { + cy.autologin(accounts.genesis.passphrase, networks.devnet.node); + cy.visit(urls.wallet); + cy.get(ss.transactionRequestButton).click(); + cy.get(ss.requestSpecificAmountBtn).click(); + // Check there is 'How is works' screen + cy.get(ss.okayBtn).click(); + // Enter amount and reference + cy.get(ss.amountInput).type(randomAmount); + cy.get(ss.referenceInput).type(randomReference); + // Check links + cy.get(ss.requestLink).contains(`lisk://wallet/send?recipient=${accounts.genesis.address}&amount=${randomAmount}&reference=${randomReference}`); + // TODO unskip when 1550 is fixed + // cy.get(ss.emailLink).should('have.prop', 'href') + // .and('include', `mailto:?subject=Requesting%20LSK%20to%20${accounts.genesis.address} + // &body=Hey%20there,%20%20%20%20%20%20here%20is%20a%20link%20you%20can%20use%20to%20send + // %20me%20LSK%20via%20your%20wallet:%20lisk%3A%2F%2Fwallet%2Fsend%3Frecipient%3D$ + // {accounts.genesis.address}%26amount%3D${randomAmount}%26reference%3D${randomReference}`); + cy.get(ss.okayBtn).click(); + cy.get(ss.transactionRequestButton).click(); + // Check there is no 'How it works' screen anymore + cy.get(ss.emailLink); + }); +}); diff --git a/test/cypress/e2e/transfer.spec.js b/test/cypress/e2e/transfer.spec.js index e5fb9d1352..a39077000a 100644 --- a/test/cypress/e2e/transfer.spec.js +++ b/test/cypress/e2e/transfer.spec.js @@ -40,7 +40,7 @@ describe('Transfer', () => { cy.autologin(accounts.genesis.passphrase, networks.devnet.node); cy.visit(urls.wallet); cy.url().should('contain', urls.wallet); - cy.get(ss.tansactionSendButton).click(); + cy.get(ss.transactionSendButton).click(); checkWalletPageLoaded(); }); @@ -54,7 +54,7 @@ describe('Transfer', () => { cy.visit(urls.dashboard); cy.get(ss.sidebarMenuWalletBtn).should('have.css', 'opacity', '1').click(); cy.url().should('contain', urls.wallet); - cy.get(ss.tansactionSendButton).click(); + cy.get(ss.transactionSendButton).click(); checkWalletPageLoaded(); }); @@ -189,8 +189,9 @@ describe('Transfer', () => { cy.get(ss.accountInitializationMsg).should('not.exist'); cy.wait(txConfirmationTimeout); cy.reload(); - cy.visit(urls.wallet); + cy.visit(urls.send); cy.get(ss.accountInitializationMsg).should('not.exist'); + cy.visit(urls.wallet); cy.get(ss.transactionRow).eq(0).as('tx'); cy.get('@tx').find(ss.transactionAddress).should('have.text', accounts['without initialization'].address); cy.get('@tx').find(ss.transactionReference).should('have.text', 'Account initialization'); @@ -203,7 +204,7 @@ describe('Transfer', () => { */ it('It\'s not allowed to make a transfer if not enough funds', () => { cy.autologin(accounts['empty account'].passphrase, networks.devnet.node); - cy.visit(urls.wallet); + cy.visit(urls.send); cy.get(ss.recipientInput).type(randomAddress); cy.get(ss.amountInput).click().type(randomAmount); cy.get(ss.nextTransferBtn).should('be.disabled'); @@ -218,47 +219,11 @@ describe('Transfer', () => { cy.server({ status: 409 }); cy.route('POST', '/api/transactions', { message: 'Test error' }); cy.autologin(accounts.genesis.passphrase, networks.devnet.node); - cy.visit(urls.wallet); + cy.visit(urls.send); cy.get(ss.recipientInput).type(randomAddress); cy.get(ss.amountInput).click().type(randomAmount); cy.get(ss.nextTransferBtn).click(); cy.get(ss.sendBtn).click(); cy.get(ss.resultMessage).contains('Status 409 : Test error'); }); - - /** - * Click request transfer - * @expect qr code is there - * @expect mail link contains correct message - * @expect click on send tab button leads to send transfer tab - */ - it('Request transfer', () => { - cy.autologin(accounts.genesis.passphrase, networks.devnet.node); - cy.visit(urls.wallet); - cy.get(ss.transferRequestTab).click(); - cy.get(ss.qrCode); - cy.get(ss.emailLink).should('have.prop', 'href').and('include', `mailto:?subject=Requesting%20LSK%20to%20${accounts.genesis.address}&body=Hey%20there,%20here%20is%20a%20link%20you%20can%20use%20to%20send%20me%20LSK%20via%20your%20wallet:%20lisk%3A%2F%2Fwallet%3Frecipient%3D${accounts.genesis.address}`); - cy.get(ss.transferSendTab).click(); - cy.get(ss.recipientInput); - }); - - /** - * Request specific amount - * @expect protocol link contains correct parameters - * @expect email link contains correct message - * @expect okay button leads to send tab - */ - it('Request specific amount', () => { - cy.autologin(accounts.genesis.passphrase, networks.devnet.node); - cy.visit(urls.wallet); - cy.get(ss.transferRequestTab).click(); - cy.get(ss.requestSpecificAmountBtn).click(); - cy.get(ss.amountInput).type(randomAmount); - cy.get(ss.referenceInput).type(randomReference); - cy.get(ss.confirmRequestBtn).click(); - cy.get(ss.confirmRequestBlock).contains(`lisk://wallet?recipient=${accounts.genesis.address}&amount=${randomAmount}&reference=${randomReference}`); - cy.get(ss.confirmRequestBlock).find(ss.emailLink).should('have.prop', 'href').and('include', `mailto:?subject=Request%20${randomAmount}%20LSK%20to%20${accounts.genesis.address}&body=Hey%20there,%20here%20is%20a%20link%20you%20can%20use%20to%20send%20me%20${randomAmount}%20LSK%20via%20your%20wallet:%20lisk%3A%2F%2Fwallet%3Frecipient%3D${accounts.genesis.address}%26amount%3D${randomAmount}%26reference%3D${randomReference}`); - cy.get(ss.okayBtn).click(); - cy.get(ss.recipientInput); - }); }); From c29b552026b218d5221b6fbc938b7f45f70f79fa Mon Sep 17 00:00:00 2001 From: andreiklimenok Date: Fri, 7 Dec 2018 15:42:21 +0100 Subject: [PATCH 5/5] :white_check_mark: unit test fix --- src/components/receive/receiveHowItWorks.test.js | 2 +- test/cypress/e2e/{transfer.spec.js => send.spec.js} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename test/cypress/e2e/{transfer.spec.js => send.spec.js} (99%) diff --git a/src/components/receive/receiveHowItWorks.test.js b/src/components/receive/receiveHowItWorks.test.js index 0a0894a42f..c78f7d53c4 100644 --- a/src/components/receive/receiveHowItWorks.test.js +++ b/src/components/receive/receiveHowItWorks.test.js @@ -50,7 +50,7 @@ describe('ReceiveHowItWorks', () => { }); it('continue to next component after click on X icon', () => { - wrapper.find('.closeIcon').simulate('click'); + wrapper.find('.okay-button').simulate('click'); wrapper.update(); expect(props.nextStep).to.have.been.calledWith(); }); diff --git a/test/cypress/e2e/transfer.spec.js b/test/cypress/e2e/send.spec.js similarity index 99% rename from test/cypress/e2e/transfer.spec.js rename to test/cypress/e2e/send.spec.js index a39077000a..b81caebfa3 100644 --- a/test/cypress/e2e/transfer.spec.js +++ b/test/cypress/e2e/send.spec.js @@ -20,7 +20,7 @@ const getRandomReference = () => Math.random().toString(36).replace(/[^a-z]+/g, // const transactionFee = 0.1; -describe('Transfer', () => { +describe('Send', () => { let randomAddress; let randomAmount; let randomReference;