ambydau
diff --git a/‎tempConversion/tempConversion.js
Lines changed: 10 additions & 4 deletions b/‎tempConversion/tempConversion.js
Lines changed: 10 additions & 4 deletions
diff --git a/‎tempConversion/tempConversion.spec.js
Lines changed: 5 additions & 5 deletions b/‎tempConversion/tempConversion.spec.js
Lines changed: 5 additions & 5 deletions
@@ -1,9 +1,15 @@
-const ftoc = function() {
-
+const ftoc = function(tempF) {
+// (F - 32)*5/9 = C
+  let tempC = (tempF - 32)*(5/9);
+  tempC = tempC.toFixed(1);
+  return parseFloat(tempC);
 }
 
-const ctof = function() {
-
+const ctof = function(tempC) {
+// 9/5*C + 32 = F
+  let tempF = (9/5)*tempC + 32;
+  tempF = tempF.toFixed(1);
+  return parseFloat(tempF);
 }
 
 module.exports = {
 
@@ -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);
   });
 });