From 3a7eb10c71f0a2da56d8ed9b748c23f09c8270fa Mon Sep 17 00:00:00 2001 From: NickolaiYurchenko Date: Thu, 1 Oct 2020 12:15:37 +0300 Subject: [PATCH] web: tests fix Change-Id: I73cfb86fd214afb02be6a9e96e0ae5ffb92fd214 --- web/satellite/package-lock.json | 319 ++++------ .../account/billing/BillingArea.vue | 2 - .../src/components/common/VDatePicker.vue | 567 ------------------ .../tests/unit/common/VDatePicker.spec.ts | 198 ------ web/storagenode/package-lock.json | 14 +- .../payments/HeldHistoryAllStatsTable.spec.ts | 8 +- .../HeldHistoryAllStatsTableItemSmall.spec.ts | 7 +- .../HeldHistoryMonthlyBreakdownTable.spec.ts | 15 +- ...toryMonthlyBreakdownTableItemSmall.spec.ts | 9 +- .../HeldHistoryAllStatsTable.spec.ts.snap | 12 +- ...HistoryAllStatsTableItemSmall.spec.ts.snap | 8 +- 11 files changed, 181 insertions(+), 978 deletions(-) delete mode 100644 web/satellite/src/components/common/VDatePicker.vue delete mode 100644 web/satellite/tests/unit/common/VDatePicker.spec.ts diff --git a/web/satellite/package-lock.json b/web/satellite/package-lock.json index c0136d203..084f7eacc 100644 --- a/web/satellite/package-lock.json +++ b/web/satellite/package-lock.json @@ -1743,16 +1743,6 @@ "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==", "dev": true }, - "@types/mini-css-extract-plugin": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.1.tgz", - "integrity": "sha512-+mN04Oszdz9tGjUP/c1ReVwJXxSniLd7lF++sv+8dkABxVNthg6uccei+4ssKxRHGoMmPxdn7uBdJWONSJGTGQ==", - "dev": true, - "optional": true, - "requires": { - "@types/webpack": "*" - } - }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -2160,6 +2150,103 @@ "yorkie": "^2.0.0" }, "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "fork-ts-checker-webpack-plugin-v5": { + "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", + "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", + "dev": true, + "optional": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@types/json-schema": "^7.0.5", + "chalk": "^4.1.0", + "cosmiconfig": "^6.0.0", + "deepmerge": "^4.2.2", + "fs-extra": "^9.0.0", + "memfs": "^3.1.2", + "minimatch": "^3.0.4", + "schema-utils": "2.7.0", + "semver": "^7.3.2", + "tapable": "^1.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true, + "optional": true + } + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "schema-utils": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", + "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "dev": true, + "optional": true, + "requires": { + "@types/json-schema": "^7.0.4", + "ajv": "^6.12.2", + "ajv-keywords": "^3.4.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "tslint": { "version": "5.20.1", "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", @@ -2359,6 +2446,17 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -2454,6 +2552,18 @@ "graceful-fs": "^4.1.6" } }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -2561,6 +2671,18 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.0.0-beta.8", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", + "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -7389,103 +7511,6 @@ "worker-rpc": "^0.1.0" } }, - "fork-ts-checker-webpack-plugin-v5": { - "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", - "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", - "dev": true, - "optional": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@types/json-schema": "^7.0.5", - "chalk": "^4.1.0", - "cosmiconfig": "^6.0.0", - "deepmerge": "^4.2.2", - "fs-extra": "^9.0.0", - "memfs": "^3.1.2", - "minimatch": "^3.0.4", - "schema-utils": "2.7.0", - "semver": "^7.3.2", - "tapable": "^1.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "schema-utils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", - "dev": true, - "optional": true, - "requires": { - "@types/json-schema": "^7.0.4", - "ajv": "^6.12.2", - "ajv-keywords": "^3.4.1" - } - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -16720,86 +16745,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.7", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.7.tgz", - "integrity": "sha512-xQ8/GZmRPdQ3EinnE0IXwdVoDzh7Dowo0MowoyBuScEBXrRabw6At5/IdtD3waKklKW5PGokPsm8KRN6rvQ1cw==", - "dev": true, - "optional": true, - "requires": { - "@types/mini-css-extract-plugin": "^0.9.1", - "chalk": "^3.0.0", - "hash-sum": "^2.0.0", - "loader-utils": "^1.2.3", - "merge-source-map": "^1.1.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-parser": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/vue-parser/-/vue-parser-1.1.6.tgz", diff --git a/web/satellite/src/components/account/billing/BillingArea.vue b/web/satellite/src/components/account/billing/BillingArea.vue index d1804378e..3119bab12 100644 --- a/web/satellite/src/components/account/billing/BillingArea.vue +++ b/web/satellite/src/components/account/billing/BillingArea.vue @@ -63,7 +63,6 @@ import SmallDepositHistory from '@/components/account/billing/depositAndBillingH import EstimatedCostsAndCredits from '@/components/account/billing/estimatedCostsAndCredits/EstimatedCostsAndCredits.vue'; import HistoryDropdown from '@/components/account/billing/HistoryDropdown.vue'; import PaymentMethods from '@/components/account/billing/paymentMethods/PaymentMethods.vue'; -import VDatepicker from '@/components/common/VDatePicker.vue'; import DatePickerIcon from '@/../static/images/account/billing/datePicker.svg'; import ExpandIcon from '@/../static/images/account/billing/expand.svg'; @@ -83,7 +82,6 @@ import { APP_STATE_ACTIONS } from '@/utils/constants/actionNames'; SmallDepositHistory, EstimatedCostsAndCredits, PaymentMethods, - VDatepicker, DatePickerIcon, LowBalanceIcon, NegativeBalanceIcon, diff --git a/web/satellite/src/components/common/VDatePicker.vue b/web/satellite/src/components/common/VDatePicker.vue deleted file mode 100644 index 170ab1c77..000000000 --- a/web/satellite/src/components/common/VDatePicker.vue +++ /dev/null @@ -1,567 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - diff --git a/web/satellite/tests/unit/common/VDatePicker.spec.ts b/web/satellite/tests/unit/common/VDatePicker.spec.ts deleted file mode 100644 index 877979b6e..000000000 --- a/web/satellite/tests/unit/common/VDatePicker.spec.ts +++ /dev/null @@ -1,198 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - -import VDatePicker from '@/components/common/VDatePicker.vue'; - -import { mount } from '@vue/test-utils'; - -const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; - -describe('VDatePicker.vue', () => { - it('renders correctly', async () => { - const wrapper = mount(VDatePicker, {}); - - await wrapper.vm.showCheck(); - - expect(wrapper.findAll('li').at(0).text()).toBe('Mo'); - expect(wrapper.findAll('.day').length).toBe(42); - - await wrapper.vm.showYear(); - - expect(wrapper.findAll('.year').length).toBe(100); - - await wrapper.vm.showMonth(); - - expect(wrapper.findAll('.month').length).toBe(12); - }); - - it('renders correctly with props', async () => { - const wrapper = mount(VDatePicker, { - propsData: { - isSundayFirst: true, - }, - }); - - await wrapper.vm.showCheck(); - - expect(wrapper.findAll('li').at(0).text()).toBe('Su'); - expect(wrapper.findAll('.day').length).toBe(42); - }); - - it('triggers correct functionality on normal check', async () => { - const wrapper = mount(VDatePicker); - - await wrapper.vm.showCheck(); - await wrapper.vm.setYear(2019); - await wrapper.vm.setMonth(months[9]); - - wrapper.findAll('.day').at(1).trigger('click'); - - expect(wrapper.vm.selectedDays.length).toBe(1); - const selectedDay = wrapper.vm.selectedDays[0]; - expect(selectedDay.getDate()).toBe(1); - expect(selectedDay.getMonth()).toBe(9); - expect(selectedDay.getFullYear()).toBe(2019); - - wrapper.findAll('.day').at(2).trigger('click'); - - expect(wrapper.vm.selectedDays.length).toBe(0); - }); - - it('triggers correct functionality on toggle checking', async () => { - const wrapper = mount(VDatePicker); - - await wrapper.vm.showCheck(); - await wrapper.vm.setYear(2019); - await wrapper.vm.setMonth(months[9]); - - wrapper.findAll('.day').at(1).trigger('click'); - - expect(wrapper.vm.selectedDays.length).toBe(1); - const selectedDay1 = wrapper.vm.selectedDays[0]; - expect(selectedDay1.getDate()).toBe(1); - expect(selectedDay1.getMonth()).toBe(9); - expect(selectedDay1.getFullYear()).toBe(2019); - - wrapper.findAll('.day').at(1).trigger('click'); - - expect(wrapper.vm.selectedDays.length).toBe(0); - - wrapper.findAll('.day').at(2).trigger('click'); - - expect(wrapper.vm.selectedDays.length).toBe(1); - const selectedDay2 = wrapper.vm.selectedDays[0]; - expect(selectedDay2.getDate()).toBe(2); - expect(selectedDay2.getMonth()).toBe(9); - expect(selectedDay2.getFullYear()).toBe(2019); - }); - - it('triggers correct functionality on month selection', async () => { - const wrapper = mount(VDatePicker); - - await wrapper.vm.showCheck(); - await wrapper.vm.setYear(2019); - await wrapper.vm.setMonth(months[9]); - - expect(wrapper.findAll('.month').length).toBe(0); - - await wrapper.find('.month-selection').trigger('click'); - - expect(wrapper.findAll('.month').length).toBe(12); - - await wrapper.findAll('.month').at(0).trigger('click'); - - expect(wrapper.vm.selectedDateState.month).toBe(0); - expect(wrapper.find('.month-selection').text()).toBe(months[0]); - }); - - it('triggers correct functionality on year selection', async () => { - const wrapper = mount(VDatePicker); - const now = new Date(); - const nowYear = now.getFullYear(); - - await wrapper.vm.showCheck(); - await wrapper.vm.setYear(2019); - await wrapper.vm.setMonth(months[9]); - - expect(wrapper.findAll('.year').length).toBe(0); - - await wrapper.find('.year-selection').trigger('click'); - - expect(wrapper.findAll('.year').length).toBe(100); - expect(wrapper.findAll('.year').at(0).text()).toBe(nowYear.toString()); - - await wrapper.find('.year-selection').trigger('click'); - await wrapper.findAll('.year').at(1).trigger('click'); - - expect(wrapper.vm.selectedDateState.year).toBe(nowYear - 1); - expect(wrapper.find('.year-selection').text()).toBe((nowYear - 1).toString()); - }); - - it('triggers correct functionality on month incrementation', async () => { - const wrapper = mount(VDatePicker); - const now = new Date(); - const nowYear = now.getFullYear(); - - await wrapper.vm.showCheck(); - await wrapper.vm.setYear(nowYear); - await wrapper.vm.setMonth(months[now.getMonth() - 1]); - - const actualDates = wrapper.findAll('.day'); - - actualDates.at(actualDates.length - 1).trigger('click'); - - expect(wrapper.vm.selectedDateState.year).toBe(nowYear); - expect(wrapper.vm.selectedDateState.month).toBe(now.getMonth()); - - wrapper.find('.cov-date-next').trigger('click'); - - expect(wrapper.vm.selectedDateState.year).toBe(nowYear); - expect(wrapper.vm.selectedDateState.month).toBe(now.getMonth()); - - wrapper.vm.setYear(nowYear - 1); - wrapper.vm.setMonth(months[0]); - - const changedDates = wrapper.findAll('.day'); - - changedDates.at(changedDates.length - 1).trigger('click'); - - expect(wrapper.vm.selectedDateState.year).toBe(nowYear - 1); - expect(wrapper.vm.selectedDateState.month).toBe(1); - - wrapper.find('.cov-date-next').trigger('click'); - - expect(wrapper.vm.selectedDateState.year).toBe(nowYear - 1); - expect(wrapper.vm.selectedDateState.month).toBe(2); - }); - - it('triggers correct functionality on month decrementation', async () => { - const wrapper = mount(VDatePicker); - - await wrapper.vm.showCheck(); - await wrapper.vm.setYear(2019); - await wrapper.vm.setMonth(months[9]); - - wrapper.findAll('.day').at(0).trigger('click'); - - expect(wrapper.vm.selectedDateState.month).toBe(8); - - wrapper.find('.cov-date-previous').trigger('click'); - - expect(wrapper.vm.selectedDateState.month).toBe(7); - - wrapper.vm.setMonth(months[0]); - - wrapper.find('.cov-date-previous').trigger('click'); - - expect(wrapper.vm.selectedDateState.year).toBe(2018); - expect(wrapper.vm.selectedDateState.month).toBe(11); - - wrapper.vm.setYear(2019); - wrapper.vm.setMonth(months[0]); - - wrapper.findAll('.day').at(0).trigger('click'); - - expect(wrapper.vm.selectedDateState.year).toBe(2018); - expect(wrapper.vm.selectedDateState.month).toBe(11); - }); -}); diff --git a/web/storagenode/package-lock.json b/web/storagenode/package-lock.json index 3851f3de2..b950dba4b 100644 --- a/web/storagenode/package-lock.json +++ b/web/storagenode/package-lock.json @@ -12084,9 +12084,9 @@ "dev": true }, "node-forge": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", - "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, "node-gyp": { @@ -14704,12 +14704,12 @@ "dev": true }, "selfsigned": { - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", - "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "version": "1.10.8", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", + "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "0.9.0" + "node-forge": "^0.10.0" } }, "semver": { diff --git a/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTable.spec.ts b/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTable.spec.ts index 7e83ee14d..2d2b8df51 100644 --- a/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTable.spec.ts +++ b/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTable.spec.ts @@ -26,12 +26,16 @@ const store = new Vuex.Store({ modules: { payoutModule }}); describe('HeldHistoryAllStatsTable', (): void => { it('renders correctly with actual values', async (): Promise => { + const _Date = Date; + const mockedDate = new Date(1580522290000); + const testJoinAt = new Date(Date.UTC(2019, 6, 30)); + global.Date = jest.fn(() => mockedDate); + const wrapper = shallowMount(HeldHistoryAllStatsTable, { store, localVue, }); - const testJoinAt = new Date(Date.UTC(2020, 0, 30)); const testHeldHistory = [ new SatelliteHeldHistory('1', 'name1', 1, 50000, 0, 0, 1, testJoinAt), new SatelliteHeldHistory('2', 'name2', 5, 50000, 422280, 0, 0, testJoinAt), @@ -41,5 +45,7 @@ describe('HeldHistoryAllStatsTable', (): void => { await store.commit(PAYOUT_MUTATIONS.SET_HELD_HISTORY, testHeldHistory); expect(wrapper).toMatchSnapshot(); + + global.Date = _Date; }); }); diff --git a/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTableItemSmall.spec.ts b/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTableItemSmall.spec.ts index 0e657f4e6..1af1c3199 100644 --- a/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTableItemSmall.spec.ts +++ b/web/storagenode/tests/unit/components/payments/HeldHistoryAllStatsTableItemSmall.spec.ts @@ -14,7 +14,10 @@ localVue.filter('centsToDollars', (cents: number): string => { describe('HeldHistoryAllStatsTableItemSmall', (): void => { it('renders correctly with actual values', async (): Promise => { - const testJoinAt = new Date(Date.UTC(2020, 0, 27)); + const _Date = Date; + const mockedDate = new Date(1580522290000); + const testJoinAt = new Date(Date.UTC(2019, 6, 30)); + global.Date = jest.fn(() => mockedDate); const wrapper = shallowMount(HeldHistoryAllStatsTableItemSmall, { propsData: { @@ -45,5 +48,7 @@ describe('HeldHistoryAllStatsTableItemSmall', (): void => { await localVue.nextTick(); expect(wrapper).toMatchSnapshot(); + + global.Date = _Date; }); }); diff --git a/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTable.spec.ts b/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTable.spec.ts index 4fde0726e..c86de501c 100644 --- a/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTable.spec.ts +++ b/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTable.spec.ts @@ -26,19 +26,26 @@ const store = new Vuex.Store({ modules: { payoutModule }}); describe('HeldHistoryMonthlyBreakdownTable', (): void => { it('renders correctly with actual values', async (): Promise => { + const _Date = Date; + const mockedDate = new Date(1580522290000); + const testJoinAt = new Date(Date.UTC(2019, 6, 30)); + global.Date = jest.fn(() => mockedDate); + const wrapper = shallowMount(HeldHistoryMonthlyBreakdownTable, { store, localVue, }); - const testJoinedAt = new Date(2020, 1, 20); + await store.commit(PAYOUT_MUTATIONS.SET_HELD_HISTORY, [ - new SatelliteHeldHistory('1', 'name1', 1, 50000, 0, 0, 0, testJoinedAt), - new SatelliteHeldHistory('2', 'name2', 5, 50000, 422280, 0, 0 , testJoinedAt), - new SatelliteHeldHistory('3', 'name3', 6, 50000, 7333880, 7852235, 0, testJoinedAt), + new SatelliteHeldHistory('1', 'name1', 1, 50000, 0, 0, 0, testJoinAt), + new SatelliteHeldHistory('2', 'name2', 5, 50000, 422280, 0, 0 , testJoinAt), + new SatelliteHeldHistory('3', 'name3', 6, 50000, 7333880, 7852235, 0, testJoinAt), ]); expect(wrapper).toMatchSnapshot(); + + global.Date = _Date; }); }); diff --git a/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTableItemSmall.spec.ts b/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTableItemSmall.spec.ts index adae0d66f..5457ec8de 100644 --- a/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTableItemSmall.spec.ts +++ b/web/storagenode/tests/unit/components/payments/HeldHistoryMonthlyBreakdownTableItemSmall.spec.ts @@ -14,6 +14,11 @@ localVue.filter('centsToDollars', (cents: number): string => { describe('HeldHistoryMonthlyBreakdownTableSmall', (): void => { it('renders correctly with actual values', async (): Promise => { + const _Date = Date; + const testJoinAt = new Date(Date.UTC(2019, 6, 30)); + const mockedDate = new Date(1580522290000); + global.Date = jest.fn(() => mockedDate); + const wrapper = shallowMount(HeldHistoryMonthlyBreakdownTableItemSmall, { propsData: { heldHistoryItem: new SatelliteHeldHistory( @@ -24,7 +29,7 @@ describe('HeldHistoryMonthlyBreakdownTableSmall', (): void => { 7333880, 7852235, 757576, - new Date(2020, 1, 20), + testJoinAt, ), }, localVue, @@ -43,5 +48,7 @@ describe('HeldHistoryMonthlyBreakdownTableSmall', (): void => { await localVue.nextTick(); expect(wrapper).toMatchSnapshot(); + + global.Date = _Date; }); }); diff --git a/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTable.spec.ts.snap b/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTable.spec.ts.snap index dec80eaf0..f2479ca7d 100644 --- a/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTable.spec.ts.snap +++ b/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTable.spec.ts.snap @@ -20,10 +20,10 @@ exports[`HeldHistoryAllStatsTable renders correctly with actual values 1`] = `

name1

-

9 month

+

8 month

-

2020-01-30

+

2019-07-30

$0.00

@@ -35,10 +35,10 @@ exports[`HeldHistoryAllStatsTable renders correctly with actual values 1`] = `

name2

-

9 month

+

8 month

-

2020-01-30

+

2019-07-30

$0.00

@@ -50,10 +50,10 @@ exports[`HeldHistoryAllStatsTable renders correctly with actual values 1`] = `

name3

-

9 month

+

8 month

-

2020-01-30

+

2019-07-30

$7.85

diff --git a/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTableItemSmall.spec.ts.snap b/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTableItemSmall.spec.ts.snap index 3d6ca1d8f..0cc0e4e6b 100644 --- a/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTableItemSmall.spec.ts.snap +++ b/web/storagenode/tests/unit/components/payments/__snapshots__/HeldHistoryAllStatsTableItemSmall.spec.ts.snap @@ -5,7 +5,7 @@ exports[`HeldHistoryAllStatsTableItemSmall renders correctly with actual values

name1

-

9 month

+

8 month

@@ -24,7 +24,7 @@ exports[`HeldHistoryAllStatsTableItemSmall renders correctly with actual values

name1

-

9 month

+

8 month

@@ -36,7 +36,7 @@ exports[`HeldHistoryAllStatsTableItemSmall renders correctly with actual values

First Contact

-

2020-01-27

+

2019-07-30

Held Total

@@ -56,7 +56,7 @@ exports[`HeldHistoryAllStatsTableItemSmall renders correctly with actual values

name1

-

9 month

+

8 month