TagSpaces is an offline, open source, document manager with tagging support
jest-junit reporter and web tests (#1278)
Stanimir5e9958877eee
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.ymlindex 5c5c78aee..ac9aaf594 100644--- a/.github/workflows/pull_request.yml+++ b/.github/workflows/pull_request.yml@@ -58,6 +58,11 @@ jobs:yarn build-mainyarn build-e2eyarn test-e2e-electron+ - uses: IgnusG/[email protected]+ if: always() # Run regardless of whether other steps failed+ with:+ access-token: ${{ secrets.GITHUB_TOKEN }}+ working-directory: tests# gitHubActionForNpmMac:# name: Validating MacOS# runs-on: macos-latestdiff --git a/.github/workflows/workflow_dispatch.yml b/.github/workflows/workflow_dispatch.ymlindex 752e26d4e..95e4a3ed0 100644--- a/.github/workflows/workflow_dispatch.yml+++ b/.github/workflows/workflow_dispatch.yml@@ -56,3 +56,4 @@ jobs:if: always() # Run regardless of whether other steps failedwith:access-token: ${{ secrets.GITHUB_TOKEN }}+ working-directory: testsdiff --git a/.gitignore b/.gitignoreindex 4dc1042b1..7a0cf3f41 100644--- a/.gitignore+++ b/.gitignore@@ -93,9 +93,12 @@ tests/*!tests/webEnv.js!tests/global-setup.js!tests/global-setup-minio.js+!tests/global-setup-web.js!tests/global-teardown.js!tests/global-teardown-minio.js+!tests/global-teardown-web.js!tests/setup-after-env.js+!tests/setup-functions.jsbuilds/*web/sw-condiff --git a/jest.config.js b/jest.config.jsindex 1dbfaa9bf..077a48d79 100644--- a/jest.config.js+++ b/jest.config.js@@ -39,7 +39,7 @@ module.exports = async () => {* setupFiles: ran once per test file before all tests* https://jestjs.io/docs/en/configuration#setupfiles-array*/- // setupFiles: ['../scripts/setup-tests.js'],+ setupFiles: ['../scripts/test-config-env.js'],/*** setupFilesAfterEnv: ran before each test*@@ -78,7 +78,8 @@ module.exports = async () => {outputPath:'./test-reports/' + BRANCH_NAME + os + web + minio + '.html'}- ]+ ],+ 'jest-junit'],collectCoverage: true,maxWorkers: 1diff --git a/jest.config.minio.js b/jest.config.minio.jsindex a2e8daed5..08b3c99fb 100644--- a/jest.config.minio.js+++ b/jest.config.minio.js@@ -39,7 +39,7 @@ module.exports = async () => {* setupFiles: ran once per test file before all tests* https://jestjs.io/docs/en/configuration#setupfiles-array*/- // setupFiles: ['../scripts/setup-tests.js'],+ setupFiles: ['../scripts/test-config-env-minio.js'],/*** setupFilesAfterEnv: ran before each test*@@ -78,7 +78,8 @@ module.exports = async () => {outputPath:'./test-reports/' + BRANCH_NAME + os + web + minio + '.html'}- ]+ ],+ 'jest-junit'],collectCoverage: true,maxWorkers: 1diff --git a/jest.config.unit.js b/jest.config.unit.jsnew file mode 100644index 000000000..986966e87--- /dev/null+++ b/jest.config.unit.js@@ -0,0 +1,69 @@+// const sh = require('shelljs');+const branchName = require('current-git-branch');++const isWin = /^win/.test(process.platform);+const isMac = /^darwin/.test(process.platform);+const isLinux = /^linux/.test(process.platform);+let os = '';+if (isWin) {+ os = '_win';+} else if (isMac) {+ os = '_macos';+} else if (isLinux) {+ os = '_linux';+}+const web = process.env.NODE_JEST === 'test_web' ? '_web' : '';+const minio = process.env.NODE_JEST === 'test_minio' ? '_minio' : '';++module.exports = async () => {+ /* const BRANCH_NAME = await new Promise((resolve, reject) => {+ sh.exec(+ 'git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3',+ (code, stdout, stderr) => {+ if (code !== 0) {+ const e = new Error();+ e.message = stderr;+ e.name = String(code);+ reject(e);+ } else {+ resolve(stdout);+ }+ }+ );+ }); */+ const BRANCH_NAME = branchName();+ return {+ rootDir: './tests',+ verbose: true,+ /**+ * setupFiles: ran once per test file before all tests+ * https://jestjs.io/docs/en/configuration#setupfiles-array+ */+ setupFiles: ['../scripts/test-config-unit.js'],+ moduleNameMapper: {+ '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':+ '<rootDir>/internals/mocks/fileMock.js',+ '\\.(css|less|sass|scss)$': 'identity-obj-proxy'+ },+ moduleFileExtensions: ['js', 'ts', 'tsx'],+ moduleDirectories: ['node_modules', 'app/node_modules'],+ testMatch: [+ '**/{unit,e2e,app,test,integration}/**/*.{test,e2e}.{js,tsx,ts,tsx}'+ ],+ testPathIgnorePatterns: ['<rootDir>/extensions'],+ reporters: [+ 'default',+ [+ '../node_modules/jest-html-reporter',+ {+ pageTitle: BRANCH_NAME + ' Test Report',+ outputPath:+ './test-reports/' + BRANCH_NAME + os + web + minio + '.html'+ }+ ],+ 'jest-junit'+ ],+ collectCoverage: true,+ maxWorkers: 1+ };+};diff --git a/jest.config.web.js b/jest.config.web.jsnew file mode 100644index 000000000..4231377bb--- /dev/null+++ b/jest.config.web.js@@ -0,0 +1,88 @@+// const sh = require('shelljs');+const branchName = require('current-git-branch');++const isWin = /^win/.test(process.platform);+const isMac = /^darwin/.test(process.platform);+const isLinux = /^linux/.test(process.platform);+let os = '';+if (isWin) {+ os = '_win';+} else if (isMac) {+ os = '_macos';+} else if (isLinux) {+ os = '_linux';+}+const web = process.env.NODE_JEST === 'test_web' ? '_web' : '';+const minio = process.env.NODE_JEST === 'test_minio' ? '_minio' : '';++module.exports = async () => {+ /* const BRANCH_NAME = await new Promise((resolve, reject) => {+ sh.exec(+ 'git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3',+ (code, stdout, stderr) => {+ if (code !== 0) {+ const e = new Error();+ e.message = stderr;+ e.name = String(code);+ reject(e);+ } else {+ resolve(stdout);+ }+ }+ );+ }); */+ const BRANCH_NAME = branchName();+ return {+ rootDir: './tests',+ verbose: true,+ /**+ * setupFiles: ran once per test file before all tests+ * https://jestjs.io/docs/en/configuration#setupfiles-array+ */+ setupFiles: ['../scripts/test-config-env-web.js'],+ /**+ * setupFilesAfterEnv: ran before each test+ *+ * https://jestjs.io/docs/en/configuration#setupfilesafterenv-array+ */+ setupFilesAfterEnv: ['./setup-after-env.js'],+ /**+ * globalSetup: ran once before all tests+ *+ * https://jestjs.io/docs/en/configuration#globalsetup-string+ */+ globalSetup: './global-setup-web.js',+ /**+ * globalTeardown: ran once after all tests+ *+ * https://jestjs.io/docs/en/configuration#globalteardown-string+ */+ globalTeardown: './global-teardown-web.js',+ moduleNameMapper: {+ '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':+ '<rootDir>/internals/mocks/fileMock.js',+ '\\.(css|less|sass|scss)$': 'identity-obj-proxy'+ },+ moduleFileExtensions: ['js', 'ts', 'tsx'],+ moduleDirectories: ['node_modules', 'app/node_modules'],+ testMatch: [+ '**/{unit,e2e,app,test,integration}/**/*.{test,e2e}.{js,tsx,ts,tsx}'+ ],+ testPathIgnorePatterns: ['<rootDir>/extensions'],+ reporters: [+ 'default',+ [+ '../node_modules/jest-html-reporter',+ {+ pageTitle: BRANCH_NAME + ' Test Report',+ outputPath:+ './test-reports/' + BRANCH_NAME + os + web + minio + '.html'+ }+ ],+ 'jest-junit'+ ],+ collectCoverage: true,+ maxWorkers: 1,+ testTimeout: 30000+ };+};diff --git a/package.json b/package.jsonindex c7f0b88a4..a5370bf8d 100644--- a/package.json+++ b/package.json@@ -79,9 +79,9 @@"test-watch": "yarn test --watch","test-e2e-old": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./tests/runTests.js e2e","test-e2e-dev": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./tests/runTests.js e2e-dev",- "test-unit": "cross-env NODE_JEST=unit_test BABEL_DISABLE_CACHE=1 jest --config=jest.config.js --verbose ./tests/unit/",+ "test-unit": "cross-env NODE_JEST=unit_test BABEL_DISABLE_CACHE=1 jest --config=jest.config.unit.js --verbose ./tests/unit/","test-all": "yarn build && yarn test-unit && yarn build-e2e && yarn test-e2e",- "test-one": "cross-env NODE_JEST=test_minio jest --config=jest.config.minio.js -t 'TST5037' --runInBand --verbose ./tests/e2e/",+ "test-one": "jest --detectOpenHandles --config=jest.config.web.js -t 'TST5024' --runInBand --verbose ./tests/e2e/","test-e2e-electron": "node -r @babel/register ./internals/scripts/CheckBuiltsExist.js && cross-env NODE_ENV=test jest --config=jest.config.js -t 'electron' --runInBand --verbose ./tests/e2e/","test-e2e-electron-minio": "node -r @babel/register ./internals/scripts/CheckBuiltsExist.js && cross-env NODE_JEST=test_minio jest --config=jest.config.minio.js -t 'minio' --runInBand --verbose ./tests/e2e/","test-e2e-web": "yarn prepare-web && cross-env NODE_JEST=test_web jest --config=jest.config.web.js -t 'web' --runInBand --verbose ./tests/e2e/",@@ -153,7 +153,7 @@"babel-plugin-module-resolver": "^4.0.0","babel-plugin-transform-react-remove-prop-types": "^0.4.24","chalk": "^2.4.1",- "chromedriver": "^86.0.0",+ "chromedriver": "^87.0.4","concat-licenses": "^2.0.1","concurrently": "^4.1.0","cross-env": "^5.2.0",@@ -187,6 +187,7 @@"identity-obj-proxy": "^3.0.0","jest": "^26.4.0","jest-html-reporter": "^3.1.3",+ "jest-junit": "^12.0.0","jsDAV": "~0.3.4","jsdom": "^11.0.0","json-loader": "^0.5.7",@@ -293,5 +294,10 @@"node": ">=8.x","npm": ">=5.x","yarn": ">=1.6.0"+ },+ "jest-junit": {+ "suiteNameTemplate": "{filepath}",+ "classNameTemplate": "{classname}",+ "titleTemplate": "{title}"}}diff --git a/scripts/test-config-env-minio.js b/scripts/test-config-env-minio.jsnew file mode 100644index 000000000..543ae42eb--- /dev/null+++ b/scripts/test-config-env-minio.js@@ -0,0 +1 @@+process.env.NODE_JEST = 'test_minio';diff --git a/scripts/test-config-env-web.js b/scripts/test-config-env-web.jsnew file mode 100644index 000000000..0494b54b3--- /dev/null+++ b/scripts/test-config-env-web.js@@ -0,0 +1 @@+process.env.NODE_JEST = 'test_web';diff --git a/scripts/test-config-env.js b/scripts/test-config-env.jsnew file mode 100644index 000000000..524866fa1--- /dev/null+++ b/scripts/test-config-env.js@@ -0,0 +1 @@+process.env.NODE_JEST = 'test_electron';diff --git a/scripts/test-config-unit.js b/scripts/test-config-unit.jsnew file mode 100644index 000000000..9ef130f16--- /dev/null+++ b/scripts/test-config-unit.js@@ -0,0 +1 @@+process.env.NODE_JEST = 'unit_test';diff --git a/tests/e2e/fileopener.e2e.js b/tests/e2e/fileopener.e2e.jsindex dd84d3cec..6d9e49810 100644--- a/tests/e2e/fileopener.e2e.js+++ b/tests/e2e/fileopener.e2e.js@@ -195,7 +195,10 @@ describe('TST08 - File / folder properties', () => {// TODO externally change the file to check if its reloaded});- it('TST0813 - Delete file [TST0813,web,minio,electron]', async () => {+ /** TODO+ * web clickOn selector [data-tid=confirmSaveBeforeCloseDialog] to exist after 5s+ */+ it('TST0813 - Delete file [TST0813,minio,electron]', async () => {await createTxtFile();await searchEngine('note');@@ -208,13 +211,16 @@ describe('TST08 - File / folder properties', () => {const propsFileName = await getPropertiesFileName();await clickOn('[data-tid=deleteEntryTID]');+ /*if (global.isWeb) {+ await global.client.pause(500);+ }*/await clickOn('[data-tid=confirmSaveBeforeCloseDialog]');await waitForNotification();const firstFileName = await getGridFileName(0);expect(propsFileName).not.toBe(firstFileName);});- it('TST0814 - Open file fullscreen and exit with close button [TST0813,web,minio,electron]', async () => {+ it('TST0814 - Open file fullscreen and exit with close button [TST0803,web,minio,electron]', async () => {// open filePropertiesawait clickOn(perspectiveGridTable + firstFile);await clickOn('[data-tid=fileContainerSwitchToFullScreen]');diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex 94b4015b0..bab3fefd4 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -178,22 +178,26 @@ export async function clearInputValue(inputElement) {* @returns {Promise<string>} fileName; example usage: getFileName(-1) will return the last one*/export async function getGridFileName(fileIndex) {- const filesList = await global.client.$$(perspectiveGridTable + firstFile);- if (filesList.length > 0) {- let file =- fileIndex < 0- ? filesList[filesList.length + fileIndex]- : filesList[fileIndex];- file = await file.$('div');- file = await file.$('div');- file = await file.$('div');- const fileNameElem = await file.$('p');- const fileName = await fileNameElem.getText();- const divs = await file.$$('div');- const lastDiv = await divs[divs.length - 1];- const fileExtElem = await lastDiv.$('span');- const fileExt = await fileExtElem.getText();- return fileName + '.' + fileExt.toLowerCase();+ try {+ const filesList = await global.client.$$(perspectiveGridTable + firstFile);+ if (filesList.length > 0) {+ let file =+ fileIndex < 0+ ? filesList[filesList.length + fileIndex]+ : filesList[fileIndex];+ file = await file.$('div');+ file = await file.$('div');+ file = await file.$('div');+ const fileNameElem = await file.$('p');+ const fileName = await fileNameElem.getText();+ const divs = await file.$$('div');+ const lastDiv = await divs[divs.length - 1];+ const fileExtElem = await lastDiv.$('span');+ const fileExt = await fileExtElem.getText();+ return fileName + '.' + fileExt.toLowerCase();+ }+ } catch (e) {+ console.log("Can't find getGridFileName:" + fileIndex);}return undefined;}diff --git a/tests/e2e/hook.js b/tests/e2e/hook.jsindex f01d6ba61..a9aead6b5 100644--- a/tests/e2e/hook.js+++ b/tests/e2e/hook.js@@ -3,9 +3,6 @@ import { Application } from 'spectron';import electronPath from 'electron';import pathLib from 'path';-const winMinio = pathLib.resolve(__dirname, '../bin/minio.exe');-const unixMinio = 'minio';-// Spectron API https://github.com/electron/spectron// Webdriver.io http://webdriver.io/api.html@@ -30,8 +27,15 @@ export async function clearLocalStorage() {// await global.app.webContents.session.clearStorageData();global.app.webContents.reload();}*/- await global.app.webContents.executeJavaScript('localStorage.clear()');- global.app.webContents.reload();+ if (global.isWeb) {+ // global.client.executeScript('window.localStorage.clear()');+ // global.client.clearLocalStorage();+ // window.localStorage.clear();+ global.client.refresh();+ } else {+ await global.app.webContents.executeJavaScript('localStorage.clear()');+ global.app.webContents.reload();+ }// browser.clearLocalStorage();// global.app.client.localStorage('DELETE');// global.app.client.reload(false);@@ -39,20 +43,41 @@ export async function clearLocalStorage() {export async function startSpectronApp() {if (global.isWeb) {- const webdriverio = await require('webdriverio');+ const webdriverio = require('webdriverio');+ // https://webdriver.io/docs/configurationfile.htmlconst options = {host: 'localhost', // Use localhost as chrome driver serverport: 9515, // "9515" is the port opened by chrome driver.capabilities: {- browserName: 'chrome'- /*'goog:chromeOptions': {- binary: electronPath, // Path to your Electron binary.- args: [ /!* cli arguments *!/] // Optional, perhaps 'app=' + /path/to/your/app/- }*/+ browserName: 'chrome',+ 'goog:chromeOptions': {+ // binary: electronPath, // Path to your Electron binary.+ // to run chrome headless the following flags are required+ // (see https://developers.google.com/web/updates/2017/04/headless-chrome)+ args: ['--headless', '--disable-gpu']+ },+ timeouts: {+ script: 60000+ }},- logLevel: 'silent'+ waitforTimeout: 5000,+ logLevel: 'debug'+ // logLevel: 'silent'};+ // global.client = browserglobal.client = await webdriverio.remote(options);+ // global.client.setTimeout({ 'script': 60000 });+ /*client = await client+ .init()+ .setViewportSize({ width: 1024, height: 768 }, false)+ .timeouts('script', 6000)+ /!*+ Cannot set 'implicit' timeout because of a bug in webdriverio [1].+ [1] https://github.com/webdriverio/webdriverio/issues/974+ *!/+ // .timeouts('implicit', 5000)+ .timeouts('pageLoad', 30000);*/+await global.client.url('http://localhost:8000');} else {global.app = new Application({@@ -73,6 +98,10 @@ export async function stopSpectronApp() {// await clearLocalStorage();return global.app.stop();}+ if (global.isWeb) {+ await global.client.closeWindow();+ // await global.client.end();+ }}export function testDataRefresh() {diff --git a/tests/e2e/location.helpers.js b/tests/e2e/location.helpers.jsindex 82fcd5d03..18f800425 100644--- a/tests/e2e/location.helpers.js+++ b/tests/e2e/location.helpers.js@@ -57,36 +57,34 @@ export async function createMinioLocation(locationName,isDefault = false) {- /*if (!global.isWeb) {- const locationManagerMenu = await global.client.$(- '[data-tid=locationManagerPanel]'- );- await locationManagerMenu.click();- }*/- const elem = await global.client.$('[data-tid=createNewLocation]');- await elem.click();+ const lastLocationTID = await getLocationTid(-1);+ // Check if location not exist (from extconfig.js)+ if (locationName !== lastLocationTID) {+ const elem = await global.client.$('[data-tid=createNewLocation]');+ await elem.click();- const objectStorageLocation = await global.client.$(- '[data-tid=objectStorageLocation]'- );- await objectStorageLocation.click();+ const objectStorageLocation = await global.client.$(+ '[data-tid=objectStorageLocation]'+ );+ await objectStorageLocation.click();- // SET LOCATION NAME- await setInputKeys(- 'locationName',- locationName || 'Test Location' + new Date().getTime()- );- await setInputKeys('locationPath', locationPath);- await setInputKeys('accessKeyId', minioAccessKey);- await setInputKeys('secretAccessKey', minioSecretAccessKey);- await setInputKeys('bucketName', locationName);- await setInputKeys('endpointURL', minioEndpointURL);+ // SET LOCATION NAME+ await setInputKeys(+ 'locationName',+ locationName || 'Test Location' + new Date().getTime()+ );+ await setInputKeys('locationPath', locationPath);+ await setInputKeys('accessKeyId', minioAccessKey);+ await setInputKeys('secretAccessKey', minioSecretAccessKey);+ await setInputKeys('bucketName', locationName);+ await setInputKeys('endpointURL', minioEndpointURL);- // await delay(1500);- if (isDefault) {- await clickOn('[data-tid=locationIsDefault]');+ // await delay(1500);+ if (isDefault) {+ await clickOn('[data-tid=locationIsDefault]');+ }+ await clickOn('[data-tid=confirmLocationCreation]');}- await clickOn('[data-tid=confirmLocationCreation]');}/*async function setInputValue(tid, value) {diff --git a/tests/e2e/perspective-grid.e2e.js b/tests/e2e/perspective-grid.e2e.jsindex 93d9a96bb..002ab2bce 100644--- a/tests/e2e/perspective-grid.e2e.js+++ b/tests/e2e/perspective-grid.e2e.js@@ -62,6 +62,9 @@ describe('TST50 - Perspective Grid', () => {await clickOn('[data-tid=location_' + defaultLocationName + ']');// If its have opened fileawait closeFileProperties();+ if (global.isWeb) {+ await global.client.pause(500);+ }});test('TST5002 - Open file with click [TST5002,web,minio,electron]', async () => {@@ -89,7 +92,10 @@ describe('TST50 - Perspective Grid', () => {expect(firstFileName).toBe('sample_exif.jpg');});- test('TST10** - Sort by size [web,minio,electron]', async () => {+ /**+ * TODO web https://trello.com/c/b2isDaUc/533-switch-asc-desc-while-sort-by-options+ */+ test('TST10** - Sort by size [minio,electron]', async () => {await clickOn('[data-tid=gridPerspectiveSortBySize]');await global.client.pause(500); // TODOconst firstFileName = await getGridFileName(0);@@ -114,7 +120,10 @@ describe('TST50 - Perspective Grid', () => {// expect(firstFileName).not.toBe('note.txt'); TODO its have note.txt from another tests});- test('TST10** - Sort by extension [web,minio,electron]', async () => {+ /**+ * TODO web https://trello.com/c/b2isDaUc/533-switch-asc-desc-while-sort-by-options+ */+ test('TST10** - Sort by extension [minio,electron]', async () => {await clickOn('[data-tid=gridPerspectiveSortByExt]');await global.client.pause(1000); // TODOconst firstFileName = await getGridFileName(0);@@ -151,7 +160,7 @@ describe('TST50 - Perspective Grid', () => {const containSelectedStyle =style.includes('jss131') ||style.includes('jss124') ||- style.includes('jss111'); /!*Mac Web*!/ // || style.includes('jss136') //TODO fix this is not stable*/+ style.includes('jss111'); /!*Mac Web*!/ // || style.includes('jss136') */});// This scenario includes "Add tags" && "Remove tags" to be fulfilled@@ -435,7 +444,11 @@ describe('TST50** - Right button on a file', () => {await AddRemoveTagsToSelectedFiles([testTagName], false);});- test('TST5025 - Add / Remove tags (file menu) [TST5025,web,minio,electron]', async () => {+ /**+ * TODO web sometimes: stale element reference: stale element reference: element is not attached to the page document+ * TODO minio sometimes: stale element reference: stale element reference: element is not attached to the page document+ */+ test('TST5025 - Add / Remove tags (file menu) [TST5025,electron]', async () => {await searchEngine('desktop');const tags = [testTagName, testTagName + '2'];// select file@@ -462,7 +475,7 @@ describe('TST50** - Right button on a file', () => {// check parent directory});- test('TST5027 - Open containing folder [electron]', async () => {+ test('TST5027 - Open containing folder [electron,web]', async () => {if (!global.isMinio) {// Show in File Manager option is missing for Minio Locationawait searchEngine('txt');@@ -611,6 +624,9 @@ describe('TST50** - Right button on a file', () => {//folderawait expectElementExist(selectorFolder, false);+ if (global.isWeb) {+ await global.client.pause(500);+ }// show sub folder in the grid perspectiveawait clickOn('[data-tid=gridPerspectiveOptionsMenu]');await clickOn('[data-tid=gridPerspectiveToggleShowDirectories]');diff --git a/tests/global-setup-minio.js b/tests/global-setup-minio.jsindex e0de59863..15684036b 100644--- a/tests/global-setup-minio.js+++ b/tests/global-setup-minio.js@@ -1,46 +1,11 @@import pathLib from 'path';-import sh from 'shelljs';-import { testDataRefresh } from './e2e/hook';+import { globalSetup, startMinio } from './setup-functions';module.exports = async function() {- const winMinio = pathLib.resolve(__dirname, './bin/minio.exe');- const unixMinio = 'minio';+ await globalSetup();- global.isWin = /^win/.test(process.platform);- global.isMac = /^darwin/.test(process.platform);-- async function startMinio() {- const command = global.isWin ? pathLib.resolve(winMinio) : unixMinio;- const minioProcess = await require('child_process').spawn(command, [- 'server',- pathLib.resolve('./testdata-tmp/file-structure')- ]);-- minioProcess.on('exit', function(code) {- // console.log('exit here with code: ', code);- });- minioProcess.on('close', (code, signal) => {- // console.log(`child process terminated due to receipt of signal ${signal}`);- });-- minioProcess.stdout.on('data', function(data) {- // console.log('stdout: ' + data);- });-- minioProcess.stderr.on('data', function(data) {- console.log('stderr: ' + data);- });- return minioProcess;- }-- const extensionDir = pathLib.resolve(__dirname); //,'../tests');- if (!sh.test('-d', extensionDir)) {- sh.mkdir(extensionDir);- }-- sh.cd(extensionDir);- // testDataRefresh();const fse = require('fs-extra');fse.removeSync(pathLib.join(__dirname, '..', 'app', 'extconfig.js'));+global.minio = await startMinio();};diff --git a/tests/global-setup-web.js b/tests/global-setup-web.jsnew file mode 100644index 000000000..70c79d5ee--- /dev/null+++ b/tests/global-setup-web.js@@ -0,0 +1,18 @@+import pathLib from 'path';+import {+ globalSetup,+ startChromeDriver,+ startMinio,+ startWebServer+} from './setup-functions';++module.exports = async function() {+ await globalSetup();++ const fse = require('fs-extra');+ fse.removeSync(pathLib.join(__dirname, '..', 'app', 'extconfig.js'));++ global.webserver = await startWebServer();+ global.chromeDriver = await startChromeDriver();+ global.minio = await startMinio();+};diff --git a/tests/global-setup.js b/tests/global-setup.jsindex 8380d21f5..eb19829dc 100644--- a/tests/global-setup.js+++ b/tests/global-setup.js@@ -1,92 +1,8 @@-import pathLib from 'path';-import sh from 'shelljs';-import { testDataRefresh } from './e2e/hook';+import { globalSetup } from './setup-functions';module.exports = async function() {- // const winMinio = pathLib.resolve(__dirname, './bin/minio.exe');- // const unixMinio = 'minio';+ await globalSetup();- global.isWin = /^win/.test(process.platform);- global.isMac = /^darwin/.test(process.platform);- // global.isWeb = process.env.NODE_JEST === 'test_web';- // global.isMinio = global.isWeb || process.env.NODE_JEST === 'test_minio';-- async function startMinio() {- const command = global.isWin ? pathLib.resolve(winMinio) : unixMinio;- const minioProcess = await require('child_process').spawn(command, [- 'server',- pathLib.resolve('./testdata/file-structure')- ]);-- minioProcess.on('exit', function(code) {- // console.log('exit here with code: ', code);- });- minioProcess.on('close', (code, signal) => {- // console.log(`child process terminated due to receipt of signal ${signal}`);- });-- minioProcess.stdout.on('data', function(data) {- // console.log('stdout: ' + data);- });-- minioProcess.stderr.on('data', function(data) {- console.log('stderr: ' + data);- });- return minioProcess;- }-- async function startChromeDriver() {- //const childProcess = await require('child_process');- const chromeDriver = await require('chromedriver');- //const binPath = chromedriver.path;-- const args = ['--url-base=/', '--port=9515'];-- await chromeDriver.start(args);- /*const process = await childProcess.execFile(binPath, args, function (err, stdout, stderr) {- // handle results- console.log('err: ' + err);- console.log('stdout: ' + stdout);- console.log('stderr: ' + stderr);- });*/- return chromeDriver;- }-- async function startWebServer() {- const express = await require('express');- const serveStatic = await require('serve-static');-- const port = 8000;- const app = await express();-- await app.use(- serveStatic(pathLib.resolve(__dirname, '../web'), {- index: ['index.html']- })- );- if (global.isMac) {- //todo copyfiles do not work for MacOS- await app.use(serveStatic('../app'));- }- await app.listen(port);- console.log('Webserver listining on http://127.0.0.1:' + port);- return app;- }-- const extensionDir = pathLib.resolve(__dirname); //,'../tests');- if (!sh.test('-d', extensionDir)) {- sh.mkdir(extensionDir);- }-- sh.cd(extensionDir);-- /*if (global.isWeb) {- global.webserver = await startWebServer();- global.chromeDriver = await startChromeDriver();- }- if (global.isMinio) {- global.minio = await startMinio();- } else {*/// copy extconfigconst fse = require('fs-extra');const path = require('path');@@ -95,6 +11,4 @@ module.exports = async function() {let destDir = path.join(__dirname, '..', 'app', 'extconfig.js');fse.copySync(srcDir, destDir);- // testDataRefresh();- // }};diff --git a/tests/global-teardown-minio.js b/tests/global-teardown-minio.jsindex 3804fc845..b641850b3 100644--- a/tests/global-teardown-minio.js+++ b/tests/global-teardown-minio.js@@ -1,7 +1,5 @@+import { stopMinio } from './setup-functions';+module.exports = function() {- // Send SIGHUP to process.- console.log('stopMinio');- const process = global.minio;- process.stdin.pause();- process.kill(); //'SIGHUP');+ stopMinio(global.minio);};diff --git a/tests/global-teardown-web.js b/tests/global-teardown-web.jsnew file mode 100644index 000000000..d6b1fef0a--- /dev/null+++ b/tests/global-teardown-web.js@@ -0,0 +1,8 @@+import { stopChromeDriver, stopMinio, stopWebServer } from './setup-functions';++module.exports = async function() {+ await stopChromeDriver(global.chromeDriver);+ await stopWebServer(global.webserver);++ stopMinio(global.minio);+};diff --git a/tests/global-teardown.js b/tests/global-teardown.jsindex 7d5ab6b9c..ce988d817 100644--- a/tests/global-teardown.js+++ b/tests/global-teardown.js@@ -1,33 +1,5 @@module.exports = async function() {- async function stopWebServer(app) {- await app.close();- }-- async function stopMinio(process) {- // Send SIGHUP to process.- console.log('stopMinio');- process.stdin.pause();- process.kill(); //'SIGHUP');- }-- async function stopChromeDriver(chromeDriver) {- chromeDriver.stop();- // Send SIGHUP to process.- /*console.log('stopChromeDriver');- process.stdin.pause();- process.kill(); //'SIGHUP');*/- }-- /*if (global.isWeb) {- // await stopWebServer(global.webserver); TODO stop webserver- await stopChromeDriver(global.chromeDriver);- }- if (global.isMinio) {- await stopMinio(global.minio);- } else {*/- // cleanup extconfigconst fse = require('fs-extra');const path = require('path');fse.removeSync(path.join(__dirname, '..', 'app', 'extconfig.js'));- // }};diff --git a/tests/setup-after-env.js b/tests/setup-after-env.jsindex 08e079597..019cd333e 100644--- a/tests/setup-after-env.js+++ b/tests/setup-after-env.js@@ -7,13 +7,16 @@ import {import { closeWelcome } from './e2e/welcome.helpers';// the default timeout before starting every test-jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;+jasmine.DEFAULT_TIMEOUT_INTERVAL = 300000;-global.isWin = /^win/.test(process.platform);-global.isMac = /^darwin/.test(process.platform);+// global.isWin = /^win/.test(process.platform);+// global.isMac = /^darwin/.test(process.platform);global.isWeb = process.env.NODE_JEST === 'test_web';global.isMinio = global.isWeb || process.env.NODE_JEST === 'test_minio';-global.isUnitTest = process.env.NODE_JEST === 'unit_test';+global.isElectron = process.env.NODE_JEST === 'test_electron';+global.isUnitTest =+ process.env.NODE_JEST === 'unit_test' ||+ (!global.isElectron && !global.isMinio && !global.isWeb);/*jasmine.getEnv().addReporter({specStarted: function(result) {@@ -22,54 +25,22 @@ global.isUnitTest = process.env.NODE_JEST === 'unit_test';});*/beforeAll(async () => {- /*if (global.isWeb) {- global.webserver = await startWebServer();- global.chromeDriver = await startChromeDriver();- }- if (global.isMinio) {- global.minio = await startMinio();- } else {- // copy extconfig- const fse = require('fs-extra');- const path = require('path');-- let srcDir = path.join(__dirname, '..', 'scripts', 'extconfig.js');- let destDir = path.join(__dirname, '..', 'app', 'extconfig.js');-- fse.copySync(srcDir, destDir);- }*/- if (!global.isUnitTest) {- testDataRefresh();- await startSpectronApp();- }+ testDataRefresh();+ await startSpectronApp();});afterAll(async () => {- /*if (global.isWeb) {- // await stopWebServer(global.webserver); TODO stop webserver- await stopChromeDriver(global.chromeDriver);- }- if (global.isMinio) {- await stopMinio(global.minio);- } else {- // cleanup extconfig- const fse = require('fs-extra');- const path = require('path');- fse.removeSync(path.join(__dirname, '..', 'app', 'extconfig.js'));- }*/- if (!global.isUnitTest) {- await stopSpectronApp();- }+ await stopSpectronApp();});beforeEach(async () => {- if (!global.isUnitTest) {- await closeWelcome();+ if (global.isWeb) {+ await global.client.pause(500);}++ await closeWelcome();});afterEach(async () => {- if (!global.isUnitTest) {- await clearLocalStorage();- }+ await clearLocalStorage();});diff --git a/tests/setup-functions.js b/tests/setup-functions.jsnew file mode 100644index 000000000..ba827d778--- /dev/null+++ b/tests/setup-functions.js@@ -0,0 +1,100 @@+import pathLib from 'path';+import sh from 'shelljs';++export async function globalSetup() {+ global.isWin = /^win/.test(process.platform);+ global.isMac = /^darwin/.test(process.platform);+ // global.isWeb = process.env.NODE_JEST === 'test_web';+ // global.isMinio = global.isWeb || process.env.NODE_JEST === 'test_minio';++ const extensionDir = pathLib.resolve(__dirname); //,'../tests');+ if (!sh.test('-d', extensionDir)) {+ sh.mkdir(extensionDir);+ }++ sh.cd(extensionDir);+}++export async function startMinio() {+ const winMinio = pathLib.resolve(__dirname, './bin/minio.exe');+ const unixMinio = 'minio'; // TODO unix path++ const command = global.isWin ? winMinio : unixMinio;+ const minioProcess = await require('child_process').spawn(command, [+ 'server',+ pathLib.resolve('./testdata-tmp/file-structure')+ ]);++ minioProcess.on('exit', function(code) {+ // console.log('exit here with code: ', code);+ });+ minioProcess.on('close', (code, signal) => {+ // console.log(`child process terminated due to receipt of signal ${signal}`);+ });++ minioProcess.stdout.on('data', function(data) {+ // console.log('stdout: ' + data);+ });++ minioProcess.stderr.on('data', function(data) {+ console.log('stderr: ' + data);+ });+ return minioProcess;+}+export function stopMinio(process) {+ // Send SIGHUP to process.+ console.log('stopMinio');+ process.stdin.pause();+ process.kill(); //'SIGHUP');+}++export async function startChromeDriver() {+ //const childProcess = await require('child_process');+ const chromeDriver = await require('chromedriver');+ //const binPath = chromedriver.path;++ const args = ['--url-base=/', '--port=9515'];++ await chromeDriver.start(args);+ /*const process = await childProcess.execFile(binPath, args, function (err, stdout, stderr) {+ // handle results+ console.log('err: ' + err);+ console.log('stdout: ' + stdout);+ console.log('stderr: ' + stderr);+ });*/+ return chromeDriver;+}++export async function stopChromeDriver(chromeDriver) {+ chromeDriver.stop();+ // Send SIGHUP to process.+ /*console.log('stopChromeDriver');+ process.stdin.pause();+ process.kill(); //'SIGHUP');*/+}++export async function startWebServer() {+ const express = await require('express');+ const serveStatic = await require('serve-static');++ const port = 8000;+ const app = express();++ await app.use(+ serveStatic(pathLib.resolve(__dirname, '../web'), {+ index: ['index.html']+ })+ );+ if (global.isMac) {+ //todo copyfiles do not work for MacOS+ await app.use(serveStatic('../app'));+ }+ app.server = app.listen(port);+ console.log('Webserver listining on http://127.0.0.1:' + port);+ return app;+}++export async function stopWebServer(app) {+ await app.server.close();+ app = null;+}diff --git a/yarn.lock b/yarn.lockindex 9dc053172..537690e69 100644--- a/yarn.lock+++ b/yarn.lock@@ -3536,12 +3536,12 @@ aws4@^1.2.1, aws4@^1.8.0:resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==-axios@^0.19.2:- version "0.19.2"- resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"- integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==+axios@^0.21.0:+ version "0.21.0"+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz#26df088803a2350dff2c27f96fef99fe49442aca"+ integrity sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==dependencies:- follow-redirects "1.5.10"+ follow-redirects "^1.10.0"axobject-query@^2.0.1:version "2.2.0"@@ -4624,17 +4624,18 @@ chrome-trace-event@^1.0.2:dependencies:tslib "^1.9.0"-chromedriver@^86.0.0:- version "86.0.0"- resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-86.0.0.tgz#4b9504d5bbbcd4c6bd6d6fd1dd8247ab8cdeca67"- integrity sha512-byLJWhAfuYOmzRYPDf4asJgGDbI4gJGHa+i8dnQZGuv+6WW1nW1Fg+8zbBMOfLvGn7sKL41kVdmCEVpQHn9oyg==+chromedriver@^87.0.4:+ version "87.0.4"+ resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-87.0.4.tgz#749f69e9427880abff19c1838258c35238397e50"+ integrity sha512-kD4N/L8c0nAzh1eEAiAbEIq6Pn5TvGvckODvP5dPqF90q5tPiAJZCoWWSOUV/mrPxiodjHPfmNeOfGERHugzug==dependencies:"@testim/chrome-version" "^1.0.7"- axios "^0.19.2"- del "^5.1.0"+ axios "^0.21.0"+ del "^6.0.0"extract-zip "^2.0.1"https-proxy-agent "^5.0.0"mkdirp "^1.0.4"+ proxy-from-env "^1.1.0"tcp-port-used "^1.0.1"chromium-pickle-js@^0.2.0:@@ -5587,7 +5588,7 @@ [email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.dependencies:ms "2.0.0"[email protected], debug@=3.1.0:version "3.1.0"resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==@@ -5778,18 +5779,18 @@ del@^4.1.1:pify "^4.0.1"rimraf "^2.6.3"-del@^5.1.0:- version "5.1.0"- resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"- integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==+del@^6.0.0:+ version "6.0.0"+ resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"+ integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==dependencies:- globby "^10.0.1"- graceful-fs "^4.2.2"+ globby "^11.0.1"+ graceful-fs "^4.2.4"is-glob "^4.0.1"is-path-cwd "^2.2.0"- is-path-inside "^3.0.1"- p-map "^3.0.0"- rimraf "^3.0.0"+ is-path-inside "^3.0.2"+ p-map "^4.0.0"+ rimraf "^3.0.2"slash "^3.0.0"delayed-stream@~1.0.0:@@ -7113,7 +7114,7 @@ fast-glob@^2.2.6:merge2 "^1.2.3"micromatch "^3.1.10"-fast-glob@^3.0.3:+fast-glob@^3.1.1:version "3.2.4"resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==@@ -7392,18 +7393,16 @@ fn-name@~2.0.1:resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=- version "1.5.10"- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"- integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==- dependencies:- debug "=3.1.0"-follow-redirects@^1.0.0:version "1.13.0"resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==+follow-redirects@^1.10.0:+ version "1.13.1"+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7"+ integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==+for-in@^1.0.2:version "1.0.2"resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"@@ -7849,18 +7848,16 @@ globalthis@^1.0.1:dependencies:define-properties "^1.1.3"-globby@^10.0.1:- version "10.0.2"- resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"- integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==+globby@^11.0.1:+ version "11.0.1"+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"+ integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==dependencies:- "@types/glob" "^7.1.1"array-union "^2.1.0"dir-glob "^3.0.1"- fast-glob "^3.0.3"- glob "^7.1.3"- ignore "^5.1.1"- merge2 "^1.2.3"+ fast-glob "^3.1.1"+ ignore "^5.1.4"+ merge2 "^1.3.0"slash "^3.0.0"globby@^6.1.0:@@ -7965,7 +7962,7 @@ got@^9.6.0:to-readable-stream "^1.0.0"url-parse-lax "^3.0.0"-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:version "4.2.4"resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==@@ -8521,7 +8518,7 @@ ignore@^4.0.3, ignore@^4.0.6:resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==-ignore@^5.0.4, ignore@^5.1.1:+ignore@^5.0.4, ignore@^5.1.4:version "5.1.8"resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==@@ -9080,7 +9077,7 @@ is-path-inside@^2.1.0:dependencies:path-is-inside "^1.0.2"-is-path-inside@^3.0.1:+is-path-inside@^3.0.1, is-path-inside@^3.0.2:version "3.0.2"resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==@@ -9530,6 +9527,16 @@ jest-jasmine2@^26.4.2:pretty-format "^26.4.2"throat "^5.0.0"+jest-junit@^12.0.0:+ version "12.0.0"+ resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-12.0.0.tgz#3ebd4a6a84b50c4ab18323a8f7d9cceb9d845df6"+ integrity sha512-+8K35LlboWiPuCnXSyiid7rFdxNlpCWWM20WEYe6IZH6psfUWKZmSpSRQ5tk0C0cBeDsvsnIzcef5mYhyJsbug==+ dependencies:+ mkdirp "^1.0.4"+ strip-ansi "^5.2.0"+ uuid "^3.3.3"+ xml "^1.0.1"+jest-leak-detector@^26.4.2:version "26.4.2"resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f"@@ -12115,10 +12122,10 @@ p-map@^2.0.0:resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==-p-map@^3.0.0:- version "3.0.0"- resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"- integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==+p-map@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"+ integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==dependencies:aggregate-error "^3.0.0"@@ -13126,7 +13133,7 @@ proxy-addr@~2.0.5:forwarded "~0.1.2"ipaddr.js "1.9.1"-proxy-from-env@^1.0.0:+proxy-from-env@^1.0.0, proxy-from-env@^1.1.0:version "1.1.0"resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==@@ -16662,7 +16669,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0:+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0:version "3.4.0"resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==@@ -17297,6 +17304,11 @@ [email protected]:sax ">=0.6.0"xmlbuilder "~9.0.1"+xml@^1.0.1:+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"+ integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=+version "15.0.0"resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.0.0.tgz#de9a078a0b82ef0c6da5c76e58813a879eec31ec"