Revert "Merge branch 'jest'"

This reverts commit f76e9e108f.

calculator/README.md

@@ -1,8 +1,6 @@
-# Exercise 08 - Calculator
-
 The goal for this exercise is to create a calculator that does the following:
 
 add, subtract, get the sum, multiply, get the power, and find the factorial
 
-In order to do this please fill out each function with your solution. Make sure to return the value so you can test it in Jest! To see the expected value
-take a look at the spec file that houses the Jest test cases.
+In order to do this please fill out each function with your solution. Make sure to return the value so you can test it in Jasmine! To see the expected value
+take a look at the spec file that houses the Jasmine test cases.

calculator/calculator.js

@@ -1,26 +1,26 @@
-const add = function() {
+function add () {
 	
-};
+}
 
-const subtract = function() {
+function subtract () {
 	
-};
+}
 
-const sum = function() {
+function sum () {
 	
-};
+}
 
-const multiply = function() {
-
-};;
-
-const power = function() {
+function multiply () {
 	
-};
+}
 
-const factorial = function() {
+function power() {
 	
-};
+}
+
+function factorial() {
+	
+}
 
 module.exports = {
   add,
@@ -28,5 +28,5 @@ module.exports = {
   sum,
   multiply,
   power,
-  factorial
+  factorial,
 };

calculator/calculator.spec.js

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