Skip to content

Commit fe55268

Browse files
committed
ssonew
2 parents 69afee0 + 26f81dd commit fe55268

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

.circleci/config.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,11 @@ jobs:
421421
- checkout
422422
- attach_workspace:
423423
at: .
424-
# - run: choco install nodejs --version=18.15.0
425-
- run: nvm install 18.15.0
426-
- run: nvm use 18.15.0
424+
- run:
425+
command: |
426+
nvm install 18.15.0
427+
nvm use 18.15.0
428+
npm install --global yarn
427429
- run:
428430
command: |
429431
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/electron/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
@@ -768,10 +770,10 @@ jobs:
768770
- run:
769771
name: Build windows exe
770772
command: |
771-
# choco install nodejs --version=18.15.0
772773
nvm install 18.15.0
773774
nvm use 18.15.0
774-
npm i -g yarn
775+
npm install --global yarn
776+
775777
# set ALL_REDIS_COMMANDS=$(curl $ALL_REDIS_COMMANDS_RAW_URL)
776778
yarn install
777779
yarn --cwd redisinsight/api/ install

redisinsight/desktop/src/lib/server/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let beApp: any
2424
export const launchApiServer = async () => {
2525
try {
2626
const detectPortConst = await getPort({ port: portNumbers(port, port + 1_000) })
27-
process.env.API_PORT = detectPortConst?.toString()
27+
process.env.RI_APP_PORT = detectPortConst?.toString()
2828

2929
if (process.env.APPIMAGE) {
3030
process.env.BUILD_PACKAGE = 'appimage'

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,14 @@ export class WorkbenchActions {
2828
await t.click(workbenchPage.selectViewType)
2929
.click(workbenchPage.viewTypeOptionClientList);
3030
await t.switchToIframe(workbenchPage.iframe);
31-
await t.expect(Selector('tbody tr').count).eql(numberOfRowsInTextView);
31+
const paginationSelector = Selector('a[data-test-subj=pagination-button-next]');
32+
const tableRow = Selector('tbody tr');
33+
let rowCount = await tableRow.count;
34+
if(await paginationSelector.visible) {
35+
await t.click(paginationSelector);
36+
rowCount += await tableRow.count;
37+
}
38+
await t.expect(rowCount).eql(numberOfRowsInTextView);
3239
}
3340
/**
3441
Verify error message after `client list` command if there is no permission to run

tests/e2e/tests/web/critical-path/url-handling/url-handling.e2e.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ test
7676
memoryLimitMeasurementUnit: 'mb',
7777
free: 'true'
7878
};
79-
console.log('!!!!');
80-
console.log(generateLink(connectUrlParams));
79+
8180
await t.navigateTo(generateLink(connectUrlParams));
8281
await t.wait(10_000);
8382
await t.expect(workbenchPage.submitCommandButton.exists).ok('Redirection to Workbench is not correct');

0 commit comments

Comments
 (0)