diff --git a/01_helloWorld/helloWorld.js b/01_helloWorld/helloWorld.js index df27036..b542f3b 100644 --- a/01_helloWorld/helloWorld.js +++ b/01_helloWorld/helloWorld.js @@ -1,5 +1,5 @@ const helloWorld = function() { - return '' + return 'Hello, World!' }; module.exports = helloWorld; diff --git a/02_repeatString/repeatString.js b/02_repeatString/repeatString.js index 4359bbe..44fc157 100644 --- a/02_repeatString/repeatString.js +++ b/02_repeatString/repeatString.js @@ -1,5 +1,12 @@ -const repeatString = function() { - +const repeatString = function(string,number) { + let fullString = ""; + if (number < 0) { + return "ERROR"; + } + for (i = 0; i < number; i++) { + fullString += string; + } + return fullString; }; // Do not edit below this line diff --git a/02_repeatString/repeatString.spec.js b/02_repeatString/repeatString.spec.js index 72fbb99..56b82d4 100644 --- a/02_repeatString/repeatString.spec.js +++ b/02_repeatString/repeatString.spec.js @@ -4,26 +4,26 @@ describe('repeatString', () => { test('repeats the string', () => { expect(repeatString('hey', 3)).toEqual('heyheyhey'); }); - test.skip('repeats the string many times', () => { + test('repeats the string many times', () => { expect(repeatString('hello', 10)).toEqual('hellohellohellohellohellohellohellohellohellohello'); }); - test.skip('repeats the string 1 times', () => { + test('repeats the string 1 times', () => { expect(repeatString('hi', 1)).toEqual('hi'); }); - test.skip('repeats the string 0 times', () => { + test('repeats the string 0 times', () => { expect(repeatString('bye', 0)).toEqual(''); }); - test.skip('does not use the built-in String repeat method', () => { + test('does not use the built-in String repeat method', () => { /* Even though there is a built-in String repeat method, in this exercise specifically, we want you to practise using loops */ jest.spyOn(String.prototype, 'repeat').mockName('Built-in String repeat method'); repeatString("don't use the built-in repeat method!", 1); expect(String.prototype.repeat).not.toHaveBeenCalled(); }); - test.skip('returns ERROR with negative numbers', () => { + test('returns ERROR with negative numbers', () => { expect(repeatString('goodbye', -1)).toEqual('ERROR'); }); - test.skip('repeats the string a random amount of times', function () { + test('repeats the string a random amount of times', function () { /* The number is generated by using Math.random to get a value from between 0 to 1, when this is multiplied by 1000 and rounded down with Math.floor it equals a number between 0 to 999 (this number will change everytime you run @@ -36,7 +36,7 @@ describe('repeatString', () => { const number = Math.floor(Math.random() * 1000); expect(repeatString('hey', number)).toBe('hey'.repeat(number)); }); - test.skip('works with blank strings', () => { + test('works with blank strings', () => { expect(repeatString('', 10)).toEqual(''); }); }); diff --git a/03_reverseString/reverseString.js b/03_reverseString/reverseString.js index f6790f0..202339d 100644 --- a/03_reverseString/reverseString.js +++ b/03_reverseString/reverseString.js @@ -1,5 +1,9 @@ -const reverseString = function() { - +const reverseString = function(string) { + let newString ="" + for (i = string.length; i >=0 ; i--) { + newString += string.charAt(i); + } + return newString; }; // Do not edit below this line diff --git a/03_reverseString/reverseString.spec.js b/03_reverseString/reverseString.spec.js index 6ade95b..5935aa2 100644 --- a/03_reverseString/reverseString.spec.js +++ b/03_reverseString/reverseString.spec.js @@ -5,16 +5,16 @@ describe('reverseString', () => { expect(reverseString('hello')).toEqual('olleh'); }); - test.skip('reverses multiple words', () => { + test('reverses multiple words', () => { expect(reverseString('hello there')).toEqual('ereht olleh'); }); - test.skip('works with numbers and punctuation', () => { + test('works with numbers and punctuation', () => { expect(reverseString('123! abc! Hello, Odinite.')).toEqual( '.etinidO ,olleH !cba !321' ); }); - test.skip('works with blank strings', () => { + test('works with blank strings', () => { expect(reverseString('')).toEqual(''); }); }); diff --git a/04_removeFromArray/removeFromArray.js b/04_removeFromArray/removeFromArray.js index 4eb7ab3..a60ad9e 100644 --- a/04_removeFromArray/removeFromArray.js +++ b/04_removeFromArray/removeFromArray.js @@ -1,4 +1,38 @@ -const removeFromArray = function() { +const removeFromArray = function(originalArray,...theArgs) { + let newArray = []; + console.log("Original Array: " + originalArray) + console.log("Argument Length: " + theArgs.length) + /*for (const number of originalArray) { + console.log("Current number: " + number) + for (let i=0; i < arguments.length; i++) { + console.log("Current argument value: " + theArgs[i]); + if (number === theArgs[i]) { + const index = originalArray.indexOf(number); + if (index > -1) { // only splice array when item is found + originalArray.splice(index, 1); // 2nd parameter means remove one item only + } + console.log(newArray) + } + + } + }*/ + + for (let i=0; i < theArgs.length; i++) { + for (z=0; z < originalArray.length; z++ ) { + //for (const number of originalArray) { + number = originalArray[z]; + console.log("Current number: " + number); + if (number === theArgs[i]) { + const index = originalArray.indexOf(number); + if (index > -1) { // only splice array when item is found + originalArray.splice(index, 1); // 2nd parameter means remove one item only + z--; + } + } + console.log(originalArray) + } + } + return originalArray; }; // Do not edit below this line diff --git a/04_removeFromArray/removeFromArray.spec.js b/04_removeFromArray/removeFromArray.spec.js index 823680f..d2bc015 100644 --- a/04_removeFromArray/removeFromArray.spec.js +++ b/04_removeFromArray/removeFromArray.spec.js @@ -4,25 +4,25 @@ describe('removeFromArray', () => { test('removes a single value', () => { expect(removeFromArray([1, 2, 3, 4], 3)).toEqual([1, 2, 4]); }); - test.skip('removes multiple values', () => { + test('removes multiple values', () => { expect(removeFromArray([1, 2, 3, 4], 3, 2)).toEqual([1, 4]); }); - test.skip('removes multiple of the same value', () => { + test('removes multiple of the same value', () => { expect(removeFromArray([1, 2, 2, 3], 2)).toEqual([1, 3]); }); - 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]); }); });