From e0275b086ebe4cefad481a153b7d57ac5a2512e1 Mon Sep 17 00:00:00 2001 From: endritibra Date: Thu, 2 Jun 2022 19:10:06 +0200 Subject: [PATCH] Nas Album Done --- 07_tempConversion/tempConversion.js | 8 ++++---- 07_tempConversion/tempConversion.spec.js | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/07_tempConversion/tempConversion.js b/07_tempConversion/tempConversion.js index 6ef3e85..72ca5ca 100644 --- a/07_tempConversion/tempConversion.js +++ b/07_tempConversion/tempConversion.js @@ -1,11 +1,11 @@ -const ftoc = function() { - +const ftoc = function(fah) { + return Math.round((5/9 * (fah-32))*10)/10; }; -const ctof = function() { +const ctof = function(c) { + return Math.round(((c * 9/5) + 32)*10)/10; }; - // Do not edit below this line module.exports = { ftoc, diff --git a/07_tempConversion/tempConversion.spec.js b/07_tempConversion/tempConversion.spec.js index 93679cc..b1b82f2 100644 --- a/07_tempConversion/tempConversion.spec.js +++ b/07_tempConversion/tempConversion.spec.js @@ -4,22 +4,22 @@ describe('ftoc', () => { test('works', () => { expect(ftoc(32)).toEqual(0); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(ftoc(100)).toEqual(37.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(ftoc(-100)).toEqual(-73.3); }); }); describe('ctof', () => { - test.skip('works', () => { + test('works', () => { expect(ctof(0)).toEqual(32); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(ctof(73.2)).toEqual(163.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(ctof(-10)).toEqual(14); }); });