Skip to content

Commit ab56382

Browse files
author
Artem
committed
fix UTests
1 parent f4e90e9 commit ab56382

File tree

1 file changed

+38
-70
lines changed

1 file changed

+38
-70
lines changed

redisinsight/api/src/modules/bulk-actions/bulk-import.service.spec.ts

Lines changed: 38 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
mockIORedisClient,
88
mockIORedisCluster, MockType,
99
} from 'src/__mocks__';
10-
import { MemoryStoredFile } from 'nestjs-form-data';
1110
import { BulkActionSummary } from 'src/modules/bulk-actions/models/bulk-action-summary';
1211
import { IBulkActionOverview } from 'src/modules/bulk-actions/interfaces/bulk-action-overview.interface';
1312
import { BulkActionStatus, BulkActionType } from 'src/modules/bulk-actions/constants';
@@ -17,6 +16,7 @@ import * as fs from 'fs-extra';
1716
import config from 'src/utils/config';
1817
import { join } from 'path';
1918
import { wrapHttpError } from 'src/common/utils';
19+
import { Readable } from 'stream';
2020

2121
const PATH_CONFIG = config.get('dir_path');
2222

@@ -71,13 +71,7 @@ const mockEmptyImportResult: IBulkActionOverview = {
7171
duration: 0,
7272
};
7373

74-
const mockUploadImportFileDto = {
75-
file: {
76-
originalname: 'filename',
77-
size: 1,
78-
buffer: Buffer.from('SET foo bar'),
79-
} as unknown as MemoryStoredFile,
80-
};
74+
const mockReadableStream = Readable.from(Buffer.from('SET foo bar'));
8175

8276
const mockUploadImportFileByPathDto = {
8377
path: '/some/path',
@@ -152,7 +146,7 @@ describe('BulkImportService', () => {
152146

153147
it('should import data', async () => {
154148
spy.mockResolvedValue(mockSummary);
155-
expect(await service.import(mockClientMetadata, mockUploadImportFileDto)).toEqual({
149+
expect(await service.import(mockClientMetadata, mockReadableStream)).toEqual({
156150
...mockImportResult,
157151
duration: jasmine.anything(),
158152
});
@@ -168,21 +162,17 @@ describe('BulkImportService', () => {
168162
succeed: 10_000,
169163
failed: 0,
170164
}));
171-
expect(await service.import(mockClientMetadata, {
172-
file: {
173-
...mockUploadImportFileDto.file,
174-
buffer: generateNCommandsBuffer(100_000),
175-
} as unknown as MemoryStoredFile,
176-
})).toEqual({
177-
...mockImportResult,
178-
summary: {
179-
processed: 100_000,
180-
succeed: 100_000,
181-
failed: 0,
182-
errors: [],
183-
},
184-
duration: jasmine.anything(),
185-
});
165+
expect(await service.import(mockClientMetadata, Readable.from(generateNCommandsBuffer(100_000))))
166+
.toEqual({
167+
...mockImportResult,
168+
summary: {
169+
processed: 100_000,
170+
succeed: 100_000,
171+
failed: 0,
172+
errors: [],
173+
},
174+
duration: jasmine.anything(),
175+
});
186176
});
187177

188178
it('should import data (10K) from file in batches 10K each', async () => {
@@ -191,21 +181,17 @@ describe('BulkImportService', () => {
191181
succeed: 10_000,
192182
failed: 0,
193183
}));
194-
expect(await service.import(mockClientMetadata, {
195-
file: {
196-
...mockUploadImportFileDto.file,
197-
buffer: generateNCommandsBuffer(10_000),
198-
} as unknown as MemoryStoredFile,
199-
})).toEqual({
200-
...mockImportResult,
201-
summary: {
202-
processed: 10_000,
203-
succeed: 10_000,
204-
failed: 0,
205-
errors: [],
206-
},
207-
duration: jasmine.anything(),
208-
});
184+
expect(await service.import(mockClientMetadata, Readable.from(generateNCommandsBuffer(10_000))))
185+
.toEqual({
186+
...mockImportResult,
187+
summary: {
188+
processed: 10_000,
189+
succeed: 10_000,
190+
failed: 0,
191+
errors: [],
192+
},
193+
duration: jasmine.anything(),
194+
});
209195
});
210196

211197
it('should not import any data due to parse error', async () => {
@@ -214,12 +200,10 @@ describe('BulkImportService', () => {
214200
succeed: 0,
215201
failed: 0,
216202
}));
217-
expect(await service.import(mockClientMetadata, {
218-
file: {
219-
...mockUploadImportFileDto.file,
220-
buffer: Buffer.from('{"incorrectdata"}\n{"incorrectdata"}'),
221-
} as unknown as MemoryStoredFile,
222-
})).toEqual({
203+
expect(await service.import(
204+
mockClientMetadata,
205+
Readable.from(Buffer.from('{"incorrectdata"}\n{"incorrectdata"}')),
206+
)).toEqual({
223207
...mockImportResult,
224208
summary: {
225209
processed: 2,
@@ -233,21 +217,19 @@ describe('BulkImportService', () => {
233217
});
234218

235219
it('should ignore blank lines', async () => {
236-
await service.import(mockClientMetadata, {
237-
file: {
238-
...mockUploadImportFileDto.file,
239-
buffer: Buffer.from('\n SET foo bar \n \n SET foo bar \n '),
240-
} as unknown as MemoryStoredFile,
241-
})
242-
expect(spy).toBeCalledWith(mockIORedisClient, [['set', ['foo', 'bar']], ['set', ['foo', 'bar']]])
220+
await service.import(
221+
mockClientMetadata,
222+
Readable.from(Buffer.from('\n SET foo bar \n \n SET foo bar \n ')),
223+
);
224+
expect(spy).toBeCalledWith(mockIORedisClient, [['set', ['foo', 'bar']], ['set', ['foo', 'bar']]]);
243225
expect(mockIORedisClient.disconnect).toHaveBeenCalled();
244226
});
245227

246228
it('should throw an error in case of global error', async () => {
247229
try {
248230
databaseConnectionService.createClient.mockRejectedValueOnce(new NotFoundException());
249231

250-
await service.import(mockClientMetadata, mockUploadImportFileDto);
232+
await service.import(mockClientMetadata, mockReadableStream);
251233

252234
fail();
253235
} catch (e) {
@@ -275,15 +257,15 @@ describe('BulkImportService', () => {
275257

276258
await service.uploadFromTutorial(mockClientMetadata, mockUploadImportFileByPathDto);
277259

278-
expect(mockedFs.readFile).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, mockUploadImportFileByPathDto.path));
260+
expect(mockedFs.createReadStream).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, mockUploadImportFileByPathDto.path));
279261
});
280262

281263
it('should import file by path with static', async () => {
282264
mockedFs.pathExists.mockImplementationOnce(async () => true);
283265

284266
await service.uploadFromTutorial(mockClientMetadata, { path: '/static/guides/_data.file' });
285267

286-
expect(mockedFs.readFile).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, '/guides/_data.file'));
268+
expect(mockedFs.createReadStream).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, '/guides/_data.file'));
287269
});
288270

289271
it('should normalize path before importing and not search for file outside home folder', async () => {
@@ -293,7 +275,7 @@ describe('BulkImportService', () => {
293275
path: '/../../../danger',
294276
});
295277

296-
expect(mockedFs.readFile).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, 'danger'));
278+
expect(mockedFs.createReadStream).toHaveBeenCalledWith(join(PATH_CONFIG.homedir, 'danger'));
297279
});
298280

299281
it('should normalize path before importing and throw an error when search for file outside home folder (relative)', async () => {
@@ -324,19 +306,5 @@ describe('BulkImportService', () => {
324306
expect(e.message).toEqual('Data file was not found');
325307
}
326308
});
327-
328-
it('should throw BadRequest when file size is greater then 100MB', async () => {
329-
mockedFs.pathExists.mockImplementationOnce(async () => true);
330-
mockedFs.stat.mockImplementationOnce(async () => ({ size: 100 * 1024 * 1024 + 1 } as fs.Stats));
331-
332-
try {
333-
await service.uploadFromTutorial(mockClientMetadata, mockUploadImportFileByPathDto);
334-
335-
fail();
336-
} catch (e) {
337-
expect(e).toBeInstanceOf(BadRequestException);
338-
expect(e.message).toEqual('Maximum file size is 100MB');
339-
}
340-
});
341309
});
342310
});

0 commit comments

Comments
 (0)