Completed exercise 2-is-proper-fraction.js and 2-is-proper-fraction-test.js and updated test in 1-get-angle-type.test.js

Author: AngelaMcLeary

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

@@ -10,9 +10,19 @@
 // After you have implemented the function, write tests to cover all the cases, and
 // execute the code to ensure all tests pass.
 
-function isProperFraction(numerator, denominator) {
-  // TODO: Implement this function
-}
+  function isProperFraction(numerator, denominator) {
+  // Denominator cannot be 0
+  if (denominator === 0) 
+    return false;
+  if (!Number.isFinite(numerator) || !Number.isFinite(denominator)){
+    return false;
+  }
+  if (!Number.isInteger(numerator) || !Number.isInteger(denominator)){
+    return false;
+  }
+  //if is less than
+   return Math.abs(numerator) < Math.abs(denominator);
+  }
 
 // 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.
@@ -31,3 +41,8 @@ function assertEquals(actualOutput, targetOutput) {
 
 // Example: 1/2 is a proper fraction
 assertEquals(isProperFraction(1, 2), true);
+assertEquals(isProperFraction(2, 1), false);
+assertEquals(isProperFraction(-1, -2), true);
+assertEquals(isProperFraction("1", 2), false);
+assertEquals(isProperFraction(1, 0), false);
+

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js

@@ -9,14 +9,14 @@ const getAngleType = require("../implement/1-get-angle-type");
 // Case 1: Acute angles
 // When angle is greater that 0 and less than 90
 test(`should return "Acute angle" when (angle >0 angle < 90)`, () => {
-  expect(getAngleType(1)).toEqual("Acute angle");
-  expect(getAngleType(45)).toEqual("Acute angle");
-  expect(getAngleType(89)).toEqual("Acute angle");
+ expect(getAngleType(1)).toEqual("Acute angle");
+ expect(getAngleType(45)).toEqual("Acute angle");
+ expect(getAngleType(89)).toEqual("Acute angle");
 });
 
 // Case 2: Right angles
 // When angle is 90
-test(`should return "Right angle" when (angle = 90)`, () => {
+test(`should return Right angle when (angle = 90)`, () => {
   expect(getAngleType(90)).toEqual("Right angle");
 });
 

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

@@ -8,3 +8,20 @@ const isProperFraction = require("../implement/2-is-proper-fraction");
 test(`should return false when denominator is zero`, () => {
   expect(isProperFraction(1, 0)).toEqual(false);
 });
+
+test(`should return true when denominator is greater than numerator (2)`, () => {
+  expect(isProperFraction(1, 2)).toEqual(true);
+});
+
+test(`should return false when denominator is smaller than the numerator (1)`, () => {
+  expect(isProperFraction(2, 1)).toEqual(false);
+});
+
+test(`should return true when both values are valid numbers`, () => {
+  expect(isProperFraction(-1, -2)).toEqual(true);
+});
+
+test(`should return false when a number is not an integer`, () => {
+  expect(isProperFraction("1", 2)).toEqual(false);
+});
+