chore: merge develop to master

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   test-node-11:
     working_directory: ~/new-desktop-wallet
     docker:
-      - image: circleci/node:11.10.1-browsers
+      - image: circleci/node:11-browsers
     steps:
       - checkout
       - run:
@@ -23,9 +23,6 @@ jobs:
       - run:
           name: Unit tests
           command: yarn test:unit --ci --coverage --maxWorkers 4
-      - run:
-          name: e2e tests
-          command: yarn test:e2e:full --coverage
       - run:
           name: Lint
           command: yarn lint

__tests__/e2e.jest.conf.js

@@ -20,6 +20,6 @@ module.exports = {
     '<rootDir>/__tests__/e2e/pages',
     '<rootDir>/__tests__/unit'
   ],
-  setupTestFrameworkScriptFile: 'jest-extended',
+  setupFilesAfterEnv: ['jest-extended'],
   watchman: false
 }

__tests__/unit.jest.conf.js

@@ -37,6 +37,6 @@ module.exports = {
   collectCoverageFrom: [
     'src/renderer/**/*.{js,vue}'
   ],
-  setupTestFrameworkScriptFile: 'jest-extended',
+  setupFilesAfterEnv: ['jest-extended'],
   watchman: false
 }

__tests__/unit/__mocks__/@ledgerhq/hw-transport-node-hid.js → __tests__/unit/__mocks__/@ledgerhq/hw-transport-node-hid-singleton.js

@@ -1,7 +1,8 @@
 export default {
   create: jest.fn(() => {
     return {
-      close: jest.fn()
+      close: jest.fn(),
+      disconected: false
     }
   })
 }

__tests__/unit/components/Modal/ModalExportWallets.spec.js

@@ -0,0 +1,76 @@
+import Vue from 'vue'
+import Vuelidate from 'vuelidate'
+import { shallowMount } from '@vue/test-utils'
+import useI18nGlobally from '../../__utils__/i18n'
+import ModalExportWallets from '@/components/Modal/ModalExportWallets'
+import StringMixin from '@/mixins/strings'
+import WalletMixin from '@/mixins/wallet'
+
+Vue.use(Vuelidate)
+
+const i18n = useI18nGlobally()
+
+describe('ModalExportWallets', () => {
+  const mountComponent = () => {
+    const wallets = [
+      { address: 'A1', name: null, balance: 0 },
+      { address: 'A2', name: '', balance: 1 },
+      { address: 'A3', name: 'wallet_a3', balance: 0 },
+      { address: 'A4', name: 'wallet_a4', balance: 1 }
+    ]
+
+    const ledgerWallets = [
+      { address: 'A5', name: null, balance: 0 },
+      { address: 'A6', name: 'ledger_a6', balance: 1 }
+    ]
+
+    return shallowMount(ModalExportWallets, {
+      i18n,
+      mixins: [StringMixin, WalletMixin],
+      mocks: {
+        session_network: {
+          knownWallets: {}
+        },
+        $store: {
+          getters: {
+            'delegate/byAddress': jest.fn(),
+            'wallet/contactsByProfileId': () => [],
+            'wallet/byProfileId': () => wallets,
+            'ledger/wallets': () => ledgerWallets
+          }
+        }
+      }
+    })
+  }
+
+  it('should render modal', () => {
+    const wrapper = mountComponent()
+    expect(wrapper.isVueInstance()).toBeTrue()
+  })
+
+  describe('toggleOption', () => {
+    it('should exclude empty wallets', () => {
+      const wrapper = mountComponent()
+      wrapper.vm.toggleOption('excludeEmpty')
+
+      const walletsWithBalance = [
+        { address: 'A2', name: '', balance: 1 },
+        { address: 'A4', name: 'wallet_a4', balance: 1 }
+      ]
+
+      expect(wrapper.vm.wallets).toEqual(walletsWithBalance)
+    })
+
+    it('should exclude wallets with no name', () => {
+      const wrapper = mountComponent()
+      wrapper.vm.toggleOption('excludeUnnamed')
+
+      const walletsWithName = [
+        { address: 'A3', name: 'wallet_a3', balance: 0 },
+        { address: 'A4', name: 'wallet_a4', balance: 1 }
+      ]
+
+      expect(wrapper.vm.wallets).toEqual(walletsWithName)
+    })
+  })
+})

__tests__/unit/components/Network/NetworkCustomPeer.spec.js → __tests__/unit/components/Network/NetworkCustomPeerModal.spec.js

@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils'
 import { useI18nGlobally } from '../../__utils__/i18n'
 import Vue from 'vue'
 import Vuelidate from 'vuelidate'
-import { NetworkCustomPeer } from '@/components/Network'
+import { NetworkCustomPeerModal } from '@/components/Network'
 
 const i18n = useI18nGlobally()
 
@@ -16,9 +16,9 @@ const mocks = {
 
 Vue.use(Vuelidate)
 
-describe('NetworkCustomPeer', () => {
+describe('NetworkCustomPeerModal', () => {
   it('should render modal', () => {
-    const wrapper = shallowMount(NetworkCustomPeer, {
+    const wrapper = shallowMount(NetworkCustomPeerModal, {
       i18n,
       mocks
     })

__tests__/unit/components/Wallet/WalletButtons/WalletButtonAdditionalLedgers.spec.js → __tests__/unit/components/Wallet/WalletButtons/WalletButtonLedgerSettings.spec.js

@@ -1,11 +1,11 @@
 import { shallowMount } from '@vue/test-utils'
 import useI18nGlobally from '../../../__utils__/i18n'
-import { WalletButtonAdditionalLedgers } from '@/components/Wallet/WalletButtons'
+import { WalletButtonLedgerSettings } from '@/components/Wallet/WalletButtons'
 
 const i18n = useI18nGlobally()
 let wrapper
 beforeEach(() => {
-  wrapper = shallowMount(WalletButtonAdditionalLedgers, {
+  wrapper = shallowMount(WalletButtonLedgerSettings, {
     i18n,
     mocks: {
       $store: {
@@ -19,8 +19,8 @@ beforeEach(() => {
   })
 })
 
-describe('WalletButtonAdditionalLedgers', () => {
-  it('should render modal', () => {
+describe('WalletButtonLedgerSettings', () => {
+  it('should render', () => {
     expect(wrapper.isVueInstance()).toBeTrue()
   })
 })