diff --git a/.travis.yml b/.travis.yml index 18564f9304e..8b2859a2a10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,14 @@ jdk: python: - "2.7" +node_js: + - 12 + cache: directories: - $HOME/.m2 timeout: 500 + npm: false notifications: email: false diff --git a/tools/travis/install.sh b/tools/travis/install.sh index 9ddd36ca8c2..c8c1b83dec8 100755 --- a/tools/travis/install.sh +++ b/tools/travis/install.sh @@ -37,6 +37,9 @@ export JAVA_HOME=$(readlink -f /usr/lib/jvm/java-11-openjdk-amd64/bin/java | sed mvn -v if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then + # npm lint, test and build + cd ui && npm install && npm run lint && npm run test:unit && npm run build + cd $DIR # Pylint/pep8 systemvm python codebase cd systemvm/test && bash -x runtests.sh # Build noredist diff --git a/ui/index.html b/ui/index.html index 47510b40621..64421d66bae 100644 --- a/ui/index.html +++ b/ui/index.html @@ -24,6 +24,6 @@ Apache CloudStack -

The legacy UI has been deprecated in this version as notified in the previous release. The legacy UI will be removed in the next release.
To access the legacy UI click here.

+

You're in developer mode, please build and run UI using npm.

diff --git a/ui/tests/unit/views/AutogenView.spec.js b/ui/tests/unit/views/AutogenView.spec.js index 66c347bb0a2..fbae93c9cf0 100644 --- a/ui/tests/unit/views/AutogenView.spec.js +++ b/ui/tests/unit/views/AutogenView.spec.js @@ -869,8 +869,8 @@ describe('Views > AutogenView.vue', () => { await wrapper.vm.$nextTick() wrapper.vm.onSearch() expect(router.currentRoute.query).toEqual({ - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -891,8 +891,8 @@ describe('Views > AutogenView.vue', () => { }) expect(router.currentRoute.query).toEqual({ key1: 'key1-value', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -913,8 +913,8 @@ describe('Views > AutogenView.vue', () => { searchQuery: null }) expect(router.currentRoute.query).toEqual({ - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -937,8 +937,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ keyword: 'test-query', q: 'test-query', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -961,8 +961,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ name: 'test-query', q: 'test-query', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -985,8 +985,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ templatetype: 'test-query', q: 'test-query', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -1009,8 +1009,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ name: 'test-query', q: 'test-query', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) }) @@ -1898,8 +1898,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ filter: 'test', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -1920,8 +1920,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ templatefilter: 'test', filter: 'test', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -1942,8 +1942,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ isofilter: 'test', filter: 'test', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -1965,8 +1965,8 @@ describe('Views > AutogenView.vue', () => { account: 'test-account', domainid: 'test-domain-id', filter: 'self', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) @@ -1987,8 +1987,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({ state: 'running', filter: 'running', - page: 1, - pagesize: 20 + page: '1', + pagesize: '20' }) }) }) @@ -2001,8 +2001,8 @@ describe('Views > AutogenView.vue', () => { expect(router.currentRoute.query).toEqual({}) wrapper.vm.changePage(1, 10) expect(router.currentRoute.query).toEqual({ - page: 1, - pagesize: 10 + page: '1', + pagesize: '10' }) }) }) @@ -2013,14 +2013,10 @@ describe('Views > AutogenView.vue', () => { wrapper = factory() wrapper.vm.$nextTick(() => { - expect(router.currentRoute.query).toEqual({ - page: 1, - pagesize: 10 - }) wrapper.vm.changePageSize(2, 20) expect(router.currentRoute.query).toEqual({ - page: 2, - pagesize: 20 + page: '2', + pagesize: '20' }) }) })