Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fabo/415 fix tests #416

Merged
merged 4 commits into from
Jan 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ npm-debug.log
npm-debug.log.*
thumbs.db
!.gitkeep
.vscode
.vscode/*
18 changes: 0 additions & 18 deletions .vscode/launch.json

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/unit/helpers/vuex-setup.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NISession.spec.js
Original file line number Diff line number Diff line change
@@ -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({})

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiCards.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiConnectivity.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiDataEmpty.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiDataEmptyTx.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiDataError.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiDataLoading.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiDataMsg.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiFieldAddon.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiFieldGroup.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiFieldSeed.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiFieldVote.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiFormGroup.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiFormMsg.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiFormStruct.spec.js
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiLiCopy.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiLiCopy from 'common/NiLiCopy'

describe('NiLiCopy', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiLiSession.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { shallow } from 'vue-test-utils'
import { shallow } from '@vue/test-utils'
import NiLiSession from 'common/NiLiSession'

describe('NiLiSession', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiListItem.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiListItem from 'common/NiListItem'

describe('NiListItem', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiModal.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiModal from 'common/NiModal'

describe('NiModal', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiPage.spec.js
Original file line number Diff line number Diff line change
@@ -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({})
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiPageFooter.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiPageFooter from 'common/NiPageFooter'

describe('NiPageFooter', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiPageHeader.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiPageHeader from 'common/NiPageHeader'

describe('NiPageHeader', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiPart.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiPart from 'common/NiPart'

describe('NiPart', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiTabBar.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiTabBar from 'common/NiTabBar'

describe('NiTabBar', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/NiTag.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mount } from 'vue-test-utils'
import { mount } from '@vue/test-utils'
import NiTag from 'common/NiTag'

describe('NiTag', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/common/ToggleBtn.spec.js
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/wallet/CardBalance.spec.js
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/components/wallet/LiTransaction.spec.js
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
4 changes: 3 additions & 1 deletion test/unit/specs/components/wallet/PageBalances.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ exports[`PageBalances has the expected html structure 1`] = `
<div
class="value"
>

123abc456def
</div>
<menu>
<button
Expand Down Expand Up @@ -421,7 +421,7 @@ exports[`PageBalances should filter the balances 1`] = `
<div
class="value"
>

123abc456def
</div>
<menu>
<button
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/store/delegation.spec.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/store/notification.spec.js
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/store/validators.spec.js
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down