From fa99ea051357a349f747b95fcd230a8477ead41a Mon Sep 17 00:00:00 2001 From: Talha Muhammad Date: Thu, 6 Aug 2020 15:37:30 -0400 Subject: [PATCH 1/2] remove global flag on replace function + add test --- package-lock.json | 3 +-- src/convert-expression/range-conversion.js | 2 +- test/convert-expression/range-conversion-test.js | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77d90e7..101a97d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -508,8 +508,7 @@ "commander": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", - "optional": true + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" }, "commondir": { "version": "1.0.1", diff --git a/src/convert-expression/range-conversion.js b/src/convert-expression/range-conversion.js index aa25306..8988488 100644 --- a/src/convert-expression/range-conversion.js +++ b/src/convert-expression/range-conversion.js @@ -15,7 +15,7 @@ module.exports = ( () => { numbers.push(i); } - return expression.replace(new RegExp(text, 'gi'), numbers.join()); + return expression.replace(new RegExp(text, 'i'), numbers.join()); } function convertRange(expression){ diff --git a/test/convert-expression/range-conversion-test.js b/test/convert-expression/range-conversion-test.js index 553c982..55a9109 100644 --- a/test/convert-expression/range-conversion-test.js +++ b/test/convert-expression/range-conversion-test.js @@ -15,4 +15,10 @@ describe('range-conversion.js', () => { var expression = conversion(expressions).join(' '); expect(expression).to.equal('0,1,2,3 0,1,2,3 8,9,10 1,2,3 1,2 0,1,2,3'); }); + + it('should convert comma delimited ranges to numbers', () => { + var expressions = '0-2,10-23'.split(' '); + var expression = conversion(expressions).join(' '); + expect(expression).to.equal('0,1,2,10,11,12,13,14,15,16,17,18,19,20,21,22,23'); + }) }); From 896a2eec85ec5ea2f999f5721379b28de83fda4e Mon Sep 17 00:00:00 2001 From: Talha Muhammad Date: Thu, 6 Aug 2020 16:17:59 -0400 Subject: [PATCH 2/2] Linter got mad at me --- test/convert-expression/range-conversion-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/convert-expression/range-conversion-test.js b/test/convert-expression/range-conversion-test.js index 55a9109..74dd6f1 100644 --- a/test/convert-expression/range-conversion-test.js +++ b/test/convert-expression/range-conversion-test.js @@ -20,5 +20,5 @@ describe('range-conversion.js', () => { var expressions = '0-2,10-23'.split(' '); var expression = conversion(expressions).join(' '); expect(expression).to.equal('0,1,2,10,11,12,13,14,15,16,17,18,19,20,21,22,23'); - }) + }); });