calculator done

calculator/calculator.js

@@ -1,32 +1,35 @@
-function add () {
+function add(value1, value2) {
-	
+  return value1 + value2;
 }
 
-function subtract () {
+function subtract(value1, value2) {
-	
+  return value1 - value2;
 }
 
-function sum () {
+function sum(arr) {
-	
+  return arr.reduce((acc, curr) => acc + curr, 0);
 }
 
-function multiply () {
+function multiply(arr) {
-	
+  return arr.reduce((acc, curr) => acc * curr, 1);
 }
 
-function power() {
+function power(value1, value2) {
-	
+  return Math.pow(value1, value2);
 }
 
-function factorial() {
+function factorial(value) {
-	
+  if (value == 0) {
+    return 1;
+  } else {
+    return value * factorial(value - 1);
+  }
 }
-
 module.exports = {
-	add,
+  add,
-	subtract,
+  subtract,
-	sum,
+  sum,
-	multiply,
+  multiply,
-    power,
+  power,
-	factorial
+  factorial,
-}
+};

calculator/calculator.spec.js

@@ -5,73 +5,73 @@ describe('add', function() {
 		expect(calculator.add(0,0)).toEqual(0);
 	});
 
-	xit('adds 2 and 2', function() {
+	it('adds 2 and 2', function() {
 		expect(calculator.add(2,2)).toEqual(4);
 	});
 
-	xit('adds positive numbers', function() {
+	it('adds positive numbers', function() {
 		expect(calculator.add(2,6)).toEqual(8);
 	});
 });
 
 describe('subtract', function() {
-	xit('subtracts numbers', function() {
+	it('subtracts numbers', function() {
 		expect(calculator.subtract(10,4)).toEqual(6);
 	});
 });
 
 describe('sum', function() {
-	xit('computes the sum of an empty array', function() {
+	it('computes the sum of an empty array', function() {
 		expect(calculator.sum([])).toEqual(0);
 	});
 
-	xit('computes the sum of an array of one number', function() {
+	it('computes the sum of an array of one number', function() {
 		expect(calculator.sum([7])).toEqual(7);
 	});
 
-	xit('computes the sum of an array of two numbers', function() {
+	it('computes the sum of an array of two numbers', function() {
 		expect(calculator.sum([7,11])).toEqual(18);
 	});
 
-	xit('computes the sum of an array of many numbers', function() {
+	it('computes the sum of an array of many numbers', function() {
 		expect(calculator.sum([1,3,5,7,9])).toEqual(25);
 	});
 });
 
 describe('multiply', function() {
-	xit('multiplies two numbers', function() {
+	it('multiplies two numbers', function() {
 		expect(calculator.multiply([2,4])).toEqual(8);
 	});
 
-	xit('multiplies several numbers', function() {
+	it('multiplies several numbers', function() {
 		expect(calculator.multiply([2,4,6,8,10,12,14])).toEqual(645120);
 	});
 });
 
 describe('power', function() {
-	xit('raises one number to the power of another number', function() {
+	it('raises one number to the power of another number', function() {
 		expect(calculator.power(4,3)).toEqual(64); // 4 to third power is 64
 	});
 });
 
 describe('factorial', function() {
-	xit('computes the factorial of 0', function() {
+	it('computes the factorial of 0', function() {
 		expect(calculator.factorial(0)).toEqual(1); // 0! = 1
 	});
 
-	xit('computes the factorial of 1', function() {
+	it('computes the factorial of 1', function() {
 		expect(calculator.factorial(1)).toEqual(1);
 	});
 
-	xit('computes the factorial of 2', function() {
+	it('computes the factorial of 2', function() {
 		expect(calculator.factorial(2)).toEqual(2);
 	});
 
-	xit('computes the factorial of 5', function() {
+	it('computes the factorial of 5', function() {
 		expect(calculator.factorial(5)).toEqual(120);
 	});
 
-	xit('computes the factorial of 10', function() {
+	it('computes the factorial of 10', function() {
 		expect(calculator.factorial(10)).toEqual(3628800);
 	});
 });