From b602f1fc41418f5de626d61c20954108aa4b7ad7 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Wed, 12 Jun 2019 15:38:15 +0000 Subject: [PATCH] Update node-sass and remove deprecated code --- package.json | 2 +- src/views/users/index.vue | 5 ----- test/views/users/index.test.js | 10 +++++----- yarn.lock | 36 ++++++++++++---------------------- 4 files changed, 18 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index a70ed1c0..2207cbac 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "lint-staged": "7.2.2", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/views/users/index.vue b/src/views/users/index.vue index 04c0bcd9..b1484e01 100644 --- a/src/views/users/index.vue +++ b/src/views/users/index.vue @@ -169,11 +169,6 @@ export default { dialogFormVisible: false } }, - data() { - return { - search: '' - } - }, computed: { loading() { return this.$store.state.users.loading diff --git a/test/views/users/index.test.js b/test/views/users/index.test.js index db5cbab8..7d688554 100644 --- a/test/views/users/index.test.js +++ b/test/views/users/index.test.js @@ -314,15 +314,15 @@ describe('Creates new account', () => { const validateUsernameRule = { validator: wrapper.vm.validateUsername, field: 'nickname', fullField: 'nickname', type: 'string' } const identity = val => val - expect(wrapper.vm.validateUsername(validateUsernameRule, '', identity).message).toBe('Please input the username') - expect(wrapper.vm.validateUsername(validateUsernameRule, 'marshall%$', identity).message).toBe('Username can include "a-z", "A-Z" and "0-9" characters') + expect(wrapper.vm.validateUsername(validateUsernameRule, '', identity)).toBeInstanceOf(Error) + expect(wrapper.vm.validateUsername(validateUsernameRule, 'marshall%$', identity)).toBeInstanceOf(Error) expect(wrapper.vm.validateUsername(validateUsernameRule, 'Marshall66', identity)).toBeUndefined() - expect(wrapper.vm.validateEmail(validateEmailRule, '', identity).message).toBe('Please input the e-mail') - expect(wrapper.vm.validateEmail(validateEmailRule, 'test', identity).message).toBe('Please input valid e-mail') + expect(wrapper.vm.validateEmail(validateEmailRule, '', identity)).toBeInstanceOf(Error) + expect(wrapper.vm.validateEmail(validateEmailRule, 'test', identity)).toBeInstanceOf(Error) expect(wrapper.vm.validateEmail(validateEmailRule, 'test@test.com', identity)).toBeUndefined() - expect(wrapper.vm.validatePassword(validatePasswordRule, '', identity).message).toBe('Please input the password') + expect(wrapper.vm.validatePassword(validatePasswordRule, '', identity)).toBeInstanceOf(Error) expect(wrapper.vm.validatePassword(validatePasswordRule, '1234', identity)).toBeUndefined() diff --git a/yarn.lock b/yarn.lock index ecae7ddb..4f4a8dda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6166,21 +6166,11 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -6196,11 +6186,6 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.mergewith@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" - integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ== - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -6690,7 +6675,12 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -nan@^2.10.0, nan@^2.9.2: +nan@^2.13.2: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + +nan@^2.9.2: version "2.12.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw== @@ -6866,10 +6856,10 @@ node-releases@^1.1.8: dependencies: semver "^5.3.0" -node-sass@^4.7.2: - version "4.11.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a" - integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA== +node-sass@^4.12.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017" + integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6878,12 +6868,10 @@ node-sass@^4.7.2: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" + lodash "^4.17.11" meow "^3.7.0" mkdirp "^0.5.1" - nan "^2.10.0" + nan "^2.13.2" node-gyp "^3.8.0" npmlog "^4.0.0" request "^2.88.0"