Upgrade dependencies

package.json

@@ -32,7 +32,7 @@
     "skinview3d": "^1.1.0",
     "sweetalert2": "^7.26.9",
     "toastr": "^2.1.4",
-    "vue": "^2.5.16",
+    "vue": "^2.5.17",
     "vue-good-table": "^2.12.2",
     "vue-upload-component": "^2.8.11",
     "vuejs-paginate": "^2.0.1"
@@ -61,7 +61,7 @@
     "cssnano": "^4.0.4",
     "csso-loader": "^0.3.1",
     "eslint": "^5.2.0",
-    "eslint-formatter-beauty": "^3.0.0-beta.2",
+    "eslint-formatter-beauty": "^3.0.0",
     "eslint-plugin-vue": "^5.0.0-beta.1",
     "execa": "^0.11.0",
     "file-loader": "^1.1.11",
@@ -78,7 +78,7 @@
     "url-loader": "^1.0.1",
     "vue-jest": "^2.6.0",
     "vue-loader": "^15.2.6",
-    "vue-template-compiler": "^2.5.16",
+    "vue-template-compiler": "^2.5.17",
     "webpack": "^4.16.3",
     "webpack-bundle-analyzer": "^2.13.1",
     "webpack-cli": "^3.1.0",

resources/assets/tests/components/auth/Forgot.test.js

@@ -6,7 +6,7 @@ test('click to refresh captcha', () => {
     jest.spyOn(Date, 'now');
     const wrapper = mount(Forgot);
     wrapper.find('img').trigger('click');
-    expect(Date.now).toHaveBeenCalledTimes(2);
+    expect(Date.now).toBeCalledTimes(2);
 });
 
 test('submit forgot form', async () => {
@@ -42,7 +42,7 @@ test('submit forgot form', async () => {
         { email: 'a@b.c', captcha: 'captcha' }
     );
     expect(warning.text()).toBe('fail');
-    expect(Date.now).toHaveBeenCalledTimes(2);
+    expect(Date.now).toBeCalledTimes(2);
 
     button.trigger('click');
     await wrapper.vm.$nextTick();

resources/assets/tests/components/auth/Login.test.js

@@ -16,7 +16,7 @@ test('click to refresh captcha', () => {
     jest.spyOn(Date, 'now');
     const wrapper = mount(Login);
     wrapper.find('img').trigger('click');
-    expect(Date.now).toHaveBeenCalledTimes(2);
+    expect(Date.now).toBeCalledTimes(2);
 });
 
 test('login', async () => {

resources/assets/tests/components/auth/Register.test.js

@@ -11,7 +11,7 @@ test('click to refresh captcha', () => {
     jest.spyOn(Date, 'now');
     const wrapper = mount(Register);
     wrapper.find('img').trigger('click');
-    expect(Date.now).toHaveBeenCalledTimes(2);
+    expect(Date.now).toBeCalledTimes(2);
 });
 
 test('require player name', () => {
@@ -86,7 +86,7 @@ test('register', async () => {
         }
     );
     expect(warning.text()).toBe('fail');
-    expect(Date.now).toHaveBeenCalledTimes(2);
+    expect(Date.now).toBeCalledTimes(2);
 
     button.trigger('click');
     await wrapper.vm.$nextTick();

resources/assets/tests/components/skinlib/List.test.js

@@ -146,7 +146,7 @@ test('reset all filters', async () => {
 
     Vue.prototype.$http.get.mockClear();
     wrapper.find('.btn-warning').trigger('click');
-    expect(Vue.prototype.$http.get).toHaveBeenCalledTimes(1);
+    expect(Vue.prototype.$http.get).toBeCalledTimes(1);
 });
 
 test('is anonymous', () => {

resources/assets/tests/components/user/Closet.test.js

@@ -129,7 +129,7 @@ test('reload closet when page changed', () => {
     const wrapper = mount(Closet);
     wrapper.vm.pageChanged();
     jest.runAllTicks();
-    expect(Vue.prototype.$http.get).toHaveBeenCalledTimes(2);
+    expect(Vue.prototype.$http.get).toBeCalledTimes(2);
 });
 
 test('remove skin item', () => {
@@ -273,7 +273,7 @@ test('reset selected texture', () => {
 });
 
 test('select specified texture initially', async () => {
-    window.history.pushState({}, 'title', 'about:blank?tid=1');
+    window.history.pushState({}, 'title', `${location.href}?tid=1`);
     window.$ = jest.fn(() => ({
         modal() {},
         iCheck: () => ({
@@ -297,5 +297,4 @@ test('select specified texture initially', async () => {
     jest.runAllTimers();
     await wrapper.vm.$nextTick();
     jest.unmock('@/js/utils');
-    window.history.pushState({}, 'title', 'about:blank');
 });

resources/assets/tests/components/user/Players.test.js

@@ -191,7 +191,7 @@ test('add player', async () => {
 
     button.trigger('click');
     await flushPromises();
-    expect(Vue.prototype.$http.get).toHaveBeenCalledTimes(2);
+    expect(Vue.prototype.$http.get).toBeCalledTimes(2);
 });
 
 test('clear texture', async () => {

resources/assets/tests/js/event.test.js

@@ -13,6 +13,6 @@ test('add listener and emit event', () => {
 
     emitter.emit('a');
 
-    expect(mockA).toHaveBeenCalledTimes(1);
+    expect(mockA).toBeCalledTimes(1);
     expect(mockB).not.toBeCalled();
 });

resources/assets/tests/js/utils.test.js

@@ -12,7 +12,7 @@ test('debounce', () => {
 });
 
 test('queryString', () => {
-    history.pushState({}, 'page', 'about:blank?key=value');
+    history.pushState({}, 'page', `${location.href}?key=value`);
     expect(utils.queryString('key')).toBe('value');
     expect(utils.queryString('a')).toBeUndefined();
     expect(utils.queryString('a', 'b')).toBe('b');