diff --git a/cypress/full/modals_directive_page.spec.ts b/cypress/full/modals_directive_page_spec.ts similarity index 88% rename from cypress/full/modals_directive_page.spec.ts rename to cypress/full/modals_directive_page_spec.ts index 8827fbbb6f..8bc507bbf0 100644 --- a/cypress/full/modals_directive_page.spec.ts +++ b/cypress/full/modals_directive_page_spec.ts @@ -137,12 +137,8 @@ describe('Modals demo page test suite: Directive examples', () => { const btnX = '×'; const eventOnShowFired = 'event onShow is fired'; const eventOnShownFired = 'event onShown is fired'; - const eventOnXHide = 'event onHide is fired'; - const eventOnXHidden = 'event onHidden is fired'; - const eventOnBackdropHide = 'event onHide is fired, dismissed by backdrop-click'; - const eventOnBackdropHidden = 'event onHidden is fired, dismissed by backdrop-click'; - const eventOnEscHide = 'event onHide is fired, dismissed by esc'; - const eventOnEcsHidden = 'event onHidden is fired, dismissed by esc'; + const eventOnHide = 'event onHide is fired'; + const eventOnHidden = 'event onHidden is fired'; it('example contains the button "Open a modal"', () => { modals.isButtonExist(eventsModalsDemo, btnText); @@ -160,33 +156,30 @@ describe('Modals demo page test suite: Directive examples', () => { and "event onHidden is fired"`, () => { modals.clickByText(eventsModalsDemo, btnText); modals.clickByText(modals.modalBtnX, btnX); - modals.isDemoContainsTxt(eventsModalsDemo, eventOnXHide); - modals.isDemoContainsTxt(eventsModalsDemo, eventOnXHidden); + modals.isDemoContainsTxt(eventsModalsDemo, eventOnHide); + modals.isDemoContainsTxt(eventsModalsDemo, eventOnHidden); }); it(`when user user closes modal by click outside the modal window then should be messages "event onHidden is fired" and "onHidden event has been fired"`, () => { modals.clickByText(eventsModalsDemo, btnText); - modals.clickOutside(eventsModalsDemo); - modals.isModalEnabled(eventsModalsDemo, false); - modals.isDemoContainsTxt(eventsModalsDemo, eventOnBackdropHide); - modals.isDemoContainsTxt(eventsModalsDemo, eventOnBackdropHidden); + modals.isModalVisible(eventsModalsDemo, true); + modals.clickOnModal(eventsModalsDemo); + modals.isDemoContainsTxt(eventsModalsDemo, eventOnHide); + modals.isDemoContainsTxt(eventsModalsDemo, eventOnHidden); }); - it(`when user user closes modal by pressing ESC button then modal is closed and should be messages + it(`when user closes modal by pressing ESC button then modal is closed and should be messages "event onHide is fired, dismissed by esc" and "event onHidden is fired, dismissed by esc"`, () => { const modalText = 'Just another modal'; - modals.clickByText(eventsModalsDemo, btnText); modals.isDirectModalVisible(eventsModalsDemo, true); modals.isItemTextContains(eventsModalsDemo, modals.modalBody, modalText); modals.isBackdropExist(true); - modals.pressEsc(); modals.pressEscOnModal(eventsModalsDemo); - modals.isBackdropExist(false); modals.isDemoContainsTxt(eventsModalsDemo, eventOnShowFired); - modals.isDemoContainsTxt(eventsModalsDemo, eventOnEscHide); - modals.isDemoContainsTxt(eventsModalsDemo, eventOnEcsHidden); + modals.isDemoContainsTxt(eventsModalsDemo, eventOnHide); + modals.isDemoContainsTxt(eventsModalsDemo, eventOnHidden); }); }); diff --git a/cypress/full/modals_service_page_spec.ts b/cypress/full/modals_service_page_spec.ts index 3be36765b3..524705b301 100644 --- a/cypress/full/modals_service_page_spec.ts +++ b/cypress/full/modals_service_page_spec.ts @@ -129,16 +129,15 @@ describe('Modals demo page test suite: Service examples', () => { modals.isDemoContainsTxt(eventsDemo, demoOnHiddenFired); }); - it(`when user user closes modal by click outside the modal window then should be messages + it(`when user closes modal by click outside the modal window then should be messages "onHide event has been fired" and "onHidden event has been fired"`, () => { - modals.clickByText(eventsDemo, btnText); - modals.clickOutside(modals.modalContainer); - modals.isModalEnabled(modals.modalContainer, false); - modals.isBackdropExist(true); - modals.clickOnBackdrop(); - modals.isDemoContainsTxt(eventsDemo, demoOnHideFired); - modals.isDemoContainsTxt(eventsDemo, demoHideDismissed); - modals.isDemoContainsTxt(eventsDemo, demoHiddenDismissed); + modals.clickByText(eventsDemo, btnText); + modals.isModalVisible(modals.modalContainer, true); + modals.clickOnBackdrop(); + modals.clickOutside('modal-container'); + modals.isDemoContainsTxt(eventsDemo, demoOnHideFired); + modals.isDemoContainsTxt(eventsDemo, demoHideDismissed); + modals.isDemoContainsTxt(eventsDemo, demoHiddenDismissed); }); it(`when user closes modal by pressing ESC button then modal is closed and should be messages diff --git a/cypress/support/modals.po.ts b/cypress/support/modals.po.ts index 5373bd64a1..7c6a42fb43 100644 --- a/cypress/support/modals.po.ts +++ b/cypress/support/modals.po.ts @@ -73,6 +73,10 @@ export class ModalsPo extends BaseComponent { cy.get(this.modalBackdrop).click({force: true}); } + clickOnModal(baseSelector: string) { + cy.get(`${baseSelector} .modal`).click(); + } + checkElementsQuantity(elementsSelector: string, expectedQuantity: number) { cy.get(elementsSelector).should('have.length', expectedQuantity); } @@ -103,6 +107,6 @@ export class ModalsPo extends BaseComponent { } pressEscOnModal(baseSelector: string) { - cy.get(`${baseSelector} ${'.show'}`).type('{esc}'); + cy.get(`${baseSelector} ${'.modal'}`).type('{esc}'); } } diff --git a/package-lock.json b/package-lock.json index 9d106ec082..cc2c9703b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2051,9 +2051,9 @@ } }, "@cypress/xvfb": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.3.tgz", - "integrity": "sha512-yYrK+/bgL3hwoRHMZG4r5fyLniCy1pXex5fimtewAY6vE/jsVs8Q37UsEO03tFlcmiLnQ3rBNMaZBYTi/+C1cw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz", + "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==", "dev": true, "requires": { "debug": "^3.1.0", @@ -2218,34 +2218,12 @@ "integrity": "sha512-vTCdPp/T/Q3oSqwHmZ5Kpa9oI7iLtGl3RQaA/NyLHikvcrPxACkkKVr/XzkSPJWXHRhKGzVvb0urJsbMlRxi1Q==", "dev": true }, - "@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==", - "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==", - "dev": true - }, "@types/chai": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.3.tgz", "integrity": "sha512-f5dXGzOJycyzSMdaXVhiBhauL4dYydXwVpavfQ1mVCaGjR56a9QfklXObUxlIY9bGTmCPHEEZ04I16BZ/8w5ww==", "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==", - "dev": true, - "requires": { - "@types/chai": "*", - "@types/jquery": "*" - } - }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -2296,18 +2274,6 @@ "integrity": "sha512-RdbrPcW1aD78UmdLiDa9ZCKrbR5Go8PXh6GCpb4oIOkWVEusubSJJDrP4c5RYOu8m/CBz+ygZpicj6Pgms5a4Q==", "dev": true }, - "@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==", - "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==", - "dev": true - }, "@types/marked": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.3.0.tgz", @@ -2320,12 +2286,6 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", "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==", - "dev": true - }, "@types/node": { "version": "10.0.8", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.0.8.tgz", @@ -2348,16 +2308,6 @@ "integrity": "sha512-w+LjztaZbgZWgt/y/VMP5BUAWLtSyoIJhXyW279hehLPyubDoBNwvhcj3WaSptcekuKYeTCVxrq60rdLc6ImJA==", "dev": true }, - "@types/sinon-chai": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.2.tgz", - "integrity": "sha512-5zSs2AslzyPZdOsbm2NRtuSNAI2aTWzNKOHa/GRecKo7a5efYD7qGcPxMZXQDayVXT2Vnd5waXxBvV31eCZqiA==", - "dev": true, - "requires": { - "@types/chai": "*", - "@types/sinon": "*" - } - }, "@types/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", @@ -4721,13 +4671,10 @@ "dev": true }, "common-tags": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz", - "integrity": "sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA=", - "dev": true, - "requires": { - "babel-runtime": "^6.18.0" - } + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", + "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", + "dev": true }, "commondir": { "version": "1.0.1", @@ -6123,109 +6070,53 @@ "dev": true }, "cypress": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.1.5.tgz", - "integrity": "sha512-jzYGKJqU1CHoNocPndinf/vbG28SeU+hg+4qhousT/HDBMJxYgjecXOmSgBX/ga9/TakhqSrIrSP2r6gW/OLtg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.2.0.tgz", + "integrity": "sha512-PN0wz6x634QyNL56/voTzJoeScDfwtecvSfFTHfv5MkHuECVSR4VQcEZTvYtKWln3CMBMUkWbBKPIwwu2+a/kw==", "dev": true, "requires": { "@cypress/listr-verbose-renderer": "0.4.1", - "@cypress/xvfb": "1.2.3", - "@types/blob-util": "1.3.3", - "@types/bluebird": "3.5.18", - "@types/chai": "4.0.8", - "@types/chai-jquery": "1.1.35", - "@types/jquery": "3.3.6", - "@types/lodash": "4.14.87", - "@types/minimatch": "3.0.3", - "@types/mocha": "2.2.44", - "@types/sinon": "7.0.0", - "@types/sinon-chai": "3.2.2", + "@cypress/xvfb": "1.2.4", "bluebird": "3.5.0", "cachedir": "1.3.0", - "chalk": "2.4.1", + "chalk": "2.4.2", "check-more-types": "2.24.0", - "commander": "2.11.0", - "common-tags": "1.4.0", + "commander": "2.15.1", + "common-tags": "1.8.0", "debug": "3.1.0", "execa": "0.10.0", "executable": "4.1.1", - "extract-zip": "1.6.6", + "extract-zip": "1.6.7", "fs-extra": "4.0.1", "getos": "3.1.0", - "glob": "7.1.2", - "is-ci": "1.0.10", + "glob": "7.1.3", + "is-ci": "1.2.1", "is-installed-globally": "0.1.0", "lazy-ass": "1.6.0", "listr": "0.12.0", "lodash": "4.17.11", "log-symbols": "2.2.0", "minimist": "1.2.0", - "moment": "2.22.2", + "moment": "2.24.0", "ramda": "0.24.1", - "request": "2.87.0", - "request-progress": "0.3.1", - "supports-color": "5.1.0", - "tmp": "0.0.31", + "request": "2.88.0", + "request-progress": "0.4.0", + "supports-color": "5.5.0", + "tmp": "0.0.33", "url": "0.11.0", - "yauzl": "2.8.0" + "yauzl": "2.10.0" }, "dependencies": { - "@types/chai": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.8.tgz", - "integrity": "sha512-m812CONwdZn/dMzkIJEY0yAs4apyTkTORgfB2UsMOxgkUbC205AHnm4T8I0I5gPg9MHrFc1dJ35iS75c0CJkjg==", - "dev": true - }, - "@types/sinon": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.0.0.tgz", - "integrity": "sha512-kcYoPw0uKioFVC/oOqafk2yizSceIQXCYnkYts9vJIwQklFRsMubTObTDrjQamUyBRd47332s85074cd/hCwxg==", - "dev": true - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, "bluebird": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=", "dev": true }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, "debug": { @@ -6237,28 +6128,13 @@ "ms": "2.0.0" } }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "is-ci": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", + "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", "dev": true, "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" + "ci-info": "^1.5.0" } }, "lodash": { @@ -6273,80 +6149,11 @@ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", "dev": true - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, - "request": { - "version": "2.87.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" - } - }, - "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==", - "dev": true, - "requires": { - "has-flag": "^2.0.0" - }, - "dependencies": { - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - } - } - }, - "tmp": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.1" - } - }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", - "dev": true, - "requires": { - "punycode": "^1.4.1" - } } } }, @@ -7562,37 +7369,17 @@ } }, "extract-zip": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz", - "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", + "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", "dev": true, "requires": { - "concat-stream": "1.6.0", + "concat-stream": "1.6.2", "debug": "2.6.9", - "mkdirp": "0.5.0", + "mkdirp": "0.5.1", "yauzl": "2.4.1" }, "dependencies": { - "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "mkdirp": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", - "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, "yauzl": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", @@ -13756,6 +13543,12 @@ "lower-case": "^1.1.1" } }, + "node-eta": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/node-eta/-/node-eta-0.1.1.tgz", + "integrity": "sha1-QGYQmzk3HHYccrfr2pqeoKXeEh8=", + "dev": true + }, "node-fetch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", @@ -15793,12 +15586,13 @@ } }, "request-progress": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz", - "integrity": "sha1-ByHBBdipasayzossia4tXs/Pazo=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.4.0.tgz", + "integrity": "sha1-wZVOOQhqqFJpxWYLzuAUKmpw1+c=", "dev": true, "requires": { - "throttleit": "~0.0.2" + "node-eta": "^0.1.1", + "throttleit": "^0.0.2" } }, "require-dir": { @@ -19438,13 +19232,24 @@ } }, "yauzl": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", - "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", "dev": true, "requires": { "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.0.1" + "fd-slicer": "~1.1.0" + }, + "dependencies": { + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + } } }, "yeast": { diff --git a/package.json b/package.json index 350d30676d..f08c5925df 100755 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "core-js": "2.5.6", "cpy": "7.0.0", "cpy-cli": "1.0.1", - "cypress": "3.1.5", + "cypress": "3.2.0", "gh-pages": "1.1.0", "gitignore-to-glob": "0.3.0", "google-code-prettify": "1.0.5",