rewrite tests with jests complete

Author: risikatpopoola

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

@@ -32,7 +32,7 @@ function getAngleType(angle) {
     return "Reflex angle";
   }
   else if(angle === 0){
-    return "Zero Angle"
+    return "Zero angle"
   }
   else if(angle === 360){
     return "Complete angle"
@@ -78,7 +78,7 @@ assertEquals(getAngleType(249), "Reflex angle");
 
 // Test for invalid angles
 assertEquals(getAngleType(-980), "Invalid angle");
-assertEquals(getAngleType(9082), "Right angle"); 
+assertEquals(getAngleType(9082), "Invalid angle"); 
 assertEquals(getAngleType(672), "Invalid angle");
 //
 assertEquals(getAngleType(0), "Zero angle");

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

@@ -11,7 +11,7 @@
 // execute the code to ensure all tests pass.
 
 function isProperFraction(numerator, denominator) {
-  return numerator < denominator;
+  return Math.abs(numerator) < Math.abs(denominator);
   // TODO: Implement this function
 }
 

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

@@ -23,6 +23,9 @@
 
 function getCardValue(card) {
   // TODO: Implement this function
+  if (typeof card !== "string" || card.length < 2 || card.length > 3) {
+    throw new Error("Invalid card");
+  }
   const ranks = [
     "A",
     "2",
@@ -41,11 +44,12 @@ function getCardValue(card) {
   const suits = ["♠", "♥", "♦", "♣"];
 let rank = card.slice(0, -1)// This is extracting the bit before the suits alone
 let suit = card.slice(-1) // THis is extracting the suit in the string
+  
   if(!ranks.includes(rank)){
-    throw new Error("Invalid rank")
+    throw new Error("Invalid card")
   }
   if (!suits.includes(suit)){
-    throw new Error("Invalid suit")
+    throw new Error("Invalid card")
   }
   if (rank === "A"){
     return 11}
@@ -55,6 +59,7 @@ let suit = card.slice(-1) // THis is extracting the suit in the string
   else{
     return Number(rank)
   }
+  
 }
 // The line below allows us to load the getCardValue function into tests in other files.
 // This will be useful in the "rewrite tests with jest" step.
@@ -100,20 +105,14 @@ try {
 
 try {
   getCardValue("A");
-  console.error("Error not thrown for missing suit");
+  console.error("Error not thrown for invalid card missing suit");
 } catch (e) {
-  console.log("Error thrown for missing suit 🎉");
+  console.log("Error thrown for invalid card missing suit🎉");
 }
 
 try {
   getCardValue("");
-  console.error("Error not thrown for empty string");
+  console.error("Error not thrown for invalid card containing empty string");
 } catch (e) {
-  console.log("Error thrown for empty string🎉");
-}
-try {
-  getCardValue("Apple");
-  console.error("Error not thrown");
-} catch {
-  console.log("Error thrown 🎉");
+  console.log("Error thrown for invalid card containing empty string");
 }

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

@@ -23,6 +23,6 @@ test(`should return true when negative/positive numerator is less than the posit
 // Special case: numerator or denominator is negative, we consider the absolute values for fractions so ignore the negative signs
 test(`should return false when negative/positive numerator is greater than the positive/negative denominator`, () => {
   expect(isProperFraction(-50, 10)).toEqual(false);
-  expect(isProperFraction(100, -2)).toEqual(false);
+  expect(isProperFraction(100, 2)).toEqual(false);
   expect(isProperFraction(-1, -0)).toEqual(false);
 });

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js

@@ -21,10 +21,10 @@ test(`Should return the number when given a number card`, () => {
   expect(getCardValue("2♦")).toEqual(2);
 });
 //Case 4: Invalid cards
-test(`Should return the invalid suit or invalid rank when given an invalid card`, () => {
-  expect(getCardValue("4🎉")).toEqual("Invalid suit");
-  expect(getCardValue("20♣")).toEqual("Invalid rank");
-  expect(getCardValue("Apple")).toEqual("Invalid card");
+test(`Should return the invalid suit, invalid card or invalid card`, () => {
+  expect(() => getCardValue("Apple")).toThrow("Invalid card");
+  expect(() => getCardValue("4🎉")).toThrow("Invalid card");
+  expect(() => getCardValue("20♣")).toThrow("Invalid card");
 });
 // Suggestion: Group the remaining test data into these categories:
 //   Number Cards (2-10)
@@ -33,5 +33,5 @@ test(`Should return the invalid suit or invalid rank when given an invalid card`
 
 // To learn how to test whether a function throws an error as expected in Jest,
 // please refer to the Jest documentation:
-// https://jestjs.io/docs/expect#tothrowerror
+// https://jestjs.io/docs/expecttothrowerror