Reimplement getCardValue with an array

Author: SandzSoft

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

@@ -22,27 +22,35 @@
 // execute the code to ensure all tests pass.
 
 function getCardValue(card) {
-  let rankStr = card.slice(0, -1);
-  let rank = Number(rankStr);
-  console.log("rank :" + rank);
+  let rank = card.slice(0, -1);
   let suit = card.slice(-1);
-  console.log("suit :" + suit);
   const suitArray = ["♠", "♥", "♦", "♣"];
-  if (!suitArray.includes(suit) || !/^(10|[2-9])$/.test(rankStr)) {
+  const rankArray = [
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "10",
+    "J",
+    "Q",
+    "K",
+    "A",
+  ];
+  if (!suitArray.includes(suit) || !rankArray.includes(rank)) {
     throw new Error("Invalid card");
   } else if (rank === "A") {
     return 11;
   } else if (rank === "Q" || rank === "K" || rank === "J") {
     return 10;
-  } else if (rank >= 2 && rank <= 10 && Number.isInteger(rank)) {
+  } else if (Number(rank) >= 2 && Number(rank) <= 10) {
     return Number(rank);
-  } else {
-    throw new Error("Invalid card");
   }
 }
 
-console.log(getCardValue("0002♠"));
-
 // 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.
 module.exports = getCardValue;
@@ -57,16 +65,16 @@ function assertEquals(actualOutput, targetOutput) {
 
 // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards.
 // Examples:
-/*assertEquals(getCardValue("A♠"), 11);
+assertEquals(getCardValue("A♠"), 11);
 assertEquals(getCardValue("A♣"), 11);
 assertEquals(getCardValue("Q♠"), 10);
 assertEquals(getCardValue("K♣"), 10);
 assertEquals(getCardValue("J♦"), 10);
 assertEquals(getCardValue("2♠"), 2);
-assertEquals(getCardValue("10♣"), 10);*/
+assertEquals(getCardValue("10♣"), 10);
 
 // Handling invalid cards
-/*try {
+try {
   getCardValue("AX");
   console.error("Error was not thrown for invalid card 😢");
 } catch (e) {
@@ -91,6 +99,6 @@ try {
   console.error("Error was not thrown for invalid card 😢");
 } catch (e) {
   console.log("Error thrown for invalid card 🎉");
-}*/
+}
 
 // What other invalid card cases can you think of?

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

@@ -18,7 +18,6 @@ describe("getCardValue", () => {
     test("Number cards return their value", () => {
       expect(getCardValue("2♠")).toEqual(2);
       expect(getCardValue("10♣")).toEqual(10);
-      expect(getCardValue("0002♣")).toEqual(2);
     });
   });
 
@@ -30,6 +29,7 @@ describe("getCardValue", () => {
       expect(() => getCardValue("11♣")).toThrow("Invalid card");
       expect(() => getCardValue("0x02♠")).toThrow("Invalid card");
       expect(() => getCardValue("2.1♠")).toThrow("Invalid card");
+      expect(() => getCardValue("0002♠")).toThrow("Invalid card");
     });
   });
 });