Merge pull request #416 from cosmos/fabo/415-fix-tests

Fabo/415 fix tests
luniehq · Jan 30, 2018 · 549d0e0 · 549d0e0
2 parents 3a3e080 + 92c9af1
commit 549d0e0
Show file tree

Hide file tree

Showing 46 changed files with 53 additions and 69 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ npm-debug.log
 npm-debug.log.*
 thumbs.db
 !.gitkeep
-.vscode
+.vscode/*
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/package.json b/package.json
@@ -88,7 +88,6 @@
     "vue-style-loader": "^3.0.3",
     "vue-template-compiler": "^2.5.13",
     "vue-template-es2015-compiler": "1.6.x",
-    "vue-test-utils": "^1.0.0-beta.8",
     "webpack": "^3.10.0",
     "webpack-dev-server": "^2.2.0",
     "webpack-merge": "^0.14.1",
@@ -100,6 +99,7 @@
     "@nylira/vue-form-msg": "^1.0.3",
     "@nylira/vue-input": "^3.2.0",
     "@nylira/vue-notifications": "^1.4.4",
+    "@vue/test-utils": "^1.0.0-beta.11",
     "axios": "^0.17.0",
     "casual": "^1.5.19",
     "chart.js": "^2.6.0",

diff --git a/test/unit/helpers/vuex-setup.js b/test/unit/helpers/vuex-setup.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import VueRouter from 'vue-router'
-import { shallow, mount, createLocalVue } from 'vue-test-utils'
+import { shallow, mount, createLocalVue } from '@vue/test-utils'
 
 import routes from 'renderer/routes'
 

diff --git a/test/unit/specs/components/common/FundraiserWarning.spec.js b/test/unit/specs/components/common/FundraiserWarning.spec.js
@@ -1,4 +1,4 @@
-import { shallow } from 'vue-test-utils'
+import { shallow } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import FundraiserWarning from 'renderer/components/common/FundraiserWarning'
 

diff --git a/test/unit/specs/components/common/NISession.spec.js b/test/unit/specs/components/common/NISession.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import NiSession from 'common/NiSession'
 const config = require('renderer/vuex/modules/config').default({})
 

diff --git a/test/unit/specs/components/common/NISessionAccountDelete.spec.js b/test/unit/specs/components/common/NISessionAccountDelete.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import Vuelidate from 'vuelidate'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiSessionAccountDelete from 'common/NiSessionAccountDelete'
 

diff --git a/test/unit/specs/components/common/NISessionHardware.spec.js b/test/unit/specs/components/common/NISessionHardware.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import Vuelidate from 'vuelidate'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NISessionHardware from 'common/NiSessionHardware'
 

diff --git a/test/unit/specs/components/common/NISessionLoading.spec.js b/test/unit/specs/components/common/NISessionLoading.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiSessionLoading from 'common/NiSessionLoading'
 

diff --git a/test/unit/specs/components/common/NISessionWelcome.spec.js b/test/unit/specs/components/common/NISessionWelcome.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NISessionWelcome from 'common/NiSessionWelcome'
 import LiSession from 'common/NiLiSession'

diff --git a/test/unit/specs/components/common/NiCards.spec.js b/test/unit/specs/components/common/NiCards.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiCards from 'common/NiCards'
 

diff --git a/test/unit/specs/components/common/NiConnectivity.spec.js b/test/unit/specs/components/common/NiConnectivity.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiConnectivity from 'common/NiConnectivity'
 

diff --git a/test/unit/specs/components/common/NiDataEmpty.spec.js b/test/unit/specs/components/common/NiDataEmpty.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiDataEmpty from 'common/NiDataEmpty'
 

diff --git a/test/unit/specs/components/common/NiDataEmptySearch.spec.js b/test/unit/specs/components/common/NiDataEmptySearch.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiDataEmptySearch from 'common/NiDataEmptySearch'
 

diff --git a/test/unit/specs/components/common/NiDataEmptyTx.spec.js b/test/unit/specs/components/common/NiDataEmptyTx.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiDataEmptyTx from 'common/NiDataEmptyTx'
 

diff --git a/test/unit/specs/components/common/NiDataError.spec.js b/test/unit/specs/components/common/NiDataError.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiDataError from 'common/NiDataError'
 

diff --git a/test/unit/specs/components/common/NiDataLoading.spec.js b/test/unit/specs/components/common/NiDataLoading.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiDataLoading from 'common/NiDataLoading'
 

diff --git a/test/unit/specs/components/common/NiDataMsg.spec.js b/test/unit/specs/components/common/NiDataMsg.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiDataMsg from 'common/NiDataMsg'
 

diff --git a/test/unit/specs/components/common/NiFieldAddon.spec.js b/test/unit/specs/components/common/NiFieldAddon.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiFieldAddon from 'common/NiFieldAddon'
 

diff --git a/test/unit/specs/components/common/NiFieldGroup.spec.js b/test/unit/specs/components/common/NiFieldGroup.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiFieldGroup from 'common/NiFieldGroup'
 

diff --git a/test/unit/specs/components/common/NiFieldSeed.spec.js b/test/unit/specs/components/common/NiFieldSeed.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiFieldSeed from 'common/NiFieldSeed'
 

diff --git a/test/unit/specs/components/common/NiFieldVote.spec.js b/test/unit/specs/components/common/NiFieldVote.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiFieldVote from 'common/NiFieldVote'
 

diff --git a/test/unit/specs/components/common/NiFormGroup.spec.js b/test/unit/specs/components/common/NiFormGroup.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiFormGroup from 'common/NiFormGroup'
 

diff --git a/test/unit/specs/components/common/NiFormMsg.spec.js b/test/unit/specs/components/common/NiFormMsg.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiFormMsg from 'common/NiFormMsg'
 

diff --git a/test/unit/specs/components/common/NiFormStruct.spec.js b/test/unit/specs/components/common/NiFormStruct.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiFormStruct from 'common/NiFormStruct'
 

diff --git a/test/unit/specs/components/common/NiHardwareState.spec.js b/test/unit/specs/components/common/NiHardwareState.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiHardwareState from 'common/NiHardwareState'
 

diff --git a/test/unit/specs/components/common/NiLiCopy.spec.js b/test/unit/specs/components/common/NiLiCopy.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiLiCopy from 'common/NiLiCopy'
 
 describe('NiLiCopy', () => {

diff --git a/test/unit/specs/components/common/NiLiSession.spec.js b/test/unit/specs/components/common/NiLiSession.spec.js
@@ -1,4 +1,4 @@
-import { shallow } from 'vue-test-utils'
+import { shallow } from '@vue/test-utils'
 import NiLiSession from 'common/NiLiSession'
 
 describe('NiLiSession', () => {

diff --git a/test/unit/specs/components/common/NiListItem.spec.js b/test/unit/specs/components/common/NiListItem.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiListItem from 'common/NiListItem'
 
 describe('NiListItem', () => {

diff --git a/test/unit/specs/components/common/NiModal.spec.js b/test/unit/specs/components/common/NiModal.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiModal from 'common/NiModal'
 
 describe('NiModal', () => {

diff --git a/test/unit/specs/components/common/NiPage.spec.js b/test/unit/specs/components/common/NiPage.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import NiPage from 'common/NiPage'
 
 const config = require('renderer/vuex/modules/config').default({})

diff --git a/test/unit/specs/components/common/NiPageFooter.spec.js b/test/unit/specs/components/common/NiPageFooter.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiPageFooter from 'common/NiPageFooter'
 
 describe('NiPageFooter', () => {

diff --git a/test/unit/specs/components/common/NiPageHeader.spec.js b/test/unit/specs/components/common/NiPageHeader.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiPageHeader from 'common/NiPageHeader'
 
 describe('NiPageHeader', () => {

diff --git a/test/unit/specs/components/common/NiPart.spec.js b/test/unit/specs/components/common/NiPart.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiPart from 'common/NiPart'
 
 describe('NiPart', () => {

diff --git a/test/unit/specs/components/common/NiSessionImport.spec.js b/test/unit/specs/components/common/NiSessionImport.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import Vuelidate from 'vuelidate'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import htmlBeautify from 'html-beautify'
 import NiSessionImport from 'common/NiSessionImport'
 

diff --git a/test/unit/specs/components/common/NiTabBar.spec.js b/test/unit/specs/components/common/NiTabBar.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiTabBar from 'common/NiTabBar'
 
 describe('NiTabBar', () => {

diff --git a/test/unit/specs/components/common/NiTag.spec.js b/test/unit/specs/components/common/NiTag.spec.js
@@ -1,4 +1,4 @@
-import { mount } from 'vue-test-utils'
+import { mount } from '@vue/test-utils'
 import NiTag from 'common/NiTag'
 
 describe('NiTag', () => {

diff --git a/test/unit/specs/components/common/ToggleBtn.spec.js b/test/unit/specs/components/common/ToggleBtn.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { mount, createLocalVue } from 'vue-test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 import TogggleBtn from 'renderer/components/common/ToggleBtn'
 
 const localVue = createLocalVue()

diff --git a/test/unit/specs/components/wallet/CardBalance.spec.js b/test/unit/specs/components/wallet/CardBalance.spec.js
@@ -1,4 +1,4 @@
-import { shallow } from 'vue-test-utils'
+import { shallow } from '@vue/test-utils'
 import CardBalance from 'renderer/components/wallet/CardBalance'
 
 describe('CardBalance', () => {

diff --git a/test/unit/specs/components/wallet/LiTransaction.spec.js b/test/unit/specs/components/wallet/LiTransaction.spec.js
@@ -1,4 +1,4 @@
-import { shallow } from 'vue-test-utils'
+import { shallow } from '@vue/test-utils'
 import LiTransaction from 'renderer/components/wallet/LiTransaction'
 
 describe('LiTransaction', () => {

diff --git a/test/unit/specs/components/wallet/PageBalances.spec.js b/test/unit/specs/components/wallet/PageBalances.spec.js
@@ -14,7 +14,9 @@ describe('PageBalances', () => {
     wrapper = instance.wrapper
     store = instance.store
 
-    store.commit('setWalletKey', '123abc456def')
+    store.commit('setWalletKey', {
+      address: '123abc456def'
+    })
     store.commit('setWalletBalances', [{
       denom: 'ATOM',
       amount: 123

diff --git a/test/unit/specs/components/wallet/__snapshots__/PageBalances.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageBalances.spec.js.snap
@@ -120,7 +120,7 @@ exports[`PageBalances has the expected html structure 1`] = `
             <div
               class="value"
             >
-              
+              123abc456def
             </div>
             <menu>
               <button
@@ -421,7 +421,7 @@ exports[`PageBalances should filter the balances 1`] = `
             <div
               class="value"
             >
-              
+              123abc456def
             </div>
             <menu>
               <button

diff --git a/test/unit/specs/store/delegation.spec.js b/test/unit/specs/store/delegation.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { createLocalVue } from 'vue-test-utils'
+import { createLocalVue } from '@vue/test-utils'
 
 let axios = require('axios')
 const Delegation = require('renderer/vuex/modules/delegation').default

diff --git a/test/unit/specs/store/notification.spec.js b/test/unit/specs/store/notification.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { createLocalVue } from 'vue-test-utils'
+import { createLocalVue } from '@vue/test-utils'
 import notifications from 'renderer/vuex/modules/notifications'
 
 const localVue = createLocalVue()

diff --git a/test/unit/specs/store/validators.spec.js b/test/unit/specs/store/validators.spec.js
@@ -1,5 +1,5 @@
 import Vuex from 'vuex'
-import { createLocalVue } from 'vue-test-utils'
+import { createLocalVue } from '@vue/test-utils'
 import mockValidators from './json/validators.json'
 const mockValidatorHash = '1234567890123456789012345678901234567890'
 const mockValidatorHashTwo = '0123456789012345678901234567890123456789'

diff --git a/yarn.lock b/yarn.lock
@@ -30,6 +30,12 @@
   version "8.5.9"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.9.tgz#7155cfb4ae405bca4dd8df1a214c339e939109bf"
 
+"@vue/test-utils@^1.0.0-beta.11":
+  version "1.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.11.tgz#adc18a69d3785da039e60fb77cbc8e968f34ecdd"
+  dependencies:
+    lodash "^4.17.4"
+
 abab@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -8483,12 +8489,6 @@ [email protected], vue-template-es2015-compiler@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
 
-vue-test-utils@^1.0.0-beta.8:
-  version "1.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/vue-test-utils/-/vue-test-utils-1.0.0-beta.11.tgz#41b7fa53e0061d16ecbe18cfeea197c909d4ab8a"
-  dependencies:
-    lodash "^4.17.4"
-
 vue@^2.5.13:
   version "2.5.13"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.13.tgz#95bd31e20efcf7a7f39239c9aa6787ce8cf578e1"
-Original file line number
+Diff line change
@@ Expand Up @@
                 <div
                   class="value"
                 >
+abc456def
                 </div>
                 <menu>
                   <button
@@ Expand Down Expand Up / @@ -421,7 +421,7 @@ exports[`PageBalances should filter the balances 1`] = ` @@
                 <div
                   class="value"
                 >
+abc456def
                 </div>
                 <menu>
                   <button
@@ Expand Down @@