changes made to angle test

Author: d-odumosu

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

@@ -22,13 +22,12 @@
 // execute the code to ensure all tests pass.
 
 function getCardValue(card) {
-  // Basic validation: validating the input before slicing
   if (card === "") {
     throw new Error("No card was played");
   }
-
-  const rank = card.slice(0, -1).toUpperCase();
-  const suit = card.slice(-1);
+  if (card.length < 2 || card.length > 3) {
+    throw new Error("Invalid card");
+  }
 
   const validSuits = ["♠", "♥", "♦", "♣"];
   const validRanks = [
@@ -47,21 +46,19 @@ function getCardValue(card) {
     "K",
   ];
 
-  // Suit and rank validation
+  const suit = card.slice(-1);
   if (!validSuits.includes(suit)) {
     throw new Error("Invalid card: suit is not recognised");
   }
-  if (validRanks.includes(rank)) {
-    if (rank === "A") {
-      return 11;
-    } else if (rank === "J" || rank === "Q" || rank === "K") {
-      return 10;
-    } else {
-      return Number(rank);
-    }
-  } else {
-    throw new Error("Invalid rank");
+
+  const rank = card.slice(0, -1).toUpperCase();
+  if (!validRanks.includes(rank)) {
+    throw new Error("Invalid card: rank is not recognised");
   }
+  if (rank === "A") return 11;
+  if (["J", "Q", "K"].includes(rank)) return 10;
+
+  return Number(rank);
 }
 
 // The line below allows us to load the getCardValue function into tests in other files.

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

@@ -2,15 +2,13 @@
 // We will use the same function, but write tests for it using Jest in this file.
 const getCardValue = require("../implement/3-get-card-value");
 
-
-// Case 1: Ace (A)
+// Ace (A)
 test(`Should return 11 when given an ace card`, () => {
   expect(getCardValue("A♠")).toEqual(11);
 });
 
-// Suggestion: Group the remaining test data into these categories: //   ♠ ♥ ♦ ♣
 //   Number Cards (2-10)
-test(`Should return the card's numeric rank for cards 2 through 10`, () =>{
+test(`Should return the card's numeric rank for cards 2 through 10`, () => {
   expect(getCardValue("2♠")).toEqual(2);
   expect(getCardValue("3♥")).toEqual(3);
   expect(getCardValue("4♦")).toEqual(4);
@@ -20,26 +18,22 @@ test(`Should return the card's numeric rank for cards 2 through 10`, () =>{
   expect(getCardValue("8♦")).toEqual(8);
   expect(getCardValue("9♣")).toEqual(9);
   expect(getCardValue("10♠")).toEqual(10);
+});
 
-})
 //   Face Cards (J, Q, K)
 test(`should return 10 When the card is a face card ("J", "Q", "K")`, () => {
   expect(getCardValue("j♠")).toEqual(10);
   expect(getCardValue("k♦")).toEqual(10);
   expect(getCardValue("q♣")).toEqual(10);
+});
 
-})
 //   Invalid Cards
 test("should throw an error when an invalid card is played", () => {
   expect(() => getCardValue("")).toThrow("No card was played");
-  expect(() => getCardValue("1009♣")).toThrow("Invalid card played, rank and suit cannot be less " +
-      "than 1 or more than 3")
-
+  expect(() => getCardValue("X♠")).toThrow(
+    "Invalid card: rank is not recognised"
+  );
+  expect(() => getCardValue("9X")).toThrow(
+    "Invalid card: suit is not recognised"
+  );
 });
-
-
-
-// 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
-