modified: 01_helloWorld/helloWorld.js

modified:   02_repeatString/repeatString.js
modified:   02_repeatString/repeatString.spec.js
modified:   03_reverseString/reverseString.js
modified:   03_reverseString/reverseString.spec.js
modified:   04_removeFromArray/removeFromArray.js
modified:   04_removeFromArray/removeFromArray.spec.js
modified:   05_sumAll/sumAll.js
modified:   05_sumAll/sumAll.spec.js
modified:   06_leapYears/README.md
modified:   06_leapYears/leapYears.js
modified:   06_leapYears/leapYears.spec.js
modified:   07_tempConversion/README.md
modified:   07_tempConversion/tempConversion.js
modified:   07_tempConversion/tempConversion.spec.js

01_helloWorld/helloWorld.js

@@ -1,5 +1,5 @@
 const helloWorld = function() {
-  return ''
+  return 'Hello, World!'
 };
 
 module.exports = helloWorld;

02_repeatString/repeatString.js

@@ -1,5 +1,10 @@
-const repeatString = function() {
+const repeatString = function (word, times) {
-
+	if (times < 0) return 'ERROR';
+	let string = '';
+	for (let i = 0; i < times; i++) {
+		string += word;
+	}
+	return string;
 };
 
 // Do not edit below this line

02_repeatString/repeatString.spec.js

@@ -4,19 +4,19 @@ 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('hey', 10)).toEqual('heyheyheyheyheyheyheyheyheyhey');
   });
-  test.skip('repeats the string 1 times', () => {
+  test('repeats the string 1 times', () => {
     expect(repeatString('hey', 1)).toEqual('hey');
   });
-  test.skip('repeats the string 0 times', () => {
+  test('repeats the string 0 times', () => {
     expect(repeatString('hey', 0)).toEqual('');
   });
-  test.skip('returns ERROR with negative numbers', () => {
+  test('returns ERROR with negative numbers', () => {
     expect(repeatString('hey', -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
@@ -31,7 +31,7 @@ describe('repeatString', () => {
     was randomly generated. */
     expect(repeatString('hey', number).match(/((hey))/g).length).toEqual(number);
   });
-  test.skip('works with blank strings', () => {
+  test('works with blank strings', () => {
     expect(repeatString('', 10)).toEqual('');
   });
 });

03_reverseString/reverseString.js

@@ -1,5 +1,5 @@
-const reverseString = function() {
+const reverseString = function(pass) {
-
+	return pass.split("").reverse().join("");
 };
 
 // Do not edit below this line

03_reverseString/reverseString.spec.js

@@ -5,14 +5,14 @@ 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!')).toEqual('!cba !321')
   })
-  test.skip('works with blank strings', () => {
+  test('works with blank strings', () => {
     expect(reverseString('')).toEqual('')
   })
 });

04_removeFromArray/removeFromArray.js

@@ -1,6 +1,9 @@
-const removeFromArray = function() {
+const removeFromArray = function(list, ...args) {
-
+	args.forEach(arg => {
+		index = list.indexOf(arg);
+		if (index > -1) list.splice(index, 1);
+	});
+	return list;
 };
-
 // Do not edit below this line
 module.exports = removeFromArray;

04_removeFromArray/removeFromArray.spec.js

@@ -4,22 +4,22 @@ 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('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]);
   });
 });

05_sumAll/sumAll.js

@@ -1,5 +1,24 @@
-const sumAll = function() {
+const sumAll = function (pass1, pass2) {
+	let sum = 0,
+		start,
+		end;
 
+	if (Number.isInteger(pass1) && Number.isInteger(pass2)) {
+		if (pass1 > 0 && pass2 > 0) {
+			if (pass1 < pass2) {
+				start = pass1;
+				end = pass2;
+			} else {
+				start = pass2;
+				end = pass1;
+			}
+
+			for (var a = start; a <= end; a++) {
+				sum += a;
+			}
+			return sum;
+		} else return "ERROR";
+	} else return "ERROR";
 };
 
 // Do not edit below this line

05_sumAll/sumAll.spec.js

@@ -4,19 +4,19 @@ describe('sumAll', () => {
   test('sums numbers within the range', () => {
     expect(sumAll(1, 4)).toEqual(10);
   });
-  test.skip('works with large numbers', () => {
+  test('works with large numbers', () => {
     expect(sumAll(1, 4000)).toEqual(8002000);
   });
-  test.skip('works with larger number first', () => {
+  test('works with larger number first', () => {
     expect(sumAll(123, 1)).toEqual(7626);
   });
-  test.skip('returns ERROR with negative numbers', () => {
+  test('returns ERROR with negative numbers', () => {
     expect(sumAll(-10, 4)).toEqual('ERROR');
   });
-  test.skip('returns ERROR with non-number parameters', () => {
+  test('returns ERROR with non-number parameters', () => {
     expect(sumAll(10, "90")).toEqual('ERROR');
   });
-  test.skip('returns ERROR with non-number parameters', () => {
+  test('returns ERROR with non-number parameters', () => {
     expect(sumAll(10, [90, 1])).toEqual('ERROR');
   });
 });

06_leapYears/README.md

@@ -7,10 +7,10 @@ Create a function that determines whether or not a given year is a leap year. Le
 > -- <cite>[Learn to Program](https://pine.fm/LearnToProgram/chap_06.html) by Chris Pine</cite>
 
 ```javascript
-leapYears(2000) // is a leap year: returns true
+leapYears(2000); // is a leap year: returns true
-leapYears(1985) // is not a leap year: returns false
+leapYears(1985); // is not a leap year: returns false
 ```
 
-
 ## Hints
-- use an `if` statement and `&&` to make sure all the conditions are met properly
+
+-   use an `if` statement and `&&` to make sure all the conditions are met properly

06_leapYears/leapYears.js

@@ -1,5 +1,11 @@
-const leapYears = function() {
+const leapYears = function (year) {
-
+	if (year % 400 == 0) {
+		return true;
+	} else if (year % 4 == 0 && year % 100 != 0) {
+		return true;
+	} else {
+		return false;
+	}
 };
 
 // Do not edit below this line

06_leapYears/leapYears.spec.js

@@ -4,19 +4,19 @@ describe('leapYears', () => {
   test('works with non century years', () => {
     expect(leapYears(1996)).toBe(true);
   });
-  test.skip('works with non century years', () => {
+  test('works with non century years', () => {
     expect(leapYears(1997)).toBe(false);
   });
-  test.skip('works with ridiculously futuristic non century years', () => {
+  test('works with ridiculously futuristic non century years', () => {
     expect(leapYears(34992)).toBe(true);
   });
-  test.skip('works with century years', () => {
+  test('works with century years', () => {
     expect(leapYears(1900)).toBe(false);
   });
-  test.skip('works with century years', () => {
+  test('works with century years', () => {
     expect(leapYears(1600)).toBe(true);
   });
-  test.skip('works with century years', () => {
+  test('works with century years', () => {
     expect(leapYears(700)).toBe(false);
   });
 });

07_tempConversion/README.md

@@ -1,6 +1,7 @@
 # Exercise 07 - tempConversion
 
 Write two functions that convert temperatures from Fahrenheit to Celsius, and vice versa:
+
 ```
 ftoc(32) // fahrenheit to celsius, should return 0
 
@@ -9,9 +10,10 @@ ctof(0) // celsius to fahrenheit, should return 32
 
 Because we are human, we want the result temperature to be rounded to one decimal place: i.e., `ftoc(100)` should return `37.8` and not `37.77777777777778`.
 
-This exercise asks you to create more than one function so the `module.exports` section of the spec file looks a little different this time.  Nothing to worry about, we're just packaging both functions into a single object to be exported.
+This exercise asks you to create more than one function so the `module.exports` section of the spec file looks a little different this time. Nothing to worry about, we're just packaging both functions into a single object to be exported.
 
 ## Hints
-- You can find the relevant formulae on [Wikipedia](https://en.wikipedia.org/wiki/Conversion_of_units_of_temperature).
 
-- Try to find by yourself on the Internet how to round a number to 1 decimal place in JavaScript. If you struggle, have a look [here](https://stackoverflow.com/q/7342957/5433628).
+-   You can find the relevant formulae on [Wikipedia](https://en.wikipedia.org/wiki/Conversion_of_units_of_temperature).
+
+-   Try to find by yourself on the Internet how to round a number to 1 decimal place in JavaScript. If you struggle, have a look [here](https://stackoverflow.com/q/7342957/5433628).

07_tempConversion/tempConversion.js

@@ -1,13 +1,15 @@
-const ftoc = function() {
+const ftoc = function (temprF) {
-
+	let temprC = ((temprF - 32) * 5) / 9;
+	return Math.round(temprC * 10) / 10;
 };
 
-const ctof = function() {
+const ctof = function (temprC) {
-
+	let temprF = (temprC * 9) / 5 + 32;
+	return Math.round(temprF * 10) / 10;
 };
 
 // Do not edit below this line
 module.exports = {
-  ftoc,
+	ftoc,
-  ctof
+	ctof,
 };

07_tempConversion/tempConversion.spec.js

@@ -1,25 +1,25 @@
-const {ftoc, ctof} = require('./tempConversion')
+const { ftoc, ctof } = require("./tempConversion");
 
-describe('ftoc', () => {
+describe("ftoc", () => {
-  test('works', () => {
+	test("works", () => {
-    expect(ftoc(32)).toEqual(0);
+		expect(ftoc(32)).toEqual(0);
-  });
+	});
-  test.skip('rounds to 1 decimal', () => {
+	test("rounds to 1 decimal", () => {
-    expect(ftoc(100)).toEqual(37.8);
+		expect(ftoc(100)).toEqual(37.8);
-  });
+	});
-  test.skip('works with negatives', () => {
+	test("works with negatives", () => {
-    expect(ftoc(-100)).toEqual(-73.3);
+		expect(ftoc(-100)).toEqual(-73.3);
-  });
+	});
 });
 
-describe('ctof', () => {
+describe("ctof", () => {
-  test.skip('works', () => {
+	test("works", () => {
-    expect(ctof(0)).toEqual(32);
+		expect(ctof(0)).toEqual(32);
-  });
+	});
-  test.skip('rounds to 1 decimal', () => {
+	test("rounds to 1 decimal", () => {
-    expect(ctof(73.2)).toEqual(163.8);
+		expect(ctof(73.2)).toEqual(163.8);
-  });
+	});
-  test.skip('works with negatives', () => {
+	test("works with negatives", () => {
-    expect(ctof(-10)).toEqual(14);
+		expect(ctof(-10)).toEqual(14);
-  });
+	});
 });