Skip to content

Commit 3fdd455

Browse files
Fix jest lint warning
Issue: BB-295
1 parent 897c063 commit 3fdd455

14 files changed

+521
-555
lines changed

tests/functional/api/routes.spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,8 @@ describe('API routes', () => {
755755
});
756756
});
757757

758-
it('should return all metrics for route:' + ` /_/metrics/crr/${site1}` +
759-
`/progress/${BUCKET_NAME}/${OBJECT_KEY}?versionId=${VERSION_ID}`,
758+
it('should return all metrics for route:' +
759+
` /_/metrics/crr/${site1}/progress/${BUCKET_NAME}/${OBJECT_KEY}?versionId=${VERSION_ID}`,
760760
done =>
761761
getRequest(`/_/metrics/crr/${site1}/progress/${BUCKET_NAME}/` +
762762
`${OBJECT_KEY}?versionId=${VERSION_ID}`, (err, res) => {
@@ -768,8 +768,8 @@ describe('API routes', () => {
768768
done();
769769
}));
770770

771-
it('should return all metrics for route:' + `/_/metrics/crr/${site1}` +
772-
`/throughput/${BUCKET_NAME}/${OBJECT_KEY}?versionId=${VERSION_ID}`,
771+
it('should return all metrics for route:' +
772+
`/_/metrics/crr/${site1}/throughput/${BUCKET_NAME}/${OBJECT_KEY}?versionId=${VERSION_ID}`,
773773
done =>
774774
getRequest(`/_/metrics/crr/${site1}/throughput/${BUCKET_NAME}/` +
775775
`${OBJECT_KEY}?versionId=${VERSION_ID}`, (err, res) => {

tests/functional/lifecycle/LifecycleConductor.spec.js

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,8 @@ describe('lifecycle conductor', () => {
327327
} = opts;
328328

329329
if (skip) {
330-
it.skip('should populate queue : ' + `${skip}`, () => { });
330+
it.skip('should populate queue : ' +
331+
`${skip}`, () => { assert.fail(skip); });
331332
return;
332333
}
333334

@@ -533,63 +534,56 @@ describe('lifecycle conductor', () => {
533534
describe.each([
534535
{
535536
description: 'with auth `account` and buckets from bucketd',
536-
options: {
537-
lifecycleConfig: {
538-
...baseLCConfig,
539-
conductor: {
540-
...baseLCConfig.conductor,
541-
bucketSource: 'bucketd',
542-
bucketd: {
543-
host: '127.0.0.1',
544-
},
537+
lifecycleConfig: {
538+
...baseLCConfig,
539+
conductor: {
540+
...baseLCConfig.conductor,
541+
bucketSource: 'bucketd',
542+
bucketd: {
543+
host: '127.0.0.1',
545544
},
546545
},
547-
mockBucketd: true,
548-
transformExpectedMessages: identity,
549-
}
546+
},
547+
mockBucketd: true,
548+
transformExpectedMessages: identity,
550549
},
551550
{
552551
description: 'with auth `account` and buckets from zookeeper (compat mode)',
553-
options: {
554-
lifecycleConfig: baseLCConfig,
555-
setupZookeeper: true,
556-
transformExpectedMessages: identity,
557-
}
552+
lifecycleConfig: baseLCConfig,
553+
setupZookeeper: true,
554+
transformExpectedMessages: identity,
558555
},
559556
{
560557
description: 'with auth `assumeRole` and buckets from bucketd',
561-
options: {
562-
lifecycleConfig: {
563-
...baseLCConfig,
564-
conductor: {
565-
...baseLCConfig.conductor,
566-
bucketSource: 'bucketd',
567-
bucketd: {
568-
host: '127.0.0.1',
569-
},
558+
lifecycleConfig: {
559+
...baseLCConfig,
560+
conductor: {
561+
...baseLCConfig.conductor,
562+
bucketSource: 'bucketd',
563+
bucketd: {
564+
host: '127.0.0.1',
570565
},
571-
auth: {
572-
type: 'assumeRole',
573-
roleName: 'lc',
574-
sts: {
575-
host: '127.0.0.1',
576-
port: 8650,
577-
accessKey: 'ak',
578-
secretKey: 'sk',
579-
},
580-
vault: {
581-
host: '127.0.0.1',
582-
},
566+
},
567+
auth: {
568+
type: 'assumeRole',
569+
roleName: 'lc',
570+
sts: {
571+
host: '127.0.0.1',
572+
port: 8650,
573+
accessKey: 'ak',
574+
secretKey: 'sk',
575+
},
576+
vault: {
577+
host: '127.0.0.1',
583578
},
584579
},
585-
mockBucketd: true,
586-
mockVault: true,
587-
transformExpectedMessages: withAccountIds,
588-
skip: 'to be reintroduced with https://scality.atlassian.net/browse/BB-126',
589-
}
580+
},
581+
mockBucketd: true,
582+
mockVault: true,
583+
transformExpectedMessages: withAccountIds,
584+
skip: 'to be reintroduced with https://scality.atlassian.net/browse/BB-126',
590585
}
591-
]).each('$description', ({
592-
description,
593-
options,
594-
}) => describeConductorSpec(options));
586+
])('$description', options => {
587+
describeConductorSpec(options);
588+
});
595589
});

0 commit comments

Comments
 (0)