From e2311ab04551da589ce20cd23bf462a2938bee99 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 16 Jul 2019 12:03:54 +0100 Subject: [PATCH] fix simpleapp and check-activiti script --- e2e/resources/activiti7/simpleapp.zip | Bin 9399 -> 7271 bytes .../file-uploading-dialog.component.spec.ts | 2 ++ scripts/check-env/check-activiti-env.js | 16 +++++++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/e2e/resources/activiti7/simpleapp.zip b/e2e/resources/activiti7/simpleapp.zip index f112067fc2a5e5385ada0dfc85a0d7f8b6e32704..70a8911f85987f12a1abedcc3cc43144198a7909 100644 GIT binary patch delta 5090 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 Q07~4?f)D`MI`y*u0nAe=R{#J2 delta 6632 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 P9RokspjmW|6My#~qTydE diff --git a/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts b/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts index 4349683949..d20270fdb5 100644 --- a/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts +++ b/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts @@ -52,6 +52,8 @@ describe('FileUploadingDialogComponent', () => { userPreferenceService = TestBed.get(UserPreferencesService); uploadService.clearQueue(); + spyOn(uploadService, 'uploadFilesInTheQueue').and.callFake(() => {}); + emitter = new EventEmitter(); fileList = [ new FileModel( { name: 'fake-name', size: 10 }), diff --git a/scripts/check-env/check-activiti-env.js b/scripts/check-env/check-activiti-env.js index 4a98988a17..6ceb67804f 100755 --- a/scripts/check-env/check-activiti-env.js +++ b/scripts/check-env/check-activiti-env.js @@ -243,14 +243,20 @@ async function checkIfAppIsReleased(apiService, absentApps) { appRelease = await releaseApp(apiService, app); } else { - console.log('Not Need to release'); + console.log('Not Need to release' + JSON.stringify(appReleaseList)); - appRelease = appReleaseList.list.entries.find((currentRelease) => { - return currentRelease.entry.version === 'latest'; + let currentReleaseVersion = -1; + + appReleaseList.list.entries.forEach((currentRelease) => { + if (currentRelease.entry.version > currentReleaseVersion) { + currentReleaseVersion = currentRelease.entry.version; + appRelease = currentRelease; + } }); + } - console.log('App to deploy app release id ' + appRelease.entry.id); + console.log('App to deploy app release id ' + JSON.stringify(appRelease)); await deployApp(apiService, appRelease, currentAbsentApp.name); sleep(120000);///wait to not fail @@ -347,7 +353,7 @@ async function releaseApp(apiService, app) { return await apiService.oauth2Auth.callCustomApi(url, 'POST', pathParams, queryParams, headerParams, formParams, bodyParam, contentTypes, accepts); } catch (error) { - console.log(`Not possible to release the project ${app.entry.name} status : $ ${JSON.stringify(error.status)} ${JSON.stringify(error.response.text)}`); + console.log(`Not possible to release the project ${app.entry.name} status : $ \n ${JSON.stringify(error.status)} \n ${JSON.stringify(error.response.text)}`); process.exit(1); }