From c06595fb3dc59e8684fa5ae0f9900dfd3d417de9 Mon Sep 17 00:00:00 2001 From: Fredrik Uddenfeldt Date: Mon, 22 May 2023 11:02:53 +0200 Subject: [PATCH] passed all tests --- 07_tempConversion/tempConversion.js | 10 ++++++++-- 07_tempConversion/tempConversion.spec.js | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/07_tempConversion/tempConversion.js b/07_tempConversion/tempConversion.js index 14153e0..3b5a020 100644 --- a/07_tempConversion/tempConversion.js +++ b/07_tempConversion/tempConversion.js @@ -1,7 +1,13 @@ -const convertToCelsius = function() { +const convertToCelsius = function(fahrenheitInput) { + let temp = ((fahrenheitInput - 32) * (5/9)) + return Math.round(temp * 10) / 10 + }; -const convertToFahrenheit = function() { +const convertToFahrenheit = function(celciusInput) { + let temp = ((celciusInput * (9/5)) + 32) + return Math.round(temp * 10) / 10 + }; // Do not edit below this line diff --git a/07_tempConversion/tempConversion.spec.js b/07_tempConversion/tempConversion.spec.js index c4f9742..7d0cc93 100644 --- a/07_tempConversion/tempConversion.spec.js +++ b/07_tempConversion/tempConversion.spec.js @@ -4,22 +4,22 @@ describe('convertToCelsius', () => { test('works', () => { expect(convertToCelsius(32)).toEqual(0); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(convertToCelsius(100)).toEqual(37.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(convertToCelsius(-100)).toEqual(-73.3); }); }); describe('convertToFahrenheit', () => { - test.skip('works', () => { + test('works', () => { expect(convertToFahrenheit(0)).toEqual(32); }); - test.skip('rounds to 1 decimal', () => { + test('rounds to 1 decimal', () => { expect(convertToFahrenheit(73.2)).toEqual(163.8); }); - test.skip('works with negatives', () => { + test('works with negatives', () => { expect(convertToFahrenheit(-10)).toEqual(14); }); });