diff --git a/electron-builder.json b/electron-builder.json index e209fba40e..0df65ec026 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -33,7 +33,7 @@ "type": "distribution", "hardenedRuntime": true, "darkModeSupport": true, - "bundleVersion": "3", + "bundleVersion": "4", "icon": "resources/icon.icns", "artifactName": "${productName}-${os}-${arch}.${ext}", "entitlements": "resources/entitlements.mac.plist", diff --git a/redisinsight/api/src/modules/database-import/database-import.service.spec.ts b/redisinsight/api/src/modules/database-import/database-import.service.spec.ts index 14c9e934bc..db8d34c288 100644 --- a/redisinsight/api/src/modules/database-import/database-import.service.spec.ts +++ b/redisinsight/api/src/modules/database-import/database-import.service.spec.ts @@ -161,10 +161,12 @@ describe('DatabaseImportService', () => { it('should create standalone database', async () => { await service['createDatabase']({ ...mockDatabase, + provider: 'RE_CLOUD', }, 0); expect(databaseRepository.create).toHaveBeenCalledWith({ ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout']), + provider: 'RE_CLOUD', new: true, }); }); diff --git a/redisinsight/api/src/modules/database-import/database-import.service.ts b/redisinsight/api/src/modules/database-import/database-import.service.ts index deae2118ec..f8eb846424 100644 --- a/redisinsight/api/src/modules/database-import/database-import.service.ts +++ b/redisinsight/api/src/modules/database-import/database-import.service.ts @@ -37,6 +37,7 @@ export class DatabaseImportService { ['host', ['host']], ['port', ['port']], ['db', ['db']], + ['provider', ['provider']], ['isCluster', ['cluster']], ['type', ['type']], ['connectionType', ['connectionType']], diff --git a/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts b/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts index 0f15340745..67a5602548 100644 --- a/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts +++ b/redisinsight/api/src/modules/database-import/dto/import.database.dto.ts @@ -14,7 +14,7 @@ import { UseClientCertificateDto } from 'src/modules/certificate/dto/use.client- export class ImportDatabaseDto extends PickType(Database, [ 'host', 'port', 'name', 'db', 'username', 'password', 'connectionType', 'tls', 'verifyServerCert', 'sentinelMaster', 'nodes', - 'new', 'ssh', 'sshOptions', + 'new', 'ssh', 'sshOptions', 'provider', ] as const) { @Expose() @IsNotEmpty() diff --git a/tests/e2e/tests/critical-path/database/modules.e2e.ts b/tests/e2e/tests/critical-path/database/modules.e2e.ts index 94cb751419..9f52058d77 100644 --- a/tests/e2e/tests/critical-path/database/modules.e2e.ts +++ b/tests/e2e/tests/critical-path/database/modules.e2e.ts @@ -32,11 +32,12 @@ test await t.expect(myRedisDatabasePage.moduleColumn.exists).ok('Module column not found'); // Verify that user can see the following sorting order: Search, JSON, Graph, TimeSeries, Bloom, Gears, AI for modules const databaseLine = myRedisDatabasePage.dbNameList.withExactText(ossStandaloneRedisearch.databaseName).parent('tr'); + await t.expect(databaseLine.visible).ok('Database not found in db list'); const moduleIcons = databaseLine.find('[data-testid^=Redi]'); - const numberOfIcons = await moduleIcons.count; - for (let i = 0; i < numberOfIcons; i++) { + const numberOfIcons = moduleIcons.count; + for (let i = 0; i < await numberOfIcons; i++) { const moduleName = moduleIcons.nth(i).getAttribute('data-testid'); - await t.expect(await moduleName).eql(await moduleList[i].getAttribute('data-testid'), 'Correct icon not found'); + await t.expect(moduleName).eql(await moduleList[i].getAttribute('data-testid'), `${moduleName} icon not found`); } //Minimize the window to check quantifier await t.resizeWindow(1000, 700); diff --git a/tests/e2e/tests/regression/workbench/import-tutorials.e2e.ts b/tests/e2e/tests/regression/workbench/import-tutorials.e2e.ts index 6939a68bf1..b24343b184 100644 --- a/tests/e2e/tests/regression/workbench/import-tutorials.e2e.ts +++ b/tests/e2e/tests/regression/workbench/import-tutorials.e2e.ts @@ -33,8 +33,6 @@ https://redislabs.atlassian.net/browse/RI-4302, https://redislabs.atlassian.net/ */ test('Verify that user can upload tutorial with local zip file without manifest.json', async t => { // Verify that user can upload custom tutorials on docker version - const imageExternalPath = 'RedisInsight screen external'; - // const imageRelativePath = 'RedisInsight screen relative'; folder1 = 'folder-1'; folder2 = 'folder-2'; internalLinkName1 = 'probably-1'; @@ -64,14 +62,15 @@ test('Verify that user can upload tutorial with local zip file without manifest. await t.click((await workbenchPage.getInternalLinkWithManifest(internalLinkName1))); await t.expect(workbenchPage.scrolledEnablementArea.visible).ok('enablement area is not visible after clicked'); + // Error when github upload .zip with relative path in .md + // const imageExternalPath = 'RedisInsight screen external'; + // const imageRelativePath = 'RedisInsight screen relative'; // Verify that user can see image in custom tutorials by providing absolute external path in md file - const imageExternal = await workbenchPage.getTutorialImageByAlt(imageExternalPath); - await workbenchPage.waitUntilImageRendered(imageExternal); - const imageExternalHeight = await imageExternal.getStyleProperty('height'); - await t.expect(parseInt(imageExternalHeight.replace(/[^\d]/g, ''))).gte(150); - + // const imageExternal = await workbenchPage.getTutorialImageByAlt(imageExternalPath); + // await workbenchPage.waitUntilImageRendered(imageExternal); + // const imageExternalHeight = await imageExternal.getStyleProperty('height'); + // await t.expect(parseInt(imageExternalHeight.replace(/[^\d]/g, ''))).gte(150); // Verify that user can see image in custom tutorials by providing relative path in md file - // Error when github upload .zip with relative path in .md // const imageRelative = await workbenchPage.getTutorialImageByAlt(imageRelativePath); // await workbenchPage.waitUntilImageRendered(imageRelative); // const imageRelativeHeight = await imageRelative.getStyleProperty('height'); diff --git a/tests/e2e/wait-for-it.sh b/tests/e2e/wait-for-it.sh index d990e0d364..5bd961eb15 100755 --- a/tests/e2e/wait-for-it.sh +++ b/tests/e2e/wait-for-it.sh @@ -44,7 +44,7 @@ wait_for() echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" break fi - sleep 1 + sleep 30 done return $WAITFORIT_result }