fix: apply code tweaks and add minor tweaks

ambianic · Jun 7, 2020 · 313f549 · 313f549
1 parent 320737e
commit 313f549
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 11 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -13,11 +13,9 @@ module.exports = {
   plugins: [
     ['transform-imports', {
       vuetify: {
-        //        'transform': 'vuetify/es5/components/',
         transform: 'vuetify/es5/components/${member}', // eslint-disable-line no-template-curly-in-string
         preventFullImport: false
       }
     }]
-    // ['istanbul']
   ]
 }
diff --git a/jest.config.js b/jest.config.js
@@ -10,7 +10,7 @@ module.exports = {
   moduleFileExtensions: ['js', 'vue', 'json'],
   transform: {
     '^.+\\.js$': 'babel-jest',
-    '.*\\.(vue)$': 'vue-jest'
+    '.*\\.vue$': 'vue-jest'
   },
   collectCoverage: true,
   collectCoverageFrom: [

diff --git a/package.json b/package.json
@@ -67,6 +67,7 @@
     "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
     "vue-cli-plugin-vuetify": "^2.0.5",
+    "vue-jest": "^3.0.5",
     "vue-template-compiler": "^2.6.10",
     "vuetify-loader": "^1.3.1"
   },

diff --git a/src/App.vue b/src/App.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import AmbAppFrame from './components/AppFrame.vue'
+import AmbAppFrame from '@/components/AppFrame.vue'
 export default {
   name: 'App',
   components: {

diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import UpdateNotification from '../components/UpdateNotification'
+import UpdateNotification from '@/components/UpdateNotification'
 
 export default {
   name: 'Home',

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -261,7 +261,7 @@
   </v-container>
 </template>
 <script>
-import AmbBanner from '../components/shared/Banner.vue'
+import AmbBanner from '@/components/shared/Banner.vue'
 import AmbListItem from '@/components/shared/ListItem.vue'
 import { mapActions, mapState } from 'vuex'
 import {

diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
@@ -261,7 +261,7 @@
 <script>
 /* eslint no-console: ["error", { allow: ["warn", "error"] }] */
 import InfiniteLoading from 'vue-infinite-loading'
-import DetectionBoxes from '../components/DetectionBoxes.vue'
+import DetectionBoxes from '@/components/DetectionBoxes.vue'
 import { EdgeAPI } from '@/remote/edgeAPI'
 import { mapState } from 'vuex'
 import moment from 'moment'

diff --git a/tests/unit/components/shared/Banner.spec.js b/tests/unit/components/shared/Banner.spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount, createLocalVue } from '@vue/test-utils'
 import Vuetify from 'vuetify'
-import Banner from '@/components/Banner.vue'
+import Banner from '@/components/shared/Banner.vue'
 
 describe('Banner', () => {
   let wrapper

diff --git a/tests/unit/components/shared/Button.spec.js b/tests/unit/components/shared/Button.spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { mount, createLocalVue } from '@vue/test-utils'
 import Vuetify from 'vuetify'
-import Button from '@/components/Button.vue'
+import Button from '@/components/shared/Button.vue'
 
 describe('Button', () => {
   let wrapper

diff --git a/tests/unit/navbar.spec.js b/tests/unit/navbar.spec.js
@@ -3,7 +3,7 @@ import { mount, createLocalVue } from '@vue/test-utils'
 import Vuetify from 'vuetify'
 import VueX from 'vuex'
 import VueRouter from 'vue-router'
-import NavBar from '../../src/components/NavBar.vue'
+import NavBar from '@/components/NavBar.vue'
 
 describe('NavBar', () => {
 // global

diff --git a/tests/unit/settings.spec.js b/tests/unit/settings.spec.js
@@ -3,7 +3,7 @@ import { mount, createLocalVue } from '@vue/test-utils'
 import Vuetify from 'vuetify'
 import VueX from 'vuex'
 import VueRouter from 'vue-router'
-import Settings from '../../src/views/Settings.vue'
+import Settings from '@/views/Settings.vue'
 
 describe('NavBar', () => {
 // global