
diff --git a/components/table/__tests__/Table.pagination.test.js b/components/table/__tests__/Table.pagination.test.js
index ead27fb76..cc11807c0 100644
--- a/components/table/__tests__/Table.pagination.test.js
+++ b/components/table/__tests__/Table.pagination.test.js
@@ -76,17 +76,14 @@ describe('Table.pagination', () => {
});
});
- it('paginate data', done => {
+ it('paginate data', async () => {
const wrapper = mount(Table, getTableOptions());
- Vue.nextTick(() => {
- expect(renderedNames(wrapper)).toEqual(['Jack', 'Lucy']);
- const pager = wrapper.findAllComponents({ name: 'Pager' });
- pager.at(pager.length - 1).trigger('click');
- Vue.nextTick(() => {
- expect(renderedNames(wrapper)).toEqual(['Tom', 'Jerry']);
- done();
- });
- });
+ await sleep();
+ expect(renderedNames(wrapper)).toEqual(['Jack', 'Lucy']);
+ const pager = wrapper.findAllComponents({ name: 'Pager' });
+ pager.at(pager.length - 1).trigger('click');
+ await sleep();
+ expect(renderedNames(wrapper)).toEqual(['Tom', 'Jerry']);
});
it('repaginates when pageSize change', () => {
diff --git a/components/table/__tests__/Table.rowSelection.test.js b/components/table/__tests__/Table.rowSelection.test.js
index 455c9bc7a..881ba28a2 100644
--- a/components/table/__tests__/Table.rowSelection.test.js
+++ b/components/table/__tests__/Table.rowSelection.test.js
@@ -260,7 +260,7 @@ describe('Table.rowSelection', () => {
expect(handleSelectInvert).toBeCalledWith([1, 2, 3]);
});
- it('fires selection event', () => {
+ it('fires selection event', async () => {
const handleSelectOdd = jest.fn();
const handleSelectEven = jest.fn();
const rowSelection = {
@@ -289,6 +289,7 @@ describe('Table.rowSelection', () => {
},
{ sync: false },
);
+ await sleep();
expect(dropdownWrapper.findAll('.ant-dropdown-menu-item').length).toBe(4);
dropdownWrapper.findAll('.ant-dropdown-menu-item')[2].trigger('click');
@@ -399,6 +400,7 @@ describe('Table.rowSelection', () => {
dataSource: newData,
}),
);
+ await sleep();
const pager = wrapper.findAllComponents({ name: 'Pager' });
pager.at(pager.length - 1).trigger('click'); // switch to second page
wrapper.findAll('input')[0].element.checked = true;
diff --git a/components/time-picker/__tests__/__snapshots__/demo.test.js.snap b/components/time-picker/__tests__/__snapshots__/demo.test.js.snap
index 44b3acbea..8beb8377c 100644
--- a/components/time-picker/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/time-picker/__tests__/__snapshots__/demo.test.js.snap
@@ -147,7 +147,7 @@ exports[`renders ./components/time-picker/demo/value.vue correctly 1`] = `
Do not change
`;
diff --git a/package.json b/package.json
index f8011ea9c..2f8610fb5 100644
--- a/package.json
+++ b/package.json
@@ -188,6 +188,7 @@
"prettier": "^2.2.0",
"pretty-quick": "^3.0.0",
"prismjs": "^1.23.0",
+ "query-string": "^7.0.1",
"querystring": "^0.2.0",
"raw-loader": "^4.0.2",
"reqwest": "^2.0.5",
diff --git a/site/src/router/index.js b/site/src/router/index.js
index 7df3844d1..edde97b6a 100644
--- a/site/src/router/index.js
+++ b/site/src/router/index.js
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-unresolved */
import Layout from '../layouts/index.vue';
import Iframe from '../layouts/Iframe.vue';
// import Iframe from '../components/iframe.jsx';
diff --git a/site/src/views/user/login/model.js b/site/src/views/user/login/model.js
index 9ca999954..cf8510132 100644
--- a/site/src/views/user/login/model.js
+++ b/site/src/views/user/login/model.js
@@ -1,5 +1,5 @@
-import router from '../../../router';
import { parse } from 'query-string';
+import router from '../../../router';
import { fakeAccountLogin } from './service';
export default {
diff --git a/tests/shared/demoTest.js b/tests/shared/demoTest.js
index a225938d4..e82fe1b3f 100644
--- a/tests/shared/demoTest.js
+++ b/tests/shared/demoTest.js
@@ -3,8 +3,10 @@ import { mount } from '@vue/test-utils';
import MockDate from 'mockdate';
import dayjs from 'dayjs';
import antd from 'ant-design-vue';
+import utc from 'dayjs/plugin/utc';
import { sleep } from '../utils';
+dayjs.extend(utc);
export default function demoTest(component, options = {}) {
const suffix = options.suffix || 'vue';
const files = glob.sync(`./components/${component}/demo/*.${suffix}`);
@@ -18,7 +20,7 @@ export default function demoTest(component, options = {}) {
testMethod = test.skip;
}
testMethod(`renders ${file} correctly`, async () => {
- MockDate.set(dayjs('2016-11-22'));
+ MockDate.set(dayjs.utc('2016-11-22').valueOf());
const demo = require(`../.${file}`).default || require(`../.${file}`);
document.body.innerHTML = '';
const wrapper = mount(demo, { global: { plugins: [antd] }, attachTo: document.body });