From 2a4e1038124ce5365c0016be2a7b834b630a31f6 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Thu, 3 Oct 2019 17:40:38 +0200
Subject: [PATCH] fix integration tests and paths for client tests

---
 package.json                                  |  8 +++----
 .../groups/POST-groups_groupId_leave.js       |  2 +-
 .../POST-groups_groupId_quests_invite.test.js |  2 +-
 .../{avatar.vue.test.js => avatar.spec.js}    |  4 ++--
 .../{categoryTags.js => categoryTags.spec.js} |  2 +-
 ...lengeDetail.js => challengeDetail.spec.js} |  4 ++--
 .../{membersModal.js => membersModal.spec.js} |  4 +---
 ...memberDetails.js => memberDetails.spec.js} |  2 +-
 ...notifications.js => notifications.spec.js} |  8 +++----
 ...debarSection.js => sidebarSection.spec.js} |  2 +-
 .../tasks/{column.js => column.spec.js}       |  8 ++-----
 .../ui/{drawer.js => drawer.spec.js}          |  2 +-
 website/client/tests/unit/example.spec.js     | 13 ------------
 .../unit/filters/{floor.js => floor.spec.js}  |  2 +-
 .../unit/filters/{round.js => round.spec.js}  |  2 +-
 ...undBigNumber.js => roundBigNumber.spec.js} |  2 +-
 ...asyncResource.js => asyncResource.spec.js} |  4 ++--
 .../{deepFreeze.js => deepFreeze.spec.js}     |  2 +-
 ...ghlightUsers.js => highlightUsers.spec.js} |  2 +-
 .../tests/unit/libs/{i18n.js => i18n.spec.js} |  4 ++--
 .../unit/libs/{store.js => store.spec.js}     |  4 ++--
 .../{filterTasks.js => filterTasks.spec.js}   |  2 +-
 .../{orderTasks.js => orderTasks.spec.js}     |  2 +-
 ...psUtilities.js => groupsUtilities.spec.js} |  6 +++---
 .../store/actions/{shops.js => shops.spec.js} |  8 +++----
 .../store/actions/{tasks.js => tasks.spec.js} |  2 +-
 .../store/actions/{user.js => user.spec.js}   |  2 +-
 .../members/{hasClass.js => hasClass.spec.js} |  2 +-
 .../tasks/{canDelete.js => canDelete.spec.js} |  2 +-
 .../{getTagsFor.js => getTagsFor.spec.js}     |  2 +-
 ...tTaskClasses.js => getTaskClasses.spec.js} |  2 +-
 .../tasks/{getTasks.js => getTasks.spec.js}   |  2 +-
 .../user/{user.test.js => user.spec.js}       |  2 +-
 .../unit/store/{store.js => store.spec.js}    |  4 ++--
 website/client_old/.babelrc                   | 21 -------------------
 website/client_old/.eslintrc                  | 13 ------------
 website/client_old/README.md                  | 21 -------------------
 37 files changed, 50 insertions(+), 126 deletions(-)
 rename website/client/tests/unit/components/{avatar.vue.test.js => avatar.spec.js} (98%)
 rename website/client/tests/unit/components/categories/{categoryTags.js => categoryTags.spec.js} (95%)
 rename website/client/tests/unit/components/challenges/{challengeDetail.js => challengeDetail.spec.js} (91%)
 rename website/client/tests/unit/components/groups/{membersModal.js => membersModal.spec.js} (82%)
 rename website/client/tests/unit/components/{memberDetails.js => memberDetails.spec.js} (88%)
 rename website/client/tests/unit/components/{notifications.js => notifications.spec.js} (95%)
 rename website/client/tests/unit/components/{sidebarSection.js => sidebarSection.spec.js} (95%)
 rename website/client/tests/unit/components/tasks/{column.js => column.spec.js} (97%)
 rename website/client/tests/unit/components/ui/{drawer.js => drawer.spec.js} (88%)
 delete mode 100644 website/client/tests/unit/example.spec.js
 rename website/client/tests/unit/filters/{floor.js => floor.spec.js} (78%)
 rename website/client/tests/unit/filters/{round.js => round.spec.js} (78%)
 rename website/client/tests/unit/filters/{roundBigNumber.js => roundBigNumber.spec.js} (88%)
 rename website/client/tests/unit/libs/{asyncResource.js => asyncResource.spec.js} (97%)
 rename website/client/tests/unit/libs/{deepFreeze.js => deepFreeze.spec.js} (90%)
 rename website/client/tests/unit/libs/{highlightUsers.js => highlightUsers.spec.js} (94%)
 rename website/client/tests/unit/libs/{i18n.js => i18n.spec.js} (85%)
 rename website/client/tests/unit/libs/{store.js => store.spec.js} (96%)
 rename website/client/tests/unit/libs/store/helpers/{filterTasks.js => filterTasks.spec.js} (97%)
 rename website/client/tests/unit/libs/store/helpers/{orderTasks.js => orderTasks.spec.js} (96%)
 rename website/client/tests/unit/mixins/{groupsUtilities.js => groupsUtilities.spec.js} (90%)
 rename website/client/tests/unit/store/actions/{shops.js => shops.spec.js} (82%)
 rename website/client/tests/unit/store/actions/{tasks.js => tasks.spec.js} (97%)
 rename website/client/tests/unit/store/actions/{user.js => user.spec.js} (97%)
 rename website/client/tests/unit/store/getters/members/{hasClass.js => hasClass.spec.js} (95%)
 rename website/client/tests/unit/store/getters/tasks/{canDelete.js => canDelete.spec.js} (91%)
 rename website/client/tests/unit/store/getters/tasks/{getTagsFor.js => getTagsFor.spec.js} (89%)
 rename website/client/tests/unit/store/getters/tasks/{getTaskClasses.js => getTaskClasses.spec.js} (99%)
 rename website/client/tests/unit/store/getters/tasks/{getTasks.js => getTasks.spec.js} (98%)
 rename website/client/tests/unit/store/getters/user/{user.test.js => user.spec.js} (94%)
 rename website/client/tests/unit/store/{store.js => store.spec.js} (64%)
 delete mode 100644 website/client_old/.babelrc
 delete mode 100644 website/client_old/.eslintrc
 delete mode 100644 website/client_old/README.md

diff --git a/package.json b/package.json
index bbeb24937e..3b0a2871d9 100644
--- a/package.json
+++ b/package.json
@@ -87,11 +87,9 @@
     "test:nodemon": "gulp test:nodemon",
     "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html",
     "sprites": "gulp sprites:compile",
-    "client:dev": "node webpack/dev-server.js",
-    "client:build": "gulp build:client",
-    "client:unit": "cross-env NODE_ENV=test karma start test/client/unit/karma.conf.js --single-run",
-    "client:unit:watch": "cross-env NODE_ENV=test karma start test/client/unit/karma.conf.js",
-    "client:test": "npm run client:unit",
+    "client:dev": "cd website/client && npm run serve",
+    "client:build": "cd website/client && npm run build",
+    "client:unit": "cd website/client && npm run test:unit",
     "start": "gulp nodemon",
     "postinstall": "gulp build",
     "apidoc": "gulp apidoc"
diff --git a/test/api/v3/integration/groups/POST-groups_groupId_leave.js b/test/api/v3/integration/groups/POST-groups_groupId_leave.js
index 65d76f4714..f8636662da 100644
--- a/test/api/v3/integration/groups/POST-groups_groupId_leave.js
+++ b/test/api/v3/integration/groups/POST-groups_groupId_leave.js
@@ -11,7 +11,7 @@ import {
   each,
 } from 'lodash';
 import { model as User } from '../../../../../website/server/models/user';
-import * as payments from '../../../../../website/server/libs/payments/payments';
+import payments from '../../../../../website/server/libs/payments/payments';
 
 describe('POST /groups/:groupId/leave', () => {
   let typesOfGroups = {
diff --git a/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js b/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js
index bd4b910c12..a6a3b67e6f 100644
--- a/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js
+++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js
@@ -4,7 +4,7 @@ import {
   sleep,
 } from '../../../../helpers/api-integration/v3';
 import { v4 as generateUUID } from 'uuid';
-import { quests as questScrolls } from '../../../../../website/common/script/content';
+import { quests as questScrolls } from '../../../../../website/common/script/content/quests';
 import { chatModel as Chat } from '../../../../../website/server/models/message';
 import apiError from '../../../../../website/server/libs/apiError';
 
diff --git a/website/client/tests/unit/components/avatar.vue.test.js b/website/client/tests/unit/components/avatar.spec.js
similarity index 98%
rename from website/client/tests/unit/components/avatar.vue.test.js
rename to website/client/tests/unit/components/avatar.spec.js
index 8de44ebb21..8f52e8b34b 100644
--- a/website/client/tests/unit/components/avatar.vue.test.js
+++ b/website/client/tests/unit/components/avatar.spec.js
@@ -1,6 +1,6 @@
-import Avatar from 'client/components/avatar';
+import Avatar from '@/components/avatar';
 import Vue from 'vue';
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
 context('avatar.vue', () => {
   let Constructr;
diff --git a/website/client/tests/unit/components/categories/categoryTags.js b/website/client/tests/unit/components/categories/categoryTags.spec.js
similarity index 95%
rename from website/client/tests/unit/components/categories/categoryTags.js
rename to website/client/tests/unit/components/categories/categoryTags.spec.js
index 92ca036a9c..1329c3143d 100644
--- a/website/client/tests/unit/components/categories/categoryTags.js
+++ b/website/client/tests/unit/components/categories/categoryTags.spec.js
@@ -1,7 +1,7 @@
 import {mount} from '@vue/test-utils';
 import Vue from 'vue';
 
-import CategoryTags from 'client/components/categories/categoryTags.vue';
+import CategoryTags from '@/components/categories/categoryTags.vue';
 
 describe('Category Tags', () => {
   let wrapper;
diff --git a/website/client/tests/unit/components/challenges/challengeDetail.js b/website/client/tests/unit/components/challenges/challengeDetail.spec.js
similarity index 91%
rename from website/client/tests/unit/components/challenges/challengeDetail.js
rename to website/client/tests/unit/components/challenges/challengeDetail.spec.js
index 2ae66aec71..0192eafa36 100644
--- a/website/client/tests/unit/components/challenges/challengeDetail.js
+++ b/website/client/tests/unit/components/challenges/challengeDetail.spec.js
@@ -1,6 +1,6 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import ChallengeDetailComponent from 'client/components/challenges/challengeDetail.vue';
-import Store from 'client/libs/store';
+import ChallengeDetailComponent from '@/components/challenges/challengeDetail.vue';
+import Store from '@/libs/store';
 
 const localVue = createLocalVue();
 localVue.use(Store);
diff --git a/website/client/tests/unit/components/groups/membersModal.js b/website/client/tests/unit/components/groups/membersModal.spec.js
similarity index 82%
rename from website/client/tests/unit/components/groups/membersModal.js
rename to website/client/tests/unit/components/groups/membersModal.spec.js
index 43617bdc06..3dda1140fd 100644
--- a/website/client/tests/unit/components/groups/membersModal.js
+++ b/website/client/tests/unit/components/groups/membersModal.spec.js
@@ -1,6 +1,5 @@
 import Vue from 'vue';
-import MembersModalComponent from 'client/components/groups/membersModal.vue';
-/* eslint-disable no-skipped-tests */
+import MembersModalComponent from '@/components/groups/membersModal.vue';
 describe.skip('Members Modal Component', () => {
   describe('Party Sort', () => {
     let CTor;
@@ -29,4 +28,3 @@ describe.skip('Members Modal Component', () => {
     });
   });
 });
-/* eslint-enable no-skipped-tests */
\ No newline at end of file
diff --git a/website/client/tests/unit/components/memberDetails.js b/website/client/tests/unit/components/memberDetails.spec.js
similarity index 88%
rename from website/client/tests/unit/components/memberDetails.js
rename to website/client/tests/unit/components/memberDetails.spec.js
index 09bf13b713..c6334e463f 100644
--- a/website/client/tests/unit/components/memberDetails.js
+++ b/website/client/tests/unit/components/memberDetails.spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import MemberDetailsComponent from 'client/components/memberDetails.vue';
+import MemberDetailsComponent from '@/components/memberDetails.vue';
 
 describe('Members Details Component', () => {
   let CTor;
diff --git a/website/client/tests/unit/components/notifications.js b/website/client/tests/unit/components/notifications.spec.js
similarity index 95%
rename from website/client/tests/unit/components/notifications.js
rename to website/client/tests/unit/components/notifications.spec.js
index be354d38e4..4b799fa5fa 100644
--- a/website/client/tests/unit/components/notifications.js
+++ b/website/client/tests/unit/components/notifications.spec.js
@@ -1,8 +1,8 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-import NotificationsComponent from 'client/components/notifications.vue';
-import Store from 'client/libs/store';
-import { hasClass } from 'client/store/getters/members';
-import { toNextLevel } from 'common/script/statHelpers';
+import NotificationsComponent from '@/components/notifications.vue';
+import Store from '@/libs/store';
+import { hasClass } from '@/store/getters/members';
+import { toNextLevel } from '@/../../common/script/statHelpers';
 
 const localVue = createLocalVue();
 localVue.use(Store);
diff --git a/website/client/tests/unit/components/sidebarSection.js b/website/client/tests/unit/components/sidebarSection.spec.js
similarity index 95%
rename from website/client/tests/unit/components/sidebarSection.js
rename to website/client/tests/unit/components/sidebarSection.spec.js
index 31ad2a33fd..6a119815ae 100644
--- a/website/client/tests/unit/components/sidebarSection.js
+++ b/website/client/tests/unit/components/sidebarSection.spec.js
@@ -1,6 +1,6 @@
 import { mount } from '@vue/test-utils';
 
-import SidebarSection from 'client/components/sidebarSection.vue';
+import SidebarSection from '@/components/sidebarSection.vue';
 
 describe('Sidebar Section', () => {
   let wrapper;
diff --git a/website/client/tests/unit/components/tasks/column.js b/website/client/tests/unit/components/tasks/column.spec.js
similarity index 97%
rename from website/client/tests/unit/components/tasks/column.js
rename to website/client/tests/unit/components/tasks/column.spec.js
index 0791f43248..3def16a20a 100644
--- a/website/client/tests/unit/components/tasks/column.js
+++ b/website/client/tests/unit/components/tasks/column.spec.js
@@ -1,10 +1,6 @@
 import { mount, createLocalVue } from '@vue/test-utils';
-
-import TaskColumn from 'client/components/tasks/column.vue';
-
-import Store from 'client/libs/store';
-
-// eslint-disable no-exclusive-tests
+import TaskColumn from '@/components/tasks/column.vue';
+import Store from '@/libs/store';
 
 const localVue = createLocalVue();
 localVue.use(Store);
diff --git a/website/client/tests/unit/components/ui/drawer.js b/website/client/tests/unit/components/ui/drawer.spec.js
similarity index 88%
rename from website/client/tests/unit/components/ui/drawer.js
rename to website/client/tests/unit/components/ui/drawer.spec.js
index fa252b84d7..471d13a521 100644
--- a/website/client/tests/unit/components/ui/drawer.js
+++ b/website/client/tests/unit/components/ui/drawer.spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import DrawerComponent from 'client/components/ui/drawer.vue';
+import DrawerComponent from '@/components/ui/drawer.vue';
 
 describe('DrawerComponent', () => {
   it('sets the correct default data', () => {
diff --git a/website/client/tests/unit/example.spec.js b/website/client/tests/unit/example.spec.js
deleted file mode 100644
index c585ea333e..0000000000
--- a/website/client/tests/unit/example.spec.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from 'chai'
-import { shallowMount } from '@vue/test-utils'
-import HelloWorld from '@/components/HelloWorld.vue'
-
-describe('HelloWorld.vue', () => {
-  it('renders props.msg when passed', () => {
-    const msg = 'new message'
-    const wrapper = shallowMount(HelloWorld, {
-      propsData: { msg }
-    })
-    expect(wrapper.text()).to.include(msg)
-  })
-})
diff --git a/website/client/tests/unit/filters/floor.js b/website/client/tests/unit/filters/floor.spec.js
similarity index 78%
rename from website/client/tests/unit/filters/floor.js
rename to website/client/tests/unit/filters/floor.spec.js
index 0c1ac29a13..1ca30c0150 100644
--- a/website/client/tests/unit/filters/floor.js
+++ b/website/client/tests/unit/filters/floor.spec.js
@@ -1,4 +1,4 @@
-import floorFilter from 'client/filters/floor';
+import floorFilter from '@/filters/floor';
 
 describe('floor filter', () => {
   it('can floor a decimal number', () => {
diff --git a/website/client/tests/unit/filters/round.js b/website/client/tests/unit/filters/round.spec.js
similarity index 78%
rename from website/client/tests/unit/filters/round.js
rename to website/client/tests/unit/filters/round.spec.js
index 591f647d9e..9de2591304 100644
--- a/website/client/tests/unit/filters/round.js
+++ b/website/client/tests/unit/filters/round.spec.js
@@ -1,4 +1,4 @@
-import roundFilter from 'client/filters/round';
+import roundFilter from '@/filters/round';
 
 describe('round filter', () => {
   it('can round a decimal number', () => {
diff --git a/website/client/tests/unit/filters/roundBigNumber.js b/website/client/tests/unit/filters/roundBigNumber.spec.js
similarity index 88%
rename from website/client/tests/unit/filters/roundBigNumber.js
rename to website/client/tests/unit/filters/roundBigNumber.spec.js
index 948d2da2c6..d9d8596d18 100644
--- a/website/client/tests/unit/filters/roundBigNumber.js
+++ b/website/client/tests/unit/filters/roundBigNumber.spec.js
@@ -1,4 +1,4 @@
-import roundBigNumberFilter from 'client/filters/roundBigNumber';
+import roundBigNumberFilter from '@/filters/roundBigNumber';
 
 describe('round big number filter', () => {
   it('can round a decimal number', () => {
diff --git a/website/client/tests/unit/libs/asyncResource.js b/website/client/tests/unit/libs/asyncResource.spec.js
similarity index 97%
rename from website/client/tests/unit/libs/asyncResource.js
rename to website/client/tests/unit/libs/asyncResource.spec.js
index 059c8cc409..6fd58d8a76 100644
--- a/website/client/tests/unit/libs/asyncResource.js
+++ b/website/client/tests/unit/libs/asyncResource.spec.js
@@ -1,6 +1,6 @@
-import { asyncResourceFactory, loadAsyncResource } from 'client/libs/asyncResource';
+import { asyncResourceFactory, loadAsyncResource } from '@/libs/asyncResource';
 import axios from 'axios';
-import generateStore from 'client/store';
+import generateStore from '@/store';
 import { sleep } from '../../../../helpers/sleep';
 
 describe('async resource', () => {
diff --git a/website/client/tests/unit/libs/deepFreeze.js b/website/client/tests/unit/libs/deepFreeze.spec.js
similarity index 90%
rename from website/client/tests/unit/libs/deepFreeze.js
rename to website/client/tests/unit/libs/deepFreeze.spec.js
index fd9cf559e8..322530d6a1 100644
--- a/website/client/tests/unit/libs/deepFreeze.js
+++ b/website/client/tests/unit/libs/deepFreeze.spec.js
@@ -1,4 +1,4 @@
-import deepFreeze from 'client/libs/deepFreeze';
+import deepFreeze from '@/libs/deepFreeze';
 
 describe('deepFreeze', () => {
   it('deeply freezes an object', () => {
diff --git a/website/client/tests/unit/libs/highlightUsers.js b/website/client/tests/unit/libs/highlightUsers.spec.js
similarity index 94%
rename from website/client/tests/unit/libs/highlightUsers.js
rename to website/client/tests/unit/libs/highlightUsers.spec.js
index a1e24d03d8..f33c416b53 100644
--- a/website/client/tests/unit/libs/highlightUsers.js
+++ b/website/client/tests/unit/libs/highlightUsers.spec.js
@@ -1,4 +1,4 @@
-import {highlightUsers} from '../../../../../website/client/libs/highlightUsers';
+import {highlightUsers} from '@/libs/highlightUsers';
 import habiticaMarkdown from 'habitica-markdown';
 
 describe('highlightUserAndEmail', () => {
diff --git a/website/client/tests/unit/libs/i18n.js b/website/client/tests/unit/libs/i18n.spec.js
similarity index 85%
rename from website/client/tests/unit/libs/i18n.js
rename to website/client/tests/unit/libs/i18n.spec.js
index 8a23a89b63..343ae1d3a6 100644
--- a/website/client/tests/unit/libs/i18n.js
+++ b/website/client/tests/unit/libs/i18n.spec.js
@@ -1,5 +1,5 @@
-import i18n from 'client/libs/i18n';
-import commoni18n from 'common/script/i18n';
+import i18n from '@/libs/i18n';
+import commoni18n from '@/../../common/script/i18n';
 import Vue from 'vue';
 
 describe('i18n plugin', () => {
diff --git a/website/client/tests/unit/libs/store.js b/website/client/tests/unit/libs/store.spec.js
similarity index 96%
rename from website/client/tests/unit/libs/store.js
rename to website/client/tests/unit/libs/store.spec.js
index 77dd9d3b4d..b2cf6bc015 100644
--- a/website/client/tests/unit/libs/store.js
+++ b/website/client/tests/unit/libs/store.spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import StoreModule, { mapState, mapGetters, mapActions } from 'client/libs/store';
-import { flattenAndNamespace } from 'client/libs/store/helpers/internals';
+import StoreModule, { mapState, mapGetters, mapActions } from '@/libs/store';
+import { flattenAndNamespace } from '@/libs/store/helpers/internals';
 
 describe('Store', () => {
   let store;
diff --git a/website/client/tests/unit/libs/store/helpers/filterTasks.js b/website/client/tests/unit/libs/store/helpers/filterTasks.spec.js
similarity index 97%
rename from website/client/tests/unit/libs/store/helpers/filterTasks.js
rename to website/client/tests/unit/libs/store/helpers/filterTasks.spec.js
index 6537f122b2..f7e8f21ffd 100644
--- a/website/client/tests/unit/libs/store/helpers/filterTasks.js
+++ b/website/client/tests/unit/libs/store/helpers/filterTasks.spec.js
@@ -2,7 +2,7 @@ import {
   getTypeLabel,
   getFilterLabels,
   getActiveFilter,
-} from 'client/libs/store/helpers/filterTasks.js';
+} from '@/libs/store/helpers/filterTasks.js';
 
 describe('Filter Category for Tasks', () => {
   describe('getTypeLabel', () => {
diff --git a/website/client/tests/unit/libs/store/helpers/orderTasks.js b/website/client/tests/unit/libs/store/helpers/orderTasks.spec.js
similarity index 96%
rename from website/client/tests/unit/libs/store/helpers/orderTasks.js
rename to website/client/tests/unit/libs/store/helpers/orderTasks.spec.js
index e293fc0f32..c909605bf1 100644
--- a/website/client/tests/unit/libs/store/helpers/orderTasks.js
+++ b/website/client/tests/unit/libs/store/helpers/orderTasks.spec.js
@@ -1,7 +1,7 @@
 import {
   orderSingleTypeTasks,
   // orderMultipleTypeTasks,
-} from 'client/libs/store/helpers/orderTasks.js';
+} from '@/libs/store/helpers/orderTasks.js';
 
 import shuffle from 'lodash/shuffle';
 
diff --git a/website/client/tests/unit/mixins/groupsUtilities.js b/website/client/tests/unit/mixins/groupsUtilities.spec.js
similarity index 90%
rename from website/client/tests/unit/mixins/groupsUtilities.js
rename to website/client/tests/unit/mixins/groupsUtilities.spec.js
index cdfe6e5ea4..07667c9e46 100644
--- a/website/client/tests/unit/mixins/groupsUtilities.js
+++ b/website/client/tests/unit/mixins/groupsUtilities.spec.js
@@ -1,6 +1,6 @@
-import groupsUtilities from 'client/mixins/groupsUtilities';
-import { TAVERN_ID } from 'common/script/constants';
-import generateStore from 'client/store';
+import groupsUtilities from '@/mixins/groupsUtilities';
+import { TAVERN_ID } from '@/../../common/script/constants';
+import generateStore from '@/store';
 import Vue from 'vue';
 
 describe('Groups Utilities Mixin', () => {
diff --git a/website/client/tests/unit/store/actions/shops.js b/website/client/tests/unit/store/actions/shops.spec.js
similarity index 82%
rename from website/client/tests/unit/store/actions/shops.js
rename to website/client/tests/unit/store/actions/shops.spec.js
index 1a72ae44d4..8891bf30d9 100644
--- a/website/client/tests/unit/store/actions/shops.js
+++ b/website/client/tests/unit/store/actions/shops.spec.js
@@ -1,10 +1,10 @@
 import axios from 'axios';
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
-import content from 'common/script/content';
-import getItemInfo from 'common/script/libs/getItemInfo';
+import content from '@/../../common/script/content';
+import getItemInfo from '@/../../common/script/libs/getItemInfo';
 
-import getOfficialPinnedItems from 'common/script/libs/getOfficialPinnedItems';
+import getOfficialPinnedItems from '@/../../common/script/libs/getOfficialPinnedItems';
 
 describe('shops actions', () => {
   let store;
diff --git a/website/client/tests/unit/store/actions/tasks.js b/website/client/tests/unit/store/actions/tasks.spec.js
similarity index 97%
rename from website/client/tests/unit/store/actions/tasks.js
rename to website/client/tests/unit/store/actions/tasks.spec.js
index 8189500fc8..90eb2e859b 100644
--- a/website/client/tests/unit/store/actions/tasks.js
+++ b/website/client/tests/unit/store/actions/tasks.spec.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
 describe('tasks actions', () => {
   let store;
diff --git a/website/client/tests/unit/store/actions/user.js b/website/client/tests/unit/store/actions/user.spec.js
similarity index 97%
rename from website/client/tests/unit/store/actions/user.js
rename to website/client/tests/unit/store/actions/user.spec.js
index f66d803d3f..a66b379648 100644
--- a/website/client/tests/unit/store/actions/user.js
+++ b/website/client/tests/unit/store/actions/user.spec.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
 describe('user actions', () => {
   let store;
diff --git a/website/client/tests/unit/store/getters/members/hasClass.js b/website/client/tests/unit/store/getters/members/hasClass.spec.js
similarity index 95%
rename from website/client/tests/unit/store/getters/members/hasClass.js
rename to website/client/tests/unit/store/getters/members/hasClass.spec.js
index 2aad254f0f..fe705431e7 100644
--- a/website/client/tests/unit/store/getters/members/hasClass.js
+++ b/website/client/tests/unit/store/getters/members/hasClass.spec.js
@@ -1,4 +1,4 @@
-import { hasClass } from 'client/store/getters/members';
+import { hasClass } from '@/store/getters/members';
 
 describe('hasClass getter', () => {
   it('returns false if level < 10', () => {
diff --git a/website/client/tests/unit/store/getters/tasks/canDelete.js b/website/client/tests/unit/store/getters/tasks/canDelete.spec.js
similarity index 91%
rename from website/client/tests/unit/store/getters/tasks/canDelete.js
rename to website/client/tests/unit/store/getters/tasks/canDelete.spec.js
index d40036697b..f136dbe890 100644
--- a/website/client/tests/unit/store/getters/tasks/canDelete.js
+++ b/website/client/tests/unit/store/getters/tasks/canDelete.spec.js
@@ -1,4 +1,4 @@
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
 describe('canDelete getter', () => {
   it('cannot delete active challenge task', () => {
diff --git a/website/client/tests/unit/store/getters/tasks/getTagsFor.js b/website/client/tests/unit/store/getters/tasks/getTagsFor.spec.js
similarity index 89%
rename from website/client/tests/unit/store/getters/tasks/getTagsFor.js
rename to website/client/tests/unit/store/getters/tasks/getTagsFor.spec.js
index 6e8ccbd353..7ea67475a7 100644
--- a/website/client/tests/unit/store/getters/tasks/getTagsFor.js
+++ b/website/client/tests/unit/store/getters/tasks/getTagsFor.spec.js
@@ -1,4 +1,4 @@
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
 describe('getTagsFor getter', () => {
   it('returns the tags for a task', () => {
diff --git a/website/client/tests/unit/store/getters/tasks/getTaskClasses.js b/website/client/tests/unit/store/getters/tasks/getTaskClasses.spec.js
similarity index 99%
rename from website/client/tests/unit/store/getters/tasks/getTaskClasses.js
rename to website/client/tests/unit/store/getters/tasks/getTaskClasses.spec.js
index b0c25dec7b..280b09c6c0 100644
--- a/website/client/tests/unit/store/getters/tasks/getTaskClasses.js
+++ b/website/client/tests/unit/store/getters/tasks/getTaskClasses.spec.js
@@ -1,4 +1,4 @@
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
 describe('getTaskClasses getter', () => {
   let store, getTaskClasses;
diff --git a/website/client/tests/unit/store/getters/tasks/getTasks.js b/website/client/tests/unit/store/getters/tasks/getTasks.spec.js
similarity index 98%
rename from website/client/tests/unit/store/getters/tasks/getTasks.js
rename to website/client/tests/unit/store/getters/tasks/getTasks.spec.js
index 1de50b15cc..058138ddfd 100644
--- a/website/client/tests/unit/store/getters/tasks/getTasks.js
+++ b/website/client/tests/unit/store/getters/tasks/getTasks.spec.js
@@ -1,4 +1,4 @@
-import generateStore from 'client/store';
+import generateStore from '@/store';
 
 describe('Store Getters for Tasks', () => {
   let store, habits, dailys, todos, rewards;
diff --git a/website/client/tests/unit/store/getters/user/user.test.js b/website/client/tests/unit/store/getters/user/user.spec.js
similarity index 94%
rename from website/client/tests/unit/store/getters/user/user.test.js
rename to website/client/tests/unit/store/getters/user/user.spec.js
index 1686095161..d241dda06e 100644
--- a/website/client/tests/unit/store/getters/user/user.test.js
+++ b/website/client/tests/unit/store/getters/user/user.spec.js
@@ -1,4 +1,4 @@
-import { data, gems, buffs, preferences, tasksOrder } from 'client/store/getters/user';
+import { data, gems, buffs, preferences, tasksOrder } from '@/store/getters/user';
 
 context('user getters', () => {
   describe('data', () => {
diff --git a/website/client/tests/unit/store/store.js b/website/client/tests/unit/store/store.spec.js
similarity index 64%
rename from website/client/tests/unit/store/store.js
rename to website/client/tests/unit/store/store.spec.js
index 53f9dd4a40..22cc36c547 100644
--- a/website/client/tests/unit/store/store.js
+++ b/website/client/tests/unit/store/store.spec.js
@@ -1,5 +1,5 @@
-import generateStore from 'client/store';
-import Store from 'client/libs/store';
+import generateStore from '@/store';
+import Store from '@/libs/store';
 
 describe('Application store', () => {
   it('is an instance of Store', () => {
diff --git a/website/client_old/.babelrc b/website/client_old/.babelrc
deleted file mode 100644
index 9f639b0b76..0000000000
--- a/website/client_old/.babelrc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "env": {
-    "test": {
-      "presets": [
-        ["es2015"],
-      ],
-      plugins: [
-        ["istanbul"],
-      ],
-    },
-  },
-  "presets": [
-    ["es2015", { modules: false }]
-  ],
-  "plugins": [
-    "transform-object-rest-spread",
-    "syntax-async-functions",
-    "syntax-dynamic-import",
-    "transform-regenerator",
-  ],
-}
\ No newline at end of file
diff --git a/website/client_old/.eslintrc b/website/client_old/.eslintrc
deleted file mode 100644
index 124afd6036..0000000000
--- a/website/client_old/.eslintrc
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": [
-    "habitrpg/browser",
-    "habitrpg/esnext"
-  ],
-  "plugins": [
-    "html"
-  ],
-  "parser": "babel-eslint",
-  "rules": {
-    "strict": 0
-  }
-}
\ No newline at end of file
diff --git a/website/client_old/README.md b/website/client_old/README.md
deleted file mode 100644
index 435b1f5c1e..0000000000
--- a/website/client_old/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Running
-For information about installing and running Habitica locally, see [Setting up Habitica Locally](http://habitica.fandom.com/wiki/Setting_up_Habitica_Locally).
-
-# Preparation Reading
-- Vue 2 (https://vuejs.org)
-
-- Webpack (https://webpack.github.io/) is the build system and it includes plugins for code transformation, right now we have: BabelJS for ES6 transpilation, eslint for code style, less and postcss for css compilation. The code comes from https://github.com/vuejs-templates/webpack which is a Webpack template for Vue, with some small modifications to adapt it to our use case. Docs http://vuejs-templates.github.io/webpack/
-
-- We're using `.vue` files that make it possible to have HTML, JS and CSS for each component together in a single location. They're implemented as a webpack plugin and the docs can be found here http://vue-loader.vuejs.org/en/
-
-- SemanticUI is the UI framework http://semantic-ui.com/. So far I've only used the CSS part, it also has JS plugins but I've yet to use them. It supports theming so if it's not too difficult we'll want to customize the base theme with our own styles instead of writing CSS rules to override the original styling.
-
-The code is in `/website/client`. We're using something very similar to Vuex (equivalent of React's Redux) for state management http://vuex.vuejs.org/en/index.html
-
-The API is almost the same except that we don't use mutations but only actions because it would make it difficult to work with common code
-
-The project is developed directly in the `develop` branch as long as we'll be able to avoid splitting it into a different branch.
-
-So far most of the work has been on the template, so there's no complex logic to understand. The only thing I would suggest you to read about is Vuex for data management: it's basically a Flux implementation: there's a central store that hold the data for the entire app, and every change to the data must happen through an action, the data cannot be mutated directly.
-
-For further resources, see [Guidance for Blacksmiths](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths), and in particular the ["Website Technology Stack" section](http://habitica.fandom.com/wiki/Guidance_for_Blacksmiths#Website_Technology_Stack).