Updated isProperFraction implementation and correct tests for negative fractions

Author: fayaz551

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

@@ -11,24 +11,20 @@
 // execute the code to ensure all tests pass.
 
 function isProperFraction(numerator, denominator) {
-  // TODO: Implement this function
   if (denominator === 0) {
     return false;
   }
-  if (numerator < 0 && denominator < 0) {
-    return Math.abs(numerator) < Math.abs(denominator);
-  }
-  if (numerator < 0 || denominator < 0) {
-    return false;
-  }
-  return numerator < denominator;
+
+  return Math.abs(numerator) < Math.abs(denominator);
 }
 
+module.exports = isProperFraction;
+
 // The line below allows us to load the isProperFraction function into tests in other files.
 // This will be useful in the "rewrite tests with jest" step.
-module.exports = isProperFraction;
+//module.exports = isProperFraction;
 
-// Here's our helper again
+/* Here's our helper again
 function assertEquals(actualOutput, targetOutput) {
   console.assert(
     actualOutput === targetOutput,
@@ -40,11 +36,14 @@ function assertEquals(actualOutput, targetOutput) {
 // What combinations of numerators and denominators should you test?
 
 // Example: 1/2 is a proper fraction
+/*
 assertEquals(isProperFraction(1, 2), true);
 assertEquals(isProperFraction(2, 1), false);
 assertEquals(isProperFraction(0, 1), true);
 assertEquals(isProperFraction(-1, 2), false);
 assertEquals(isProperFraction(1, -2), false);
 assertEquals(isProperFraction(-1, -2), false);
 assertEquals(isProperFraction(3, 4), true);
-assertEquals(isProperFraction(4, 3), false);
+assertEquals(isProperFraction(4, 3), false);
+
+*/

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js

@@ -13,6 +13,43 @@ test(`should return true when numerator is zero and denominator is positive`, ()
   expect(isProperFraction(0, 1)).toEqual(true);
 });
 
-test(`should return false when numerator is zero and denominator is negative`, () => {
-  expect(isProperFraction(0, -1)).toEqual(false);
+test(`should return true when numerator is zero and denominator is negative`, () => {
+  expect(isProperFraction(0, -1)).toEqual(true);
+});
+
+
+test("1/2 is proper", () => {
+  expect(isProperFraction(1, 2)).toBe(true);
+});
+
+test("2/1 is improper", () => {
+  expect(isProperFraction(2, 1)).toBe(false);
+});
+
+test("0/1 is proper", () => {
+  expect(isProperFraction(0, 1)).toBe(true);
+});
+
+test("-1/2 is proper", () => {
+  expect(isProperFraction(-1, 2)).toBe(true);
+});
+
+test("1/-2 is proper", () => {
+  expect(isProperFraction(1, -2)).toBe(true);
+});
+
+test("-1/-2 is proper", () => {
+  expect(isProperFraction(-1, -2)).toBe(true);
+});
+
+test("3/4 is proper", () => {
+  expect(isProperFraction(3, 4)).toBe(true);
+});
+
+test("4/3 is improper", () => {
+  expect(isProperFraction(4, 3)).toBe(false);
+});
+
+test("denominator 0 returns false", () => {
+  expect(isProperFraction(1, 0)).toBe(false);
 });