Implement getAngleType and fix getOrdinalNumber

Author: Enice-Codes

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

@@ -7,31 +7,23 @@
 // - "Straight angle" for exactly 180°
 // - "Reflex angle" for angles greater than 180° and less than 360°
 // - "Invalid angle" for angles outside the valid range.
-
 // Assumption: The parameter is a valid number. (You do not need to handle non-numeric inputs.)
 
-// Acceptance criteria:
-// After you have implemented the function, write tests to cover all the cases, and
-// execute the code to ensure all tests pass.
-
 function getAngleType(angle) {
-  // TODO: Implement this function
+  if (angle > 0 && angle < 90) {
+    return "Acute angle";
+  } else if (angle === 90) {
+    return "Right angle";
+  } else if (angle > 90 && angle < 180) {
+    return "Obtuse angle";
+  } else if (angle === 180) {
+    return "Straight angle";
+  } else if (angle > 180 && angle < 360) {
+    return "Reflex angle";
+  } else {
+    return "Invalid angle";
+  }
 }
 
 // The line below allows us to load the getAngleType function into tests in other files.
-// This will be useful in the "rewrite tests with jest" step.
 module.exports = getAngleType;
-
-// This helper function is written to make our assertions easier to read.
-// If the actual output matches the target output, the test will pass
-function assertEquals(actualOutput, targetOutput) {
-  console.assert(
-    actualOutput === targetOutput,
-    `Expected ${actualOutput} to equal ${targetOutput}`
-  );
-}
-
-// TODO: Write tests to cover all cases, including boundary and invalid cases.
-// Example: Identify Right Angles
-const right = getAngleType(90);
-assertEquals(right, "Right angle");

Sprint-3/2-practice-tdd/get-ordinal-number.js

@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 function getOrdinalNumber(num) {
   const lastTwoDigits = num % 100;
   const lastDigit = num % 10;
@@ -15,24 +14,6 @@ function getOrdinalNumber(num) {
     return `${num}rd`;
   } else {
     return `${num}th`;
-=======
-function getOrdinalNumber(number) {
-  const lastDigit = number % 10;
-  const lastTwoDigits = number % 100;
-
-  if (lastTwoDigits >= 11 && lastTwoDigits <= 13) {
-    return number + "th";
-  }
-
-  if (lastDigit === 1) {
-    return number + "st";
-  } else if (lastDigit === 2) {
-    return number + "nd";
-  } else if (lastDigit === 3) {
-    return number + "rd";
-  } else {
-    return number + "th";
->>>>>>> Stashed changes
   }
 }