From 405b47c45254408ef43e5ed557f770aea4b0119c Mon Sep 17 00:00:00 2001 From: Tatiana Date: Sat, 8 May 2021 11:29:43 -0700 Subject: [PATCH] Revert "Standardised function declaration calls across exercises" This reverts commit 791a579823889384624fbe4d9800a714c8018bfe. --- calculator/calculator.js | 24 ++++++++++++----- calculator/calculator.spec.js | 48 +++++++++++++++++----------------- fibonacci/fibonacci.js | 2 +- findTheOldest/findTheOldest.js | 4 +-- 4 files changed, 45 insertions(+), 33 deletions(-) diff --git a/calculator/calculator.js b/calculator/calculator.js index de8f59a..330d2c4 100644 --- a/calculator/calculator.js +++ b/calculator/calculator.js @@ -1,14 +1,26 @@ -function add() {} +function add () { + +} -function subtract() {} +function subtract () { + +} -function sum() {} +function sum () { + +} -function multiply() {} +function multiply () { + +} -function power() {} +function power() { + +} -function factorial() {} +function factorial() { + +} module.exports = { add, diff --git a/calculator/calculator.spec.js b/calculator/calculator.spec.js index 150a0aa..c07b6ba 100644 --- a/calculator/calculator.spec.js +++ b/calculator/calculator.spec.js @@ -5,52 +5,52 @@ describe('add', function() { expect(calculator.add(0,0)).toEqual(0); }); - xit('adds 2 and 2', function() { - expect(calculator.add(2,2)).toEqual(4); + test.skip('adds 2 and 2', () => { + expect(calculator.add(2,2)).toBe(4); }); - xit('adds positive numbers', function() { - expect(calculator.add(2,6)).toEqual(8); + test.skip('adds positive numbers', () => { + expect(calculator.add(2,6)).toBe(8); }); }); -describe('subtract', function() { - xit('subtracts numbers', function() { - expect(calculator.subtract(10,4)).toEqual(6); +describe('subtract', () => { + test.skip('subtracts numbers', () => { + expect(calculator.subtract(10,4)).toBe(6); }); }); -describe('sum', function() { - xit('computes the sum of an empty array', function() { - expect(calculator.sum([])).toEqual(0); +describe('sum', () => { + test.skip('computes the sum of an empty array', () => { + expect(calculator.sum([])).toBe(0); }); - 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 one number', () => { + expect(calculator.sum([7])).toBe(7); }); - 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 two numbers', () => { + expect(calculator.sum([7,11])).toBe(18); }); - xit('computes the sum of an array of many numbers', function() { - expect(calculator.sum([1,3,5,7,9])).toEqual(25); + test.skip('computes the sum of an array of many numbers', () => { + expect(calculator.sum([1,3,5,7,9])).toBe(25); }); }); -describe('multiply', function() { - xit('multiplies two numbers', function() { - expect(calculator.multiply([2,4])).toEqual(8); +describe('multiply', () => { + test.skip('multiplies two numbers', () => { + expect(calculator.multiply([2,4])).toBe(8); }); - xit('multiplies several numbers', function() { - expect(calculator.multiply([2,4,6,8,10,12,14])).toEqual(645120); + test.skip('multiplies several numbers', () => { + expect(calculator.multiply([2,4,6,8,10,12,14])).toBe(645120); }); }); -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 +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 }); }); diff --git a/fibonacci/fibonacci.js b/fibonacci/fibonacci.js index 1c4b559..547dcb1 100644 --- a/fibonacci/fibonacci.js +++ b/fibonacci/fibonacci.js @@ -1,3 +1,3 @@ const fibonacci = function () {}; -module.exports = fibonacci; +module.exports = fibonacci diff --git a/findTheOldest/findTheOldest.js b/findTheOldest/findTheOldest.js index 6a6b1a9..b807304 100644 --- a/findTheOldest/findTheOldest.js +++ b/findTheOldest/findTheOldest.js @@ -1,3 +1,3 @@ -let findTheOldest = function () {}; - +let findTheOldest = function() { +} module.exports = findTheOldest;