apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: travis fix post apache/cloudstack-primate merge

Browse Source 
This fixes Travis to run basic UI checks for job #1

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2021-01-20 07:14:29 +05:30
parent b7dab56737
commit b07816b730
4 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -27,10 +27,14 @@ jdk:
python: python:
- "2.7" - "2.7"
node_js:
- 12
cache: cache:
directories: directories:
- $HOME/.m2 - $HOME/.m2
timeout: 500 timeout: 500
npm: false
notifications: notifications:
email: false email: false

3
tools/travis/install.sh
View File

@ -37,6 +37,9 @@ export JAVA_HOME=$(readlink -f /usr/lib/jvm/java-11-openjdk-amd64/bin/java | sed
mvn -v mvn -v
if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then 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 # Pylint/pep8 systemvm python codebase
cd systemvm/test && bash -x runtests.sh cd systemvm/test && bash -x runtests.sh
# Build noredist # Build noredist

2
ui/index.html
View File

@ -24,6 +24,6 @@
<title>Apache CloudStack</title> <title>Apache CloudStack</title>
</head> </head>
<body> <body>
<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> <p>You're in developer mode, please build and run UI using npm.</p>
</body> </body>
</html> </html>

60
ui/tests/unit/views/AutogenView.spec.js
View File

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