Skip to content

Commit 5798031

Browse files
vlad-dargelvlad-dargel
committed
ts fixes
1 parent 5277539 commit 5798031

File tree

4 files changed

+93
-78
lines changed

4 files changed

+93
-78
lines changed

‎tests/e2e/helpers/google-authorization.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Builder, By, Key, until } from 'selenium-webdriver';
2-
import open = require('open');
32
import { googleUser, googleUserPassword } from './conf';
43

54
export async function processGoogleSSO(urlToUse: string): Promise<void> {
@@ -27,6 +26,7 @@ export async function processGoogleSSO(urlToUse: string): Promise<void> {
2726
const redirectUrl = `${protocol + callbackUrl }?${ modifiedUrl}`;
2827

2928
// Open Redis Insight electron app using deeplink
29+
const open = (await import('open')).default;
3030
await open(redirectUrl, { app: { name: 'Redis Insight' } });
3131
}
3232
catch (error) {

‎tests/e2e/helpers/keys.ts‎

Lines changed: 87 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,23 @@ export async function populateDBWithHashes(host: string, port: string, keyArgume
9191
const dbConf = { port: Number.parseInt(port), host, username: 'default' };
9292
const client = createClient(dbConf);
9393

94-
await client.on('error', async function(error: string) {
94+
client.on('error', (error: string) => {
9595
throw new Error(error);
9696
});
97-
await client.on('connect', async function() {
98-
if (keyArguments.keysCount) {
99-
for (let i = 0; i < keyArguments.keysCount; i++) {
100-
const keyName = `${keyArguments.keyNameStartWith}${Common.generateWord(20)}`;
101-
await client.hset([keyName, 'field1', 'Hello'], async(error: string) => {
102-
if (error) {
103-
throw error;
104-
}
105-
});
97+
98+
client.on('connect', async () => {
99+
try {
100+
if (keyArguments.keysCount) {
101+
for (let i = 0; i < keyArguments.keysCount; i++) {
102+
const keyName = `${keyArguments.keyNameStartWith}${Common.generateWord(20)}`;
103+
await client.hSet(keyName, 'field1', 'Hello');
104+
}
106105
}
106+
} catch (error) {
107+
console.error('Error setting hash:', error);
108+
} finally {
109+
await client.quit();
107110
}
108-
await client.quit();
109111
});
110112
}
111113

@@ -118,25 +120,27 @@ export async function populateDBWithHashes(host: string, port: string, keyArgume
118120
export async function populateHashWithFields(host: string, port: string, keyArguments: AddKeyArguments): Promise<void> {
119121
const dbConf = { port: Number.parseInt(port), host, username: 'default' };
120122
const client = createClient(dbConf);
121-
const fields: string[] = [];
123+
const fields: Record<string, string> = {}; // Using an object for field-value pairs
122124

123-
await client.on('error', async function(error: string) {
125+
client.on('error', (error: string) => {
124126
throw new Error(error);
125127
});
126-
await client.on('connect', async function() {
127-
if (keyArguments.fieldsCount) {
128-
for (let i = 0; i < keyArguments.fieldsCount; i++) {
129-
const field = `${keyArguments.fieldStartWith}${Common.generateWord(10)}`;
130-
const fieldValue = `${keyArguments.fieldValueStartWith}${Common.generateWord(10)}`;
131-
fields.push(field, fieldValue);
128+
129+
client.on('connect', async () => {
130+
try {
131+
if (keyArguments.fieldsCount) {
132+
for (let i = 0; i < keyArguments.fieldsCount; i++) {
133+
const field = `${keyArguments.fieldStartWith}${Common.generateWord(10)}`;
134+
const fieldValue = `${keyArguments.fieldValueStartWith}${Common.generateWord(10)}`;
135+
fields[field] = fieldValue;
136+
}
132137
}
138+
await client.hSet(keyArguments.keyName!, fields);
139+
} catch (error) {
140+
console.error('Error setting hash fields:', error);
141+
} finally {
142+
await client.quit();
133143
}
134-
await client.hset(keyArguments.keyName, fields, async(error: string) => {
135-
if (error) {
136-
throw error;
137-
}
138-
});
139-
await client.quit();
140144
});
141145
}
142146

@@ -151,22 +155,25 @@ export async function populateListWithElements(host: string, port: string, keyAr
151155
const client = createClient(dbConf);
152156
const elements: string[] = [];
153157

154-
await client.on('error', async function(error: string) {
158+
client.on('error', (error: string) => {
155159
throw new Error(error);
156160
});
157-
await client.on('connect', async function() {
158-
if (keyArguments.elementsCount) {
159-
for (let i = 0; i < keyArguments.elementsCount; i++) {
160-
const element = `${keyArguments.elementStartWith}${Common.generateWord(10)}`;
161-
elements.push(element);
161+
162+
client.on('connect', async () => {
163+
try {
164+
if (keyArguments.elementsCount) {
165+
for (let i = 0; i < keyArguments.elementsCount; i++) {
166+
const element = `${keyArguments.elementStartWith}${Common.generateWord(10)}`;
167+
elements.push(element);
168+
}
162169
}
170+
// Push all the elements to the list
171+
await client.lPush(keyArguments.keyName!, elements); // Spread the elements array
172+
} catch (error) {
173+
console.error('Error pushing elements to list:', error);
174+
} finally {
175+
await client.quit();
163176
}
164-
await client.lpush(keyArguments.keyName, elements, async(error: string) => {
165-
if (error) {
166-
throw error;
167-
}
168-
});
169-
await client.quit();
170177
});
171178
}
172179

@@ -181,22 +188,25 @@ export async function populateSetWithMembers(host: string, port: string, keyArgu
181188
const client = createClient(dbConf);
182189
const members: string[] = [];
183190

184-
await client.on('error', async function(error: string) {
191+
client.on('error', (error: string) => {
185192
throw new Error(error);
186193
});
187-
await client.on('connect', async function() {
188-
if (keyArguments.membersCount) {
189-
for (let i = 0; i < keyArguments.membersCount; i++) {
190-
const member = `${keyArguments.memberStartWith}${Common.generateWord(10)}`;
191-
members.push(member);
194+
195+
client.on('connect', async () => {
196+
try {
197+
if (keyArguments.membersCount) {
198+
for (let i = 0; i < keyArguments.membersCount; i++) {
199+
const member = `${keyArguments.memberStartWith}${Common.generateWord(10)}`;
200+
members.push(member);
201+
}
192202
}
203+
// Add all members to the set using sAdd
204+
await client.sAdd(keyArguments.keyName!, members);
205+
} catch (error) {
206+
console.error('Error adding members to set:', error);
207+
} finally {
208+
await client.quit();
193209
}
194-
await client.sadd(keyArguments.keyName, members, async(error: string) => {
195-
if (error) {
196-
throw error;
197-
}
198-
});
199-
await client.quit();
200210
});
201211
}
202212

@@ -208,28 +218,30 @@ export async function populateSetWithMembers(host: string, port: string, keyArgu
208218
*/
209219
export async function populateZSetWithMembers(host: string, port: string, keyArguments: AddKeyArguments): Promise<void> {
210220
const dbConf = { port: Number.parseInt(port), host, username: 'default' };
211-
let minScoreValue: -10;
212-
let maxScoreValue: 10;
221+
const minScoreValue = -10;
222+
const maxScoreValue = 10;
213223
const client = createClient(dbConf);
214-
const members: string[] = [];
224+
const members: { score: number; value: string }[] = [];
215225

216-
await client.on('error', async function(error: string) {
226+
client.on('error', (error: string) => {
217227
throw new Error(error);
218228
});
219-
await client.on('connect', async function() {
220-
if (keyArguments.membersCount) {
221-
for (let i = 0; i < keyArguments.membersCount; i++) {
222-
const memberName = `${keyArguments.memberStartWith}${Common.generateWord(10)}`;
223-
const scoreValue = random(minScoreValue, maxScoreValue).toString(2);
224-
members.push(scoreValue, memberName);
229+
230+
client.on('connect', async () => {
231+
try {
232+
if (keyArguments.membersCount) {
233+
for (let i = 0; i < keyArguments.membersCount; i++) {
234+
const memberName = `${keyArguments.memberStartWith}${Common.generateWord(10)}`;
235+
const scoreValue = random(minScoreValue, maxScoreValue);
236+
members.push({ score: scoreValue, value: memberName });
237+
}
225238
}
239+
await client.zAdd(keyArguments.keyName!, members);
240+
} catch (error) {
241+
console.error('Error adding members to sorted set:', error);
242+
} finally {
243+
await client.quit();
226244
}
227-
await client.zadd(keyArguments.keyName, members, async(error: string) => {
228-
if (error) {
229-
throw error;
230-
}
231-
});
232-
await client.quit();
233245
});
234246
}
235247

@@ -242,16 +254,18 @@ export async function deleteAllKeysFromDB(host: string, port: string): Promise<v
242254
const dbConf = { port: Number.parseInt(port), host, username: 'default' };
243255
const client = createClient(dbConf);
244256

245-
await client.on('error', async function(error: string) {
257+
client.on('error', (error: string) => {
246258
throw new Error(error);
247259
});
248-
await client.on('connect', async function() {
249-
await client.flushall((error: string) => {
250-
if (error) {
251-
throw error;
252-
}
253-
});
254-
await client.quit();
260+
261+
client.on('connect', async () => {
262+
try {
263+
await client.flushAll();
264+
} catch (error) {
265+
console.error('Error flushing database:', error);
266+
} finally {
267+
await client.quit();
268+
}
255269
});
256270
}
257271

‎tests/e2e/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"build:ui": "yarn --cwd ../../ build:ui",
1414
"redis:last": "docker run --name redis-last-version -p 7777:6379 -d redislabs/redismod",
1515
"start:app": "cross-env yarn start:api",
16-
"test:chrome": "testcafe --compiler-options typescript.configPath=tsconfig.testcafe.json --cache --allow-insecure-localhost --disable-multiple-windows --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots/,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png",
16+
"test:chrome": "testcafe --compiler-options typescript.configPath=tsconfig.testcafe.json --cache --disable-multiple-windows --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots/,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png",
1717
"test:chrome:ci": "ts-node ./web.runner.ts",
1818
"test": "yarn test:chrome",
1919
"lint": "eslint . --ext .ts,.js,.tsx,.jsx",

‎tests/e2e/tsconfig.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"compilerOptions": {
3-
"target": "es2020",
4-
"module": "commonjs",
3+
"target": "ES2020",
4+
"module": "CommonJS",
55
"esModuleInterop": true,
66
"forceConsistentCasingInFileNames": true,
77
"strict": true,
88
"skipLibCheck": true,
9-
"sourceMap": true
9+
"sourceMap": true,
10+
"types": ["node"]
1011
},
1112
"exclude": [
1213
"./node_modules",

0 commit comments

Comments
 (0)