Skip to content

Commit 76663e9

Browse files
committed
Rework the test cases to be compatible with the latest bugfix suggestion
1 parent e0dd096 commit 76663e9

File tree

4 files changed

+8
-26
lines changed

4 files changed

+8
-26
lines changed

redisinsight/api/src/modules/certificate/ca-certificate.controller.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ export class CaCertificateController {
3838
@Delete(':id')
3939
@ApiOperation({ description: 'Delete Ca Certificate by id' })
4040
@ApiParam({ name: 'id', type: String })
41-
async delete(
42-
@Param('id') id: string,
43-
): Promise<void> {
41+
async delete(@Param('id') id: string): Promise<void> {
4442
await this.service.delete(id);
4543
}
4644
}

redisinsight/api/src/modules/certificate/ca-certificate.service.spec.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@ import {
55
mockCaCertificate,
66
mockCaCertificateRepository, mockCreateCaCertificateDto,
77
MockType,
8-
mockSessionMetadata,
9-
mockDatabaseRepository,
108
mockRedisClientStorage,
119
} from 'src/__mocks__';
1210
import { CaCertificateRepository } from 'src/modules/certificate/repositories/ca-certificate.repository';
13-
import { DatabaseRepository } from 'src/modules/database/repositories/database.repository';
1411
import { RedisClientStorage } from 'src/modules/redis/redis.client.storage';
1512
import { pick } from 'lodash';
1613
import { KeytarEncryptionErrorException } from 'src/modules/encryption/exceptions';
@@ -29,10 +26,6 @@ describe('CaCertificateService', () => {
2926
provide: CaCertificateRepository,
3027
useFactory: mockCaCertificateRepository,
3128
},
32-
{
33-
provide: DatabaseRepository,
34-
useFactory: mockDatabaseRepository,
35-
},
3629
{
3730
provide: RedisClientStorage,
3831
useFactory: mockRedisClientStorage,
@@ -101,13 +94,13 @@ describe('CaCertificateService', () => {
10194

10295
describe('delete', () => {
10396
it('should delete ca certificate', async () => {
104-
expect(await service.delete(mockSessionMetadata, mockCaCertificate.id)).toEqual(undefined);
97+
expect(await service.delete(mockCaCertificate.id)).toEqual(undefined);
10598
});
10699
it('should throw encryption error', async () => {
107100
repository.delete.mockRejectedValueOnce(new KeytarEncryptionErrorException());
108101

109102
try {
110-
await service.delete(mockSessionMetadata, mockCaCertificate.id);
103+
await service.delete(mockCaCertificate.id);
111104
fail();
112105
} catch (e) {
113106
expect(e).toBeInstanceOf(KeytarEncryptionErrorException);
@@ -117,7 +110,7 @@ describe('CaCertificateService', () => {
117110
repository.delete.mockRejectedValueOnce(new Error());
118111

119112
try {
120-
await service.delete(mockSessionMetadata, mockCaCertificate.id);
113+
await service.delete(mockCaCertificate.id);
121114
fail();
122115
} catch (e) {
123116
expect(e).toBeInstanceOf(InternalServerErrorException);

redisinsight/api/src/modules/certificate/client-certificate.controller.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ export class ClientCertificateController {
3939
@Delete(':id')
4040
@ApiOperation({ description: 'Delete Client Certificate pair by id' })
4141
@ApiParam({ name: 'id', type: String })
42-
async deleteClientCertificatePair(
43-
@Param('id') id: string,
44-
): Promise<void> {
42+
async deleteClientCertificatePair(@Param('id') id: string): Promise<void> {
4543
await this.service.delete(id);
4644
}
4745
}

redisinsight/api/src/modules/certificate/client-certificate.service.spec.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ import {
66
mockClientCertificate,
77
mockClientCertificateRepository, mockCreateClientCertificateDto,
88
MockType,
9-
mockSessionMetadata,
10-
mockDatabaseRepository,
119
mockRedisClientStorage,
1210
} from 'src/__mocks__';
1311
import { KeytarEncryptionErrorException } from 'src/modules/encryption/exceptions';
1412
import { ClientCertificateService } from 'src/modules/certificate/client-certificate.service';
1513
import { ClientCertificateRepository } from 'src/modules/certificate/repositories/client-certificate.repository';
16-
import { DatabaseRepository } from 'src/modules/database/repositories/database.repository';
1714
import { RedisClientStorage } from 'src/modules/redis/redis.client.storage';
1815

1916
describe('ClientCertificateService', () => {
@@ -29,10 +26,6 @@ describe('ClientCertificateService', () => {
2926
provide: ClientCertificateRepository,
3027
useFactory: mockClientCertificateRepository,
3128
},
32-
{
33-
provide: DatabaseRepository,
34-
useFactory: mockDatabaseRepository,
35-
},
3629
{
3730
provide: RedisClientStorage,
3831
useFactory: mockRedisClientStorage,
@@ -101,13 +94,13 @@ describe('ClientCertificateService', () => {
10194

10295
describe('delete', () => {
10396
it('should delete client certificate', async () => {
104-
expect(await service.delete(mockSessionMetadata, mockClientCertificate.id)).toEqual(undefined);
97+
expect(await service.delete(mockClientCertificate.id)).toEqual(undefined);
10598
});
10699
it('should throw encryption error', async () => {
107100
repository.delete.mockRejectedValueOnce(new KeytarEncryptionErrorException());
108101

109102
try {
110-
await service.delete(mockSessionMetadata, mockClientCertificate.id);
103+
await service.delete(mockClientCertificate.id);
111104
fail();
112105
} catch (e) {
113106
expect(e).toBeInstanceOf(KeytarEncryptionErrorException);
@@ -117,7 +110,7 @@ describe('ClientCertificateService', () => {
117110
repository.delete.mockRejectedValueOnce(new Error());
118111

119112
try {
120-
await service.delete(mockSessionMetadata, mockClientCertificate.id);
113+
await service.delete(mockClientCertificate.id);
121114
fail();
122115
} catch (e) {
123116
expect(e).toBeInstanceOf(InternalServerErrorException);

0 commit comments

Comments
 (0)