Merge 3bbe72b2c0 into 29bd246dad

helloWorld/helloWorld.js

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

leapYears/leapYears.js

@@ -1,5 +1,5 @@
-const leapYears = function() {
+const  leapYears = function(year) {
-
+  return year % 4 === 0 && (year % 100 !== 0 || year % 400 == 0)
 }
 
 module.exports = leapYears

leapYears/leapYears.spec.js

@@ -4,19 +4,19 @@ describe('leapYears', function() {
   it('works with non century years', function() {
     expect(leapYears(1996)).toEqual(true);
   });
-  xit('works with non century years', function() {
+  it('works with non century years', function() {
     expect(leapYears(1997)).toEqual(false);
   });
-  xit('works with ridiculously futuristic non century years', function() {
+  it('works with ridiculously futuristic non century years', function() {
     expect(leapYears(34992)).toEqual(true);
   });
-  xit('works with century years', function() {
+  it('works with century years', function() {
     expect(leapYears(1900)).toEqual(false);
   });
-  xit('works with century years', function() {
+  it('works with century years', function() {
     expect(leapYears(1600)).toEqual(true);
   });
-  xit('works with century years', function() {
+  it('works with century years', function() {
     expect(leapYears(700)).toEqual(false);
   });
 });

removeFromArray/removeFromArray.js

@@ -1,5 +1,12 @@
-const removeFromArray = function() {
+function removeFromArray() {
+  const argsToArray = Array.from(arguments);
+  const unchangedArray = argsToArray.shift();
+  const itemsToRemove = argsToArray;
 
+  function removeThese(arrayItem) {
+    return !itemsToRemove.includes(arrayItem);
+  }
+  return newArray = unchangedArray.filter(removeThese);
 }
 
 module.exports = removeFromArray

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"]);
   });
 });

repeatString/repeatString.js

@@ -1,5 +1,11 @@
-const repeatString = function() {
+const repeatString = function(phrase, repetitions) {
-
+  let greeting = '';
+  if (repetitions < 0) greeting = 'ERROR';
+  if (repetitions == 0) greeting = '';
+  for (let i = 1; i <= repetitions; i++) {
+    greeting += phrase;
+  }
+return greeting;
 }
 
 module.exports = repeatString

repeatString/repeatString.spec.js

@@ -4,16 +4,16 @@ describe('repeatString', function() {
   it('repeats the string', function() {
     expect(repeatString('hey', 3)).toEqual('heyheyhey');
   });
-  xit('repeats the string many times', function() {
+  it('repeats the string many times', function() {
     expect(repeatString('hey', 10)).toEqual('heyheyheyheyheyheyheyheyheyhey');
   });
-  xit('repeats the string 1 times', function() {
+  it('repeats the string 1 times', function() {
     expect(repeatString('hey', 1)).toEqual('hey');
   });
-  xit('repeats the string 0 times', function() {
+  it('repeats the string 0 times', function() {
     expect(repeatString('hey', 0)).toEqual('');
   });
-  xit('returns ERROR with negative numbers', function() {
+  it('returns ERROR with negative numbers', function() {
     expect(repeatString('hey', -1)).toEqual('ERROR');
   });
 });

reverseString/README.md

@@ -1,6 +1,6 @@
 # Exercise 02 - Reverse a String.
 
-Pretty simple, write a function called `reverseString` that returns it's input, reversed!
+Pretty simple, write a function called `reverseString` that returns its input, reversed!
 
 ```javascript
 reverseString('hello there') // returns 'ereht olleh'

reverseString/reverseString.js

@@ -1,5 +1,8 @@
-const reverseString = function() {
+const reverseString = function(str) {
-
+  let splitString = str.split("");
+  let reverseArray = splitString.reverse();
+  let joinArray = reverseArray.join("");  
+  return joinArray;
 }
 
 module.exports = reverseString

reverseString/reverseString.spec.js

@@ -5,11 +5,11 @@ describe('reverseString', function() {
     expect(reverseString('hello')).toEqual('olleh');
   });
 
-  xit('reverses multiple words', function() {
+  it('reverses multiple words', function() {
     expect(reverseString('hello there')).toEqual('ereht olleh')
   })
 
-  xit('works with numbers and punctuation', function() {
+  it('works with numbers and punctuation', function() {
     expect(reverseString('123! abc!')).toEqual('!cba !321')
   })
 });

sumAll/sumAll.js

@@ -1,5 +1,23 @@
-const sumAll = function() {
+const sumAll = function(a, b) {
+  const argsToArray = Array.from(arguments);
+  argsToArray.sort(function(a, b){return a-b});
+  let firstNum = argsToArray[0];
+  let secondNum = argsToArray[1];
+  let sum = 0;
 
+  var isNegative = (element) => element < 0 
+  var isNotNumber = (element) => typeof element != 'number'
+
+  if (argsToArray.some(isNegative)) {
+    return "ERROR";
+  } else if (argsToArray.some(isNotNumber)) {
+    return "ERROR";
+  } else {
+    while (firstNum <= secondNum) {
+      sum += firstNum++;
+    }
+  return sum;
+  }
 }
 
 module.exports = sumAll

sumAll/sumAll.spec.js

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

tempConversion/tempConversion.js

@@ -1,9 +1,11 @@
-const ftoc = function() {
+const ftoc = function(tempInF) {
-
+  let tempInC = (tempInF - 32) * 5/9;
+  return Math.round(tempInC * 10) / 10;
 }
 
-const ctof = function() {
+const ctof = function(tempInC) {
-
+  let tempInF = tempInC * 9/5 + 32;
+  return Math.round(tempInF * 10) / 10;
 }
 
 module.exports = {

tempConversion/tempConversion.spec.js

@@ -4,22 +4,22 @@ describe('ftoc', function() {
   it('works', function() {
     expect(ftoc(32)).toEqual(0);
   });
-  xit('rounds to 1 decimal', function() {
+  it('rounds to 1 decimal', function() {
     expect(ftoc(100)).toEqual(37.8);
   });
-  xit('works with negatives', function() {
+  it('works with negatives', function() {
     expect(ftoc(-100)).toEqual(-73.3);
   });
 });
 
 describe('ctof', function() {
-  xit('works', function() {
+  it('works', function() {
     expect(ctof(0)).toEqual(32);
   });
-  xit('rounds to 1 decimal', function() {
+  it('rounds to 1 decimal', function() {
     expect(ctof(73.2)).toEqual(163.8);
   });
-  xit('works with negatives', function() {
+  it('works with negatives', function() {
     expect(ctof(-10)).toEqual(14);
   });
 });