Complete remaining Jest updates and tighten card rank validation

Author: Richiealx

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

@@ -22,17 +22,17 @@
 // execute the code to ensure all tests pass.
 
 function getCardValue(card) {
-  const suits = ["♠", "♥", "♦", "♣"];
+  const validSuits = ["♠", "♥", "♦", "♣"];
+  const validNumberRanks = ["2", "3", "4", "5", "6", "7", "8", "9", "10"];
 
-  // Card must be a string
-  if (typeof card !== "string") {
+  if (typeof card !== "string" || card.length < 2) {
     throw new Error("Invalid card");
   }
 
   const suit = card.slice(-1);
   const rank = card.slice(0, -1);
 
-  if (!suits.includes(suit)) {
+  if (!validSuits.includes(suit)) {
     throw new Error("Invalid card");
   }
 
@@ -44,10 +44,8 @@ function getCardValue(card) {
     return 10;
   }
 
-  const number = Number(rank);
-
-  if (number >= 2 && number <= 10) {
-    return number;
+  if (validNumberRanks.includes(rank)) {
+    return Number(rank);
   }
 
   throw new Error("Invalid card");
@@ -104,4 +102,19 @@ try {
 try {
   getCardValue("♠");
   console.error("Error was not thrown for invalid card");
+} catch (e) {}
+
+try {
+  getCardValue("0x02♠");
+  console.error("Error was not thrown for invalid card");
+} catch (e) {}
+
+try {
+  getCardValue("2.1♠");
+  console.error("Error was not thrown for invalid card");
+} catch (e) {}
+
+try {
+  getCardValue("0002♠");
+  console.error("Error was not thrown for invalid card");
 } catch (e) {}

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

@@ -18,3 +18,32 @@ test(`Should return 11 when given an ace card`, () => {
 // please refer to the Jest documentation:
 // https://jestjs.io/docs/expect#tothrowerror
 
+// Case 2: Number cards
+test("should return the numeric value when given a valid number card", () => {
+  expect(getCardValue("2♠")).toEqual(2);
+  expect(getCardValue("9♠")).toEqual(9);
+  expect(getCardValue("10♥")).toEqual(10);
+});
+
+// Case 3: Face cards
+test("should return 10 when given a face card", () => {
+  expect(getCardValue("J♣")).toEqual(10);
+  expect(getCardValue("Q♦")).toEqual(10);
+  expect(getCardValue("K♥")).toEqual(10);
+});
+
+// Case 4: Invalid cards
+test("should throw an error for invalid card strings", () => {
+  expect(() => getCardValue("invalid")).toThrow();
+  expect(() => getCardValue("1♠")).toThrow();
+  expect(() => getCardValue("11♠")).toThrow();
+  expect(() => getCardValue("A")).toThrow();
+  expect(() => getCardValue("♠")).toThrow();
+});
+
+// Case 5: Invalid numeric literal strings
+test("should throw an error for strings that JavaScript can coerce to numbers but are not valid card ranks", () => {
+  expect(() => getCardValue("0x02♠")).toThrow();
+  expect(() => getCardValue("2.1♠")).toThrow();
+  expect(() => getCardValue("0002♠")).toThrow();
+});