rdansie
diff --git a/‎04_removeFromArray/removeFromArray.js
Lines changed: 14 additions & 13 deletions b/‎04_removeFromArray/removeFromArray.js
Lines changed: 14 additions & 13 deletions
diff --git a/‎04_removeFromArray/removeFromArray.spec.js
Lines changed: 5 additions & 5 deletions b/‎04_removeFromArray/removeFromArray.spec.js
Lines changed: 5 additions & 5 deletions
@@ -1,20 +1,21 @@
-const removeFromArray = function(array, num) {
-    //loop through elements of Array
-    for (element of array) {
-        //if it matches the function argument, delete it from the array
-        if (element === num) {
-            let index = array.indexOf(element);
-            array.splice(index,1);
+const removeFromArray = function(array) {
+    //Take arguments without the first array
+    const newArg = [].slice.call(arguments, 1);
+    //Iterate through elements of array
+    for (let i = array.length - 1; i >= 0; i--) {
+        //Iterate through elements of arguments
+        for (let j = newArg.length; j >= 0; j--) {
+            //If element matches argument then remove it from the array
+            if (array[i] === newArg[j]) {
+                array.splice(i,1);
+            }
         }
     }
     return array;
+    
 };
 
+removeFromArray([1,2,3,4],2,3);
+
 // Do not edit below this line
 module.exports = removeFromArray;
-
-
-//turn arguments into array using Array.from()
-
-
-//then run previous function through all elements of arguments array except the 1st
 
@@ -7,19 +7,19 @@ describe('removeFromArray', () => {
   test('removes multiple values', () => {
     expect(removeFromArray([1, 2, 3, 4], 3, 2)).toEqual([1, 4]);
   });
-  test.skip('ignores non present values', () => {
+  test('ignores non present values', () => {
     expect(removeFromArray([1, 2, 3, 4], 7, "tacos")).toEqual([1, 2, 3, 4]);
   });
-  test.skip('ignores non present values, but still works', () => {
+  test('ignores non present values, but still works', () => {
     expect(removeFromArray([1, 2, 3, 4], 7, 2)).toEqual([1, 3, 4]);
   });
-  test.skip('can remove all values', () => {
+  test('can remove all values', () => {
     expect(removeFromArray([1, 2, 3, 4], 1, 2, 3, 4)).toEqual([]);
   });
-  test.skip('works with strings', () => {
+  test('works with strings', () => {
     expect(removeFromArray(["hey", 2, 3, "ho"], "hey", 3)).toEqual([2, "ho"]);
   });
-  test.skip('only removes same type', () => {
+  test('only removes same type', () => {
     expect(removeFromArray([1, 2, 3], "1", 3)).toEqual([1, 2]);
   });
 });