diff --git a/tempConversion/README.md b/tempConversion/README.md index 081a650..77682f6 100644 --- a/tempConversion/README.md +++ b/tempConversion/README.md @@ -2,12 +2,12 @@ Write two functions that convert temperatures from Fahrenheit to Celsius, and vice versa: ``` -ftoc(32) // fahrenheit to celsius, should return 0 +convertToCelsius(32) // fahrenheit to celsius, should return 0 -ctof(0) // celsius to fahrenheit, should return 32 +convertToFahrenheit(0) // celsius to fahrenheit, should return 32 ``` -Because we are human, we want the result temperature to be rounded to one decimal place: i.e., `ftoc(100)` should return `37.8` and not `37.77777777777778`. +Because we are human, we want the result temperature to be rounded to one decimal place: i.e., `convertToCelsius(100)` should return `37.8` and not `37.77777777777778`. This exercise asks you to create more than one function so the `module.exports` section of the spec file looks a little different this time. Nothing to worry about, we're just packaging both functions into a single object to be exported. diff --git a/tempConversion/tempConversion.js b/tempConversion/tempConversion.js index 13430a7..4bc3d9d 100644 --- a/tempConversion/tempConversion.js +++ b/tempConversion/tempConversion.js @@ -1,13 +1,13 @@ -const ftoc = function(f) { - return Math.round((f - 32) * (5/9) * 10) / 10; +const convertToCelsius = function(fahrenheit) { + return Math.round((fahrenheit - 32) * (5/9) * 10) / 10; }; -const ctof = function(c) { - return Math.round(((c * 9/5) + 32) * 10) / 10; +const convertToFahrenheit = function(celsius) { + return Math.round(((celsius * 9/5) + 32) * 10) / 10; }; module.exports = { - ftoc, - ctof + convertToCelsius, + convertToFahrenheit }; diff --git a/tempConversion/tempConversion.spec.js b/tempConversion/tempConversion.spec.js index 93679cc..c4f9742 100644 --- a/tempConversion/tempConversion.spec.js +++ b/tempConversion/tempConversion.spec.js @@ -1,25 +1,25 @@ -const {ftoc, ctof} = require('./tempConversion') +const {convertToCelsius, convertToFahrenheit} = require('./tempConversion') -describe('ftoc', () => { +describe('convertToCelsius', () => { test('works', () => { - expect(ftoc(32)).toEqual(0); + expect(convertToCelsius(32)).toEqual(0); }); test.skip('rounds to 1 decimal', () => { - expect(ftoc(100)).toEqual(37.8); + expect(convertToCelsius(100)).toEqual(37.8); }); test.skip('works with negatives', () => { - expect(ftoc(-100)).toEqual(-73.3); + expect(convertToCelsius(-100)).toEqual(-73.3); }); }); -describe('ctof', () => { +describe('convertToFahrenheit', () => { test.skip('works', () => { - expect(ctof(0)).toEqual(32); + expect(convertToFahrenheit(0)).toEqual(32); }); test.skip('rounds to 1 decimal', () => { - expect(ctof(73.2)).toEqual(163.8); + expect(convertToFahrenheit(73.2)).toEqual(163.8); }); test.skip('works with negatives', () => { - expect(ctof(-10)).toEqual(14); + expect(convertToFahrenheit(-10)).toEqual(14); }); });