Skip to content

Commit 4b12511

Browse files
committed
fixes for failed regression tests
1 parent 5bda338 commit 4b12511

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

tests/e2e/tests/critical-path/database/clone-databases.e2e.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ test
114114
await t.click(addRedisDatabasePage.testConnectionBtn);
115115
await t.expect(myRedisDatabasePage.databaseInfoMessage.textContent).contains('Connection is successful', 'Sentinel connection is not successful');
116116

117-
await t.click(addRedisDatabasePage.cloneDatabaseButton);
118117
// Verify that for Sentinel Host and Port fields are replaced with editable Primary Group Name field
119118
await t
120119
.expect(myRedisDatabasePage.editAliasButton.withText('Clone ').exists).ok('Clone panel is not displayed')

tests/e2e/tests/critical-path/workbench/scripting-area.e2e.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,21 @@ fixture `Scripting area at Workbench`
3030
// Update after resolving https://redislabs.atlassian.net/browse/RI-3299
3131
test('Verify that user can resize scripting area in Workbench', async t => {
3232
const commandForSend = 'info';
33-
const offsetY = 200;
34-
const inputHeightStart = await workbenchPage.queryInput.clientHeight;
35-
const inputHeightEnd = inputHeightStart + 150;
33+
const offsetY = 100;
3634

3735
await workbenchPage.sendCommandInWorkbench(commandForSend);
3836
// Verify that user can run any script from CLI in Workbench and see the results
3937
await t.expect(workbenchPage.queryCardContainer.exists).ok('Query card was added');
4038
const sentCommandText = workbenchPage.queryCardCommand.withExactText(commandForSend);
4139
await t.expect(sentCommandText.exists).ok('Result of sent command exists');
4240

41+
const inputHeightStart = await workbenchPage.queryInput.clientHeight;
42+
4343
await t.hover(workbenchPage.resizeButtonForScriptingAndResults);
44-
await t.drag(workbenchPage.resizeButtonForScriptingAndResults, 0, offsetY, { speed: 0.01 });
44+
await t.drag(workbenchPage.resizeButtonForScriptingAndResults, 0, offsetY, { speed: 0.4 });
4545
// Verify that user can resize scripting area
46-
await t.expect(await workbenchPage.queryInput.clientHeight > inputHeightEnd).ok('Scripting area after resize has incorrect size');
46+
const inputHeightEnd = inputHeightStart + 20;
47+
await t.expect(await workbenchPage.queryInput.clientHeight).gt(inputHeightEnd, 'Scripting area after resize has incorrect size');
4748
});
4849
test('Verify that user when he have more than 10 results can request to view more results in Workbench', async t => {
4950
indexName = common.generateWord(5);

tests/e2e/tests/regression/browser/keys-all-databases.e2e.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { t } from 'testcafe';
1+
import { Selector, t } from 'testcafe';
22
import { env, rte } from '../../../helpers/constants';
33
import {
44
acceptLicenseTermsAndAddDatabaseApi,
@@ -40,8 +40,9 @@ const verifyKeysAdded = async(): Promise<void> => {
4040
await t.expect(notification).contains('Key has been added', 'The notification not correct');
4141
// Check that new key is displayed in the list
4242
await browserPage.searchByKeyName(keyName);
43-
const isKeyIsDisplayedInTheList = await browserPage.isKeyIsDisplayedInTheList(keyName);
44-
await t.expect(isKeyIsDisplayedInTheList).ok('The key is not added');
43+
const keyNameInTheList = Selector(`[data-testid="key-${keyName}"]`);
44+
await common.waitForElementNotVisible(browserPage.loader);
45+
await t.expect(keyNameInTheList.exists).ok(`${keyName} key is not added`);
4546
};
4647

4748
fixture `Work with keys in all types of databases`

tests/e2e/tests/regression/browser/resize-columns.e2e.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ const longFieldName = common.generateSentence(20);
1919
const keys = [
2020
{ type: 'Hash',
2121
name: `${keyName}:1`,
22-
offsetX: 100,
22+
offsetX: 50,
2323
fieldWidthStart: 0,
2424
fieldWidthEnd: 0
2525
},
2626
{
2727
type: 'List',
2828
name: `${keyName}:2`,
29-
offsetX: 80,
29+
offsetX: 40,
3030
fieldWidthStart: 0,
3131
fieldWidthEnd: 0
3232
},
3333
{
3434
type: 'Zset',
3535
name: `${keyName}:3`,
36-
offsetX: 50,
36+
offsetX: 30,
3737
fieldWidthStart: 0,
3838
fieldWidthEnd: 0
3939
}
@@ -75,7 +75,7 @@ test('Resize of columns in Hash, List, Zset Key details', async t => {
7575
// Remember initial column width
7676
key.fieldWidthStart = await field.clientWidth;
7777
await t.hover(tableHeaderResizeTrigger);
78-
await t.drag(tableHeaderResizeTrigger, -key.offsetX, 0, { speed: 0.5 });
78+
await t.drag(tableHeaderResizeTrigger, -key.offsetX, 0, { speed: 0.4 });
7979
// Remember last column width
8080
key.fieldWidthEnd = await field.clientWidth;
8181
// Verify that user can resize columns for Hash, List, Zset Keys
@@ -96,9 +96,9 @@ test('Resize of columns in Hash, List, Zset Key details', async t => {
9696
// Go to 2nd database
9797
await myRedisDatabasePage.clickOnDBByName(databasesForAdding[1].databaseName);
9898
// Verify that resize saved for specific data type
99-
for(const key of keys) {
99+
for (const key of keys) {
100100
await browserPage.openKeyDetails(key.name);
101-
await t.expect(field.clientWidth).eql(key.fieldWidthEnd, `Resize context not saved for ${key.type} key when switching between databases`);
101+
await t.expect(field.clientWidth).within(key.fieldWidthEnd - 5, key.fieldWidthEnd + 5, `Resize context not saved for ${key.type} key when switching between databases`);
102102
}
103103

104104
// Change db index for 2nd database

tests/e2e/tests/regression/cli/cli-re-cluster.e2e.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { t } from 'testcafe';
1+
import { Selector, t } from 'testcafe';
22
import { env, rte } from '../../../helpers/constants';
33
import {
44
acceptLicenseTermsAndAddOSSClusterDatabase,
@@ -32,8 +32,9 @@ const verifyCommandsInCli = async(): Promise<void> => {
3232
await t.pressKey('enter');
3333
// Check that the key is added
3434
await browserPage.searchByKeyName(keyName);
35-
const isKeyIsDisplayedInTheList = await browserPage.isKeyIsDisplayedInTheList(keyName);
36-
await t.expect(isKeyIsDisplayedInTheList).ok('The key is added');
35+
const keyNameInTheList = Selector(`[data-testid="key-${keyName}"]`);
36+
await common.waitForElementNotVisible(browserPage.loader);
37+
await t.expect(keyNameInTheList.exists).ok(`${keyName} key is not added`);
3738
};
3839

3940
fixture `Work with CLI in all types of databases`

0 commit comments

Comments
 (0)