From c51b7c2c61c32950ab2251c6e8970a5eaf96fdd4 Mon Sep 17 00:00:00 2001 From: pedro-petrov Date: Fri, 28 Jan 2022 19:59:32 +0000 Subject: [PATCH] commit --- 08_calculator/calculator.js | 34 +++++++++++++++++++++----------- 08_calculator/calculator.spec.js | 20 +++++++++---------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/08_calculator/calculator.js b/08_calculator/calculator.js index c22e8d2..487bedc 100644 --- a/08_calculator/calculator.js +++ b/08_calculator/calculator.js @@ -1,24 +1,36 @@ -const add = function() { - +const add = function(num1, num2) { + return (num1 + num2); }; -const subtract = function() { - +const subtract = function(num1, num2) { + return (num1 - num2); }; -const sum = function() { - +const sum = function(array1) { + var mySum = 0; + for (var i = 0; i < array1.length; i++) { + mySum = mySum + array1[i]; + } + return mySum; }; -const multiply = function() { - +const multiply = function(...nums) { + var myNum = 1; + for (var num in nums) { + console.log(`total: ${myNum}, index: ${num}, value: ${nums[num]}, is number ${typeof myNum}`); + myNum = myNum * nums[num]; + } +return myNum; }; -const power = function() { - +var test1 = multiply(2, 4, 6, 8, 10, 12, 14); +console.log(test1); + +const power = function(num1, num2) { + return (num1 ^ num2); }; -const factorial = function() { +const factorial = function(num1) { }; diff --git a/08_calculator/calculator.spec.js b/08_calculator/calculator.spec.js index dc317ec..1e7f2fe 100644 --- a/08_calculator/calculator.spec.js +++ b/08_calculator/calculator.spec.js @@ -5,51 +5,51 @@ describe('add', () => { expect(calculator.add(0,0)).toBe(0); }); - test.skip('adds 2 and 2', () => { + test('adds 2 and 2', () => { expect(calculator.add(2,2)).toBe(4); }); - test.skip('adds positive numbers', () => { + test('adds positive numbers', () => { expect(calculator.add(2,6)).toBe(8); }); }); describe('subtract', () => { - test.skip('subtracts numbers', () => { + test('subtracts numbers', () => { expect(calculator.subtract(10,4)).toBe(6); }); }); describe('sum', () => { - test.skip('computes the sum of an empty array', () => { + test('computes the sum of an empty array', () => { expect(calculator.sum([])).toBe(0); }); - test.skip('computes the sum of an array of one number', () => { + test('computes the sum of an array of one number', () => { expect(calculator.sum([7])).toBe(7); }); - test.skip('computes the sum of an array of two numbers', () => { + test('computes the sum of an array of two numbers', () => { expect(calculator.sum([7,11])).toBe(18); }); - test.skip('computes the sum of an array of many numbers', () => { + test('computes the sum of an array of many numbers', () => { expect(calculator.sum([1,3,5,7,9])).toBe(25); }); }); describe('multiply', () => { - test.skip('multiplies two numbers', () => { + test('multiplies two numbers', () => { expect(calculator.multiply([2,4])).toBe(8); }); - test.skip('multiplies several numbers', () => { + test('multiplies several numbers', () => { expect(calculator.multiply([2,4,6,8,10,12,14])).toBe(645120); }); }); describe('power', () => { - test.skip('raises one number to the power of another number', () => { + test('raises one number to the power of another number', () => { expect(calculator.power(4,3)).toBe(64); // 4 to third power is 64 }); });