Skip to content

Commit 7ae91ac

Browse files
committed
Merge branch 'e2e/feature/RI-5743-Rename-capabilities' of https://github.com/RedisInsight/RedisInsight into e2e/feature/RI-5743-Rename-capabilities
2 parents cadeae1 + 9ce2003 commit 7ae91ac

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

.github/generate-build-summary.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ async function generateBuildSummary() {
1919
try {
2020
// Read the contents of the release directory and Docker subdirectory
2121
const files = fs.readdirSync(directoryPath)
22-
const dockerFiles = fs.readdirSync(dockerDirectoryPath).map((file) => `docker/${file}`)
22+
const dockerFiles = fs.existsSync(dockerDirectoryPath) ? fs.readdirSync(dockerDirectoryPath).map((file) => `docker/${file}`) : [];
2323

2424
// Combine all files into a single array
2525
const allFiles = [...files, ...dockerFiles]
@@ -71,6 +71,7 @@ async function generateBuildSummary() {
7171
console.log('Build summary generated successfully.')
7272

7373
} catch (error) {
74+
console.error(error);
7475
}
7576
}
7677

.github/workflows/manual-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
with:
8585
target: ${{ needs.get-selected.outputs.selected }}
8686
debug: ${{ inputs.debug }}
87+
environment: ${{ inputs.environment }}
8788

8889
aws-upload:
8990
uses: ./.github/workflows/aws-upload-dev.yml

tests/e2e/pageObjects/my-redis-databases-page.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ export class MyRedisDatabasePage extends BaseOverviewPage {
5555
exportPasswordsCheckbox = Selector('[data-testid=export-passwords]~div', { timeout: 500 });
5656
//ICONS
5757
moduleColumn = Selector('[data-test-subj=tableHeaderCell_modules_3]');
58-
moduleSearchIcon = Selector('[data-testid^=RediSearch]');
59-
moduleGraphIcon = Selector('[data-testid^=RedisGraph]');
60-
moduleJSONIcon = Selector('[data-testid^=RedisJSON]');
61-
moduleTimeseriesIcon = Selector('[data-testid^=RedisTimeSeries]');
62-
moduleBloomIcon = Selector('[data-testid^=RedisBloom]');
63-
moduleAIIcon = Selector('[data-testid^=RedisAI]');
64-
moduleGearsIcon = Selector('[data-testid^=RedisGears]');
58+
moduleSearchIcon = Selector("[data-testid^='Redis Query Engine']");
59+
moduleGraphIcon = Selector('[data-testid^=Graph]');
60+
moduleJSONIcon = Selector('[data-testid^=JSON]');
61+
moduleTimeseriesIcon = Selector("[data-testid^='Time Series']");
62+
moduleBloomIcon = Selector('[data-testid^=Probabilistic]');
63+
moduleAIIcon = Selector('[data-testid^=AI]');
64+
moduleGearsIcon = Selector('[data-testid^=Gears]');
6565
redisStackIcon = Selector('[data-testid=redis-stack-icon]');
6666
tooltipRedisStackLogo = Selector('[data-testid=tooltip-redis-stack-icon]');
6767
//TEXT INPUTS (also referred to as 'Text fields')

tests/e2e/tests/web/critical-path/database/modules.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const databaseHelper = new DatabaseHelper();
1111
const databaseAPIRequests = new DatabaseAPIRequests();
1212
const chance = new Chance();
1313

14-
const moduleNameList = ['RediSearch', 'RedisJSON', 'RedisGraph', 'RedisTimeSeries', 'RedisBloom', 'RedisGears', 'RedisAI'];
14+
const moduleNameList = ['Redis Query Engine', 'JSON', 'Graph', 'Time Series', 'Probabilistic', 'Gears', 'AI'];
1515
const moduleList = [myRedisDatabasePage.moduleSearchIcon, myRedisDatabasePage.moduleJSONIcon, myRedisDatabasePage.moduleGraphIcon, myRedisDatabasePage.moduleTimeseriesIcon, myRedisDatabasePage.moduleBloomIcon, myRedisDatabasePage.moduleGearsIcon, myRedisDatabasePage.moduleAIIcon];
1616
const uniqueId = chance.string({ length: 10 });
1717
let database = {
@@ -42,7 +42,7 @@ test('Verify that user can see DB modules on DB list page for Standalone DB', as
4242
// Verify that user can see the following sorting order: Search, JSON, Graph, TimeSeries, Bloom, Gears, AI for modules
4343
const databaseLine = myRedisDatabasePage.dbNameList.withExactText(database.databaseName).parent('tr');
4444
await t.expect(databaseLine.visible).ok('Database not found in db list');
45-
const moduleIcons = databaseLine.find('[data-testid^=Redi]');
45+
const moduleIcons = databaseLine.find('[data-testid*=_module]');
4646
const numberOfIcons = await moduleIcons.count;
4747
for (let i = 0; i < numberOfIcons; i++) {
4848
const moduleName = await moduleIcons.nth(i).getAttribute('data-testid');

tests/e2e/tests/web/regression/database/redisstack.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const browserPage = new BrowserPage();
1313
const databaseHelper = new DatabaseHelper();
1414
const databaseAPIRequests = new DatabaseAPIRequests();
1515

16-
const moduleNameList = ['RediSearch', 'RedisGraph', 'RedisBloom', 'RedisJSON', 'RedisTimeSeries'];
16+
const moduleNameList = ['Redis Query Engine', 'Graph', 'Bloom', 'JSON', 'Time Series'];
1717

1818
fixture `Redis Stack`
1919
.meta({ type: 'regression', rte: rte.standalone })

tests/e2e/tests/web/regression/workbench/redisearch-module-not-available.e2e.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ test('Verify that user can see options on what can be done to work with capabili
4545
await workbenchPage.NavigationHeader.togglePanel(true);
4646
await workbenchPage.sendCommandInWorkbench(commandJSON);
4747
// Verify change screens when capability not available - 'JSON'
48-
await t.expect(await workbenchPage.commandExecutionResult.withText('JSON data structure is not available for this database').visible)
49-
.ok('Missing RedisJSON title is not visible');
48+
await t.expect(await workbenchPage.commandExecutionResult.withText('JSON data structure is not available').visible)
49+
.ok('Missing JSON title is not visible');
5050
await workbenchPage.sendCommandInWorkbench(commandFT);
5151
// Verify change screens when capability not available - 'Search'
52-
await t.expect(await workbenchPage.commandExecutionResult.withText('Redis Query Engine is not available for this database').visible)
53-
.ok('Missing RedisSearch title is not visible');
52+
await t.expect(await workbenchPage.commandExecutionResult.withText('Redis Query Engine is not available').visible)
53+
.ok('Missing Search title is not visible');
5454
});

0 commit comments

Comments
 (0)