turnera
diff --git a/‎calculator/calculator.js
Lines changed: 31 additions & 11 deletions b/‎calculator/calculator.js
Lines changed: 31 additions & 11 deletions
diff --git a/‎calculator/calculator.spec.js
Lines changed: 15 additions & 15 deletions b/‎calculator/calculator.spec.js
Lines changed: 15 additions & 15 deletions
@@ -1,25 +1,45 @@
-function add () {
-	
+function add (x, y) {
+	return x + y;
 }
 
-function subtract () {
-	
+function subtract (x, y) {
+	return x - y;
 }
 
-function sum () {
-	
+function sum (x) {
+	let sum = 0;
+	for(let i = 0; i< x.length; i++)
+	{
+		sum += x[i];
+	}
+	return sum;
 }
 
-function multiply () {
-	
+function multiply(x) 
+{
+	let result = 1;
+	for(let i = 0; i < x.length; i++)
+	{
+		result *= x[i];
+	}
+	return result;
 }
 
-function power() {
-	
+function power(x, y) {
+	return Math.pow(x, y);
 }
 
-function factorial() {
+function factorial(num) {
 
+	if(num < 0)
+		return -1;
+	else if (num == 0)
+		return 1;
+	else
+	{
+		return num * factorial(num - 1);
+	}
+
 }
 
 module.exports = {
 
@@ -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', fun
9E88
ction() {
 		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);
 	});
 });