Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/e2e/pageObjects/browser-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ export class BrowserPage extends InstancePage {
*/
async deleteKeyByName(keyName: string): Promise<void> {
await this.searchByKeyName(keyName);
await t.hover(this.keyNameInTheList);
await t.click(this.keyNameInTheList);
await t.click(this.deleteKeyButton);
await t.click(this.confirmDeleteKeyButton);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test
await t.expect(myRedisDatabasePage.AddRedisDatabase.disabledDatabaseInfo.nth(1).getAttribute('title')).contains(port, 'Wrong port value');
await t.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
// wait for db is added
await t.wait(7_000);
await t.wait(10_000);
await t.expect(workbenchPage.closeEnablementPage.exists).ok('Redirection to Workbench tutorial is not correct');
});

Expand Down Expand Up @@ -76,12 +76,12 @@ test
};

await t.navigateTo(generateLink(connectUrlParams));
await t.wait(7_000);
await t.wait(10_000);
await t.expect(workbenchPage.closeEnablementPage.exists).ok('Redirection to Workbench tutorial is not correct');

//Verify that the same db is not added
await t.navigateTo(generateLink(connectUrlParams));
await t.wait(5_000);
await t.wait(10_000);
await t.click(workbenchPage.NavigationPanel.myRedisDBButton);
await t.expect(browserPage.notification.exists).notOk({ timeout: 10000 });
await t.expect(myRedisDatabasePage.dbNameList.child('span').withExactText(databaseName).count).eql(2, 'the same db is added twice');
Expand Down
26 changes: 9 additions & 17 deletions tests/e2e/tests/web/regression/browser/resize-columns.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { rte } from '../../../../helpers/constants';
import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
import { Common } from '../../../../helpers/common';
import { t } from 'testcafe';

const myRedisDatabasePage = new MyRedisDatabasePage();
const browserPage = new BrowserPage();
Expand Down Expand Up @@ -39,9 +40,9 @@ const keys = [
];
const keyNames: string[] = [];
keys.forEach(key => keyNames.push(key.name));
let databaseName1 = `testDB1_${Common.generateWord(10)}`;
let databaseName2 = `testDB2_${Common.generateWord(10)}`;
let databasesForAdding = [
const databaseName1 = `testDB1_${Common.generateWord(10)}`;
const databaseName2 = `testDB2_${Common.generateWord(10)}`;
const databasesForAdding = [
{ host: ossStandaloneConfig.host, port: ossStandaloneConfig.port, databaseName: databaseName1 },
{ host: ossStandaloneConfig.host, port: ossStandaloneConfig.port, databaseName: databaseName2 }
];
Expand All @@ -50,18 +51,9 @@ fixture `Resize columns in Key details`
.meta({ type: 'regression', rte: rte.standalone })
.page(commonUrl)
.beforeEach(async() => {
databaseName1 = `testDB1_${Common.generateWord(10)}`;
databaseName2 = `testDB2_${Common.generateWord(10)}`;
databasesForAdding = [
{ host: ossStandaloneConfig.host, port: ossStandaloneConfig.port, databaseName: databaseName1 },
{ host: ossStandaloneConfig.host, port: ossStandaloneConfig.port, databaseName: databaseName2 }
];
// Add new databases using API
await databaseHelper.acceptLicenseTerms();
await databaseAPIRequests.addNewStandaloneDatabasesApi(databasesForAdding);
// Reload Page
await myRedisDatabasePage.reloadPage();
await myRedisDatabasePage.clickOnDBByName(databasesForAdding[0].databaseName);
await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(databasesForAdding[0]);
await databaseAPIRequests.addNewStandaloneDatabaseApi(databasesForAdding[1]);
await browserPage.addHashKey(keys[0].name, '2147476121', longFieldName, longFieldName);
await browserPage.addListKey(keys[1].name, '2147476121', 'element');
await browserPage.addZSetKey(keys[2].name, '1', '2147476121', 'member');
Expand All @@ -81,18 +73,18 @@ test('Resize of columns in Hash, List, Zset Key details', async t => {
// Remember initial column width
key.fieldWidthStart = await field.clientWidth;
await t.hover(tableHeaderResizeTrigger);
await t.drag(tableHeaderResizeTrigger, -key.offsetX, 0, { speed: 0.2 });
await t.drag(tableHeaderResizeTrigger, -key.offsetX, 0, { speed: 0.1 });
// Remember last column width
key.fieldWidthEnd = await field.clientWidth;
// Verify that user can resize columns for Hash, List, Zset Keys
await t.expect(key.fieldWidthEnd).eql(key.fieldWidthStart - key.offsetX, `Field is not resized for ${key.type} key`);
await t.expect(key.fieldWidthEnd).within(key.fieldWidthStart - key.offsetX - 5, key.fieldWidthStart - key.offsetX + 5, `Field is not resized for ${key.type} key`);
}

// Verify that resize saved when switching between pages
await t.click(myRedisDatabasePage.NavigationPanel.workbenchButton);
await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
await browserPage.openKeyDetails(keys[0].name);
await t.expect(field.clientWidth).eql(keys[0].fieldWidthEnd, 'Resize context not saved for key when switching between pages');
await t.expect(field.clientWidth).within(keys[0].fieldWidthEnd - 5, keys[0].fieldWidthEnd + 5, 'Resize context not saved for key when switching between pages');

// Apply filter to save it in filter history
await browserPage.searchByKeyName(`${keys[0].name}*`);
Expand Down