From 54f475e0b62053a029190e73b6573136d406ba1a Mon Sep 17 00:00:00 2001 From: billalp Date: Sun, 17 Nov 2019 17:15:12 +0000 Subject: [PATCH] Working now --- removeFromArray/removeFromArray.js | 16 +++++++--------- removeFromArray/removeFromArray.spec.js | 10 +++++----- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/removeFromArray/removeFromArray.js b/removeFromArray/removeFromArray.js index a5a3c82..1ef04d3 100644 --- a/removeFromArray/removeFromArray.js +++ b/removeFromArray/removeFromArray.js @@ -1,16 +1,14 @@ const removeFromArray = function(arr, ...args) { - const filteredArray = []; - // const array = args; - const array = [3]; + const filteredArray = arr; - for (let i = 0; i < array.length; i++) { - if (arr.includes(array[i])) { - // filteredArray.push(5); - } else if (arr.includes(array[0])) { - // continue; + for (let i = 0; i < args.length; i++) { + if (arr.includes(args[i])) { + let index = arr.indexOf(args[i]); + filteredArray.splice(index, 1); + } else if (arr.includes(args[i])) { + continue; } } - return filteredArray; } diff --git a/removeFromArray/removeFromArray.spec.js b/removeFromArray/removeFromArray.spec.js index 28c744c..6185342 100644 --- a/removeFromArray/removeFromArray.spec.js +++ b/removeFromArray/removeFromArray.spec.js @@ -4,19 +4,19 @@ describe('removeFromArray', function() { it('removes a single value', function() { expect(removeFromArray([1, 2, 3, 4], 3)).toEqual([1, 2, 4]); }); - xit('removes multiple values', function() { + it('removes multiple values', function() { expect(removeFromArray([1, 2, 3, 4], 3, 2)).toEqual([1, 4]); }); - xit('ignores non present values', function() { + it('ignores non present values', function() { expect(removeFromArray([1, 2, 3, 4], 7, "tacos")).toEqual([1, 2, 3, 4]); }); - xit('ignores non present values, but still works', function() { + it('ignores non present values, but still works', function() { expect(removeFromArray([1, 2, 3, 4], 7, 2)).toEqual([1, 3, 4]); }); - xit('can remove all values', function() { + it('can remove all values', function() { expect(removeFromArray([1, 2, 3, 4], 1, 2, 3, 4)).toEqual([]); }); - xit('works with strings', function() { + it('works with strings', function() { expect(removeFromArray(["hey", 2, 3, "ho"], "hey", 3)).toEqual([2, "ho"]); }); });