Skip to content

Commit d59cb28

Browse files
committed
Update .circleci and refactor code
1 parent 04e0bd5 commit d59cb28

File tree

5 files changed

+24
-78
lines changed

5 files changed

+24
-78
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ workflows:
927927
- e2e-tests:
928928
name: E2ETest
929929
build: docker
930-
parallelism: 1
930+
parallelism: 4
931931
requires:
932932
- Build docker image
933933
# Workflow for feature, bugfix, main branches
@@ -973,7 +973,7 @@ workflows:
973973
- e2e-tests:
974974
name: E2ETest
975975
build: docker
976-
parallelism: 1
976+
parallelism: 4
977977
requires:
978978
- Build docker image
979979
# Approve to build
@@ -1061,7 +1061,7 @@ workflows:
10611061
- e2e-tests:
10621062
name: E2ETest
10631063
build: docker
1064-
parallelism: 1
1064+
parallelism: 4
10651065
requires:
10661066
- Build docker image
10671067

@@ -1223,7 +1223,7 @@ workflows:
12231223
# e2e web tests on docker image build
12241224
- e2e-tests:
12251225
name: E2ETest - Nightly
1226-
parallelism: 1
1226+
parallelism: 4
12271227
build: docker
12281228
report: true
12291229
requires:

tests/e2e/common-actions/workbench-actions.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,7 @@ export class WorkbenchActions {
1010
async verifyClientListColumnsAreVisible(): Promise<void> {
1111
await t.expect(workbenchPage.clientListTableHeaderCellId.visible).ok('id column is not visible');
1212
await t.expect(workbenchPage.clientListTableHeaderCellAddr.visible).ok('addr column is not visible');
13-
await t.expect(workbenchPage.clientListTableHeaderCellLAddr.visible).ok('laddr column is not visible');
14-
await t.expect(workbenchPage.clientListTableHeaderCellFd.visible).ok('fd column is not visible');
1513
await t.expect(workbenchPage.clientListTableHeaderCellName.visible).ok('name column is not visible');
16-
await t.expect(workbenchPage.clientListTableHeaderCellAge.visible).ok('age column is not visible');
17-
await t.expect(workbenchPage.clientListTableHeaderCellIdle.visible).ok('idle column is not visible');
18-
await t.expect(workbenchPage.clientListTableHeaderCellFlags.visible).ok('flags column is not visible');
19-
await t.expect(workbenchPage.clientListTableHeaderCellDb.visible).ok('db column is not visible');
20-
await t.expect(workbenchPage.clientListTableHeaderCellSub.visible).ok('sub column is not visible');
21-
await t.expect(workbenchPage.clientListTableHeaderCellPSub.visible).ok('psub column is not visible');
22-
await t.expect(workbenchPage.clientListTableHeaderCellMulti.visible).ok('multi column is not visible');
23-
await t.expect(workbenchPage.clientListTableHeaderCellQBuf.visible).ok('qbuf column is not visible');
24-
await t.expect(workbenchPage.clientListTableHeaderCellQBufFree.visible).ok('qbuf-free column is not visible');
25-
await t.expect(workbenchPage.clientListTableHeaderCellQBufArgvMem.visible).ok('argv-mem column is not visible');
26-
await t.expect(workbenchPage.clientListTableHeaderCellObl.visible).ok('obl column is not visible');
27-
await t.expect(workbenchPage.clientListTableHeaderCellOll.visible).ok('oll column is not visible');
28-
await t.expect(workbenchPage.clientListTableHeaderCellOmem.visible).ok('omem column is not visible');
29-
await t.expect(workbenchPage.clientListTableHeaderCellTotMem.visible).ok('tot-mem column is not visible');
30-
await t.expect(workbenchPage.clientListTableHeaderCellEvents.visible).ok('events column is not visible');
31-
await t.expect(workbenchPage.clientListTableHeaderCellCmd.visible).ok('cmd column is not visible');
3214
await t.expect(workbenchPage.clientListTableHeaderCellUser.visible).ok('user column is not visible');
33-
await t.expect(workbenchPage.clientListTableHeaderCellRedir.visible).ok('redir column is not visible');
3415
}
3516
}

tests/e2e/pageObjects/workbench-page.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -143,28 +143,8 @@ export class WorkbenchPage {
143143
typeSelectedClientsList = Selector('[data-testid=view-type-selected-Plugin-client-list__clients-list]');
144144
clientListTableHeaderCellId = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_id_/);
145145
clientListTableHeaderCellAddr = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_addr_/);
146-
clientListTableHeaderCellLAddr = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_laddr_/);
147-
clientListTableHeaderCellFd = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_fd_/);
148146
clientListTableHeaderCellName = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_name_/);
149-
clientListTableHeaderCellAge = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_age_/);
150-
clientListTableHeaderCellIdle = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_idle_/);
151-
clientListTableHeaderCellFlags = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_flags_/);
152-
clientListTableHeaderCellDb = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_db/);
153-
clientListTableHeaderCellSub = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_sub_/);
154-
clientListTableHeaderCellPSub = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_psub_/);
155-
clientListTableHeaderCellMulti = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_multi_/);
156-
clientListTableHeaderCellQBuf = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_qbuf_/);
157-
clientListTableHeaderCellQBufFree = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_qbuf-free_/);
158-
clientListTableHeaderCellQBufArgvMem = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_argv-mem_/);
159-
clientListTableHeaderCellObl = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_obl_/);
160-
clientListTableHeaderCellOll = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_oll_/);
161-
clientListTableHeaderCellOmem = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_omem_/);
162-
clientListTableHeaderCellTotMem = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_tot-mem_/);
163-
clientListTableHeaderCellEvents = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_events_/);
164-
clientListTableHeaderCellCmd = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_cmd_/);
165147
clientListTableHeaderCellUser = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_user_/);
166-
clientListTableHeaderCellRedir = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_redir_/);
167-
168148
/**
169149
* Get card container by command
170150
* @param command The command

tests/e2e/tests/regression/workbench/client-list-plugin.e2e.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

tests/e2e/tests/regression/workbench/command-results.e2e.ts

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import { acceptLicenseTermsAndAddDatabaseApi } from '../../../helpers/database';
2-
import { WorkbenchPage } from '../../../pageObjects/workbench-page';
3-
import { MyRedisDatabasePage } from '../../../pageObjects';
2+
import { WorkbenchPage, MyRedisDatabasePage } from '../../../pageObjects';
43
import {
54
commonUrl,
65
ossStandaloneRedisearch
76
} from '../../../helpers/conf';
87
import { env, rte } from '../../../helpers/constants';
98
import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
109
import { Common } from '../../../helpers/common';
10+
import {WorkbenchActions} from '../../../common-actions/workbench-actions';
1111

1212
const myRedisDatabasePage = new MyRedisDatabasePage();
1313
const workbenchPage = new WorkbenchPage();
14+
const workBenchActions = new WorkbenchActions();
1415
const common = new Common();
1516

1617
const indexName = common.generateWord(5);
@@ -117,3 +118,20 @@ test('Big output in workbench is visible in virtualized table', async t => {
117118
// Verify that all commands scrolled
118119
await t.expect(lastExpectedItem.visible).ok('Final execution time message not displayed');
119120
});
121+
122+
test.before(async t => {
123+
await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneRedisearch, ossStandaloneRedisearch.databaseName);
124+
// Add index and data
125+
await t.click(myRedisDatabasePage.workbenchButton);
126+
}).after(async t => {
127+
await t.switchToMainWindow();
128+
await deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
129+
})('verify client list plugin shows table', async t => {
130+
const command = 'CLIENT LIST';
131+
// Send command in workbench to view client list
132+
await workbenchPage.sendCommandInWorkbench(command);
133+
await t.expect(workbenchPage.typeSelectedClientsList.visible).ok('client list view button is not visible');
134+
await t.switchToIframe(workbenchPage.iframe);
135+
// Verify that I can see the client List visualization available for all users.
136+
await workBenchActions.verifyClientListColumnsAreVisible();
137+
});

0 commit comments

Comments
 (0)