Skip to content

Commit b07816b

Browse files
yadvryadvr
committed
ui: travis fix post apache/cloudstack-primate merge
This fixes Travis to run basic UI checks for job #1 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent b7dab56 commit b07816b

4 files changed

Lines changed: 36 additions & 33 deletions

File tree

‎.travis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ jdk:
2727
python:
2828
- "2.7"
2929

30+
node_js:
31+
- 12
32+
3033
cache:
3134
directories:
3235
- $HOME/.m2
3336
timeout: 500
37+
npm: false
3438

3539
notifications:
3640
email: false

‎tools/travis/install.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ export JAVA_HOME=$(readlink -f /usr/lib/jvm/java-11-openjdk-amd64/bin/java | sed
3737
mvn -v
3838

3939
if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then
40+
# npm lint, test and build
41+
cd ui && npm install && npm run lint && npm run test:unit && npm run build
42+
cd $DIR
4043
# Pylint/pep8 systemvm python codebase
4144
cd systemvm/test && bash -x runtests.sh
4245
# Build noredist

‎ui/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
<title>Apache CloudStack</title>
2525
</head>
2626
<body>
27-
<p>The legacy UI has been deprecated in this version as notified in the <a href="http://docs.cloudstack.apache.org/en/4.14.0.0/releasenotes/about.html#new-user-interface-depreciation-notice-of-existing-ui">previous release</a>. The legacy UI will be <a href="http://docs.cloudstack.apache.org/en/4.15.0.0/releasenotes/about.html#primate-ga-and-legacy-ui-deprecation-and-removal-notice">removed in the next release</a>.<br/>To access the legacy UI <a href="legacy">click here</a>.</p>
27+
<p>You're in developer mode, please build and run UI using npm.</p>
2828
</body>
2929
</html>

‎ui/tests/unit/views/AutogenView.spec.js‎

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,8 @@ describe('Views > AutogenView.vue', () => {
869869
await wrapper.vm.$nextTick()
870870
wrapper.vm.onSearch()
871871
expect(router.currentRoute.query).toEqual({
872-
page: 1,
873-
pagesize: 20
872+
page: '1',
873+
pagesize: '20'
874874
})
875875
})
876876

@@ -891,8 +891,8 @@ describe('Views > AutogenView.vue', () => {
891891
})
892892
expect(router.currentRoute.query).toEqual({
893893
key1: 'key1-value',
894-
page: 1,
895-
pagesize: 20
894+
page: '1',
895+
pagesize: '20'
896896
})
897897
})
898898

@@ -913,8 +913,8 @@ describe('Views > AutogenView.vue', () => {
913913
searchQuery: null
914914
})
915915
expect(router.currentRoute.query).toEqual({
916-
page: 1,
917-
pagesize: 20
916+
page: '1',
917+
pagesize: '20'
918918
})
919919
})
920920

@@ -937,8 +937,8 @@ describe('Views > AutogenView.vue', () => {
937937
expect(router.currentRoute.query).toEqual({
938938
keyword: 'test-query',
939939
q: 'test-query',
940-
page: 1,
941-
pagesize: 20
940+
page: '1',
941+
pagesize: '20'
942942
})
943943
})
944944

@@ -961,8 +961,8 @@ describe('Views > AutogenView.vue', () => {
961961
expect(router.currentRoute.query).toEqual({
962962
name: 'test-query',
963963
q: 'test-query',
964-
page: 1,
965-
pagesize: 20
964+
page: '1',
965+
pagesize: '20'
966966
})
967967
})
968968

@@ -985,8 +985,8 @@ describe('Views > AutogenView.vue', () => {
985985
expect(router.currentRoute.query).toEqual({
986986
templatetype: 'test-query',
987987
q: 'test-query',
988-
page: 1,
989-
pagesize: 20
988+
page: '1',
989+
pagesize: '20'
990990
})
991991
})
992992

@@ -1009,8 +1009,8 @@ describe('Views > AutogenView.vue', () => {
10091009
expect(router.currentRoute.query).toEqual({
10101010
name: 'test-query',
10111011
q: 'test-query',
1012-
page: 1,
1013-
pagesize: 20
1012+
page: '1',
1013+
pagesize: '20'
10141014
})
10151015
})
10161016
})
@@ -1898,8 +1898,8 @@ describe('Views > AutogenView.vue', () => {
18981898

18991899
expect(router.currentRoute.query).toEqual({
19001900
filter: 'test',
1901-
page: 1,
1902-
pagesize: 20
1901+
page: '1',
1902+
pagesize: '20'
19031903
})
19041904
})
19051905

@@ -1920,8 +1920,8 @@ describe('Views > AutogenView.vue', () => {
19201920
expect(router.currentRoute.query).toEqual({
19211921
templatefilter: 'test',
19221922
filter: 'test',
1923-
page: 1,
1924-
pagesize: 20
1923+
page: '1',
1924+
pagesize: '20'
19251925
})
19261926
})
19271927

@@ -1942,8 +1942,8 @@ describe('Views > AutogenView.vue', () => {
19421942
expect(router.currentRoute.query).toEqual({
19431943
isofilter: 'test',
19441944
filter: 'test',
1945-
page: 1,
1946-
pagesize: 20
1945+
page: '1',
1946+
pagesize: '20'
19471947
})
19481948
})
19491949

@@ -1965,8 +1965,8 @@ describe('Views > AutogenView.vue', () => {
19651965
account: 'test-account',
19661966
domainid: 'test-domain-id',
19671967
filter: 'self',
1968-
page: 1,
1969-
pagesize: 20
1968+
page: '1',
1969+
pagesize: '20'
19701970
})
19711971
})
19721972

@@ -1987,8 +1987,8 @@ describe('Views > AutogenView.vue', () => {
19871987
expect(router.currentRoute.query).toEqual({
19881988
state: 'running',
19891989
filter: 'running',
1990-
page: 1,
1991-
pagesize: 20
1990+
page: '1',
1991+
pagesize: '20'
19921992
})
19931993
})
19941994
})
@@ -2001,8 +2001,8 @@ describe('Views > AutogenView.vue', () => {
20012001
expect(router.currentRoute.query).toEqual({})
20022002
wrapper.vm.changePage(1, 10)
20032003
expect(router.currentRoute.query).toEqual({
2004-
page: 1,
2005-
pagesize: 10
2004+
page: '1',
2005+
pagesize: '10'
20062006
})
20072007
})
20082008
})
@@ -2013,14 +2013,10 @@ describe('Views > AutogenView.vue', () => {
20132013
wrapper = factory()
20142014

20152015
wrapper.vm.$nextTick(() => {
2016-
expect(router.currentRoute.query).toEqual({
2017-
page: 1,
2018-
pagesize: 10
2019-
})
20202016
wrapper.vm.changePageSize(2, 20)
20212017
expect(router.currentRoute.query).toEqual({
2022-
page: 2,
2023-
pagesize: 20
2018+
page: '2',
2019+
pagesize: '20'
20242020
})
20252021
})
20262022
})

0 commit comments

Comments
 (0)