tempconversion all tests pass

davidngu3 · davidngu3 · commit 5b450a7929ea · 2020-10-02T15:38:50.000+10:00
diff --git a/tempConversion/tempConversion.js b/tempConversion/tempConversion.js
@@ -1,9 +1,11 @@
-const ftoc = function() {
-
+const ftoc = function(fahrenheit) {
+  var celsius = (fahrenheit - 32) * 5/9;
+  return Math.round(celsius * 10) / 10;
 }
 
-const ctof = function() {
-
+const ctof = function(celsius) {
+  var fahrenheit = celsius * (9/5) + 32
+  return Math.round(fahrenheit * 10) / 10;
 }
 
 module.exports = {
diff --git a/tempConversion/tempConversion.spec.js b/tempConversion/tempConversion.spec.js
@@ -4,22 +4,22 @@ describe('ftoc', function() {
   it('works', function() {
     expect(ftoc(32)).toEqual(0);
   });
-  xit('rounds to 1 decimal', function() {
+  it('rounds to 1 decimal', function() {
     expect(ftoc(100)).toEqual(37.8);
   });
-  xit('works with negatives', function() {
+  it('works with negatives', function() {
     expect(ftoc(-100)).toEqual(-73.3);
   });
 });
 
 describe('ctof', function() {
-  xit('works', function() {
+  it('works', function() {
     expect(ctof(0)).toEqual(32);
   });
-  xit('rounds to 1 decimal', function() {
+  it('rounds to 1 decimal', function() {
     expect(ctof(73.2)).toEqual(163.8);
   });
-  xit('works with negatives', function() {
+  it('works with negatives', function() {
     expect(ctof(-10)).toEqual(14);
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`		`-const ftoc = function() {`
`2`		`-`
	`1`	`+const ftoc = function(fahrenheit) {`
	`2`	`+ var celsius = (fahrenheit - 32) * 5/9;`
	`3`	`+ return Math.round(celsius * 10) / 10;`
`3`	`4`	`}`
`4`	`5`
`5`		`-const ctof = function() {`
`6`		`-`
	`6`	`+const ctof = function(celsius) {`
	`7`	`+ var fahrenheit = celsius * (9/5) + 32`
	`8`	`+ return Math.round(fahrenheit * 10) / 10;`
`7`	`9`	`}`
`8`	`10`
`9`	`11`	`module.exports = {`