revised test and function for getCardValue

Author: leerogerfn

implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js

@@ -18,8 +18,31 @@ test("Valid ace card", () => {
 
 test("Arbitrary non-card string", () => {
   assert.throws(
-    () => getCardValue("invalid"),
-    /Expected a number followed by a suit, but got "invalid"/,
+    () => getCardValue("10"),
+    /Expected a number or face followed by a suit, but got "invalid"/,
+    "Expected clear error"
+  );
+  assert.throws(
+    () => getCardValue("♥"),
+    /Expected a number or face followed by a suit, but got "invalid"/,
+    "Expected clear error"
+  );
+  assert.throws(
+    () => getCardValue(""),
+    /Expected a number or face followed by a suit, but got "invalid"/,
+    "Expected clear error"
+  );
+  assert.throws(
+    () => getCardValue("♥10"),
+    /Expected a number or face followed by a suit, but got "invalid"/,
+    "Expected clear error"
+  );
+});
+
+test("Invalid Rank", () => {
+  assert.throws(
+    () => getCardValue("12♥"),
+    /Valid rank: 2-10, A, J, Q, K only/,
     "Expected clear error"
   );
 });

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

@@ -51,9 +51,16 @@ export function getCardValue(card) {
     "K",
   ].includes(rank);
   const validSuit = ["♠", "♥", "♦", "♣"].includes(suit);
+  const validCard = validRank + validSuit;
 
-  if (!validRank || !validSuit || card.length > 3 || card.length < 2) {
-    throw new Error(`Expected a number followed by a suit, but got "invalid"`);
+  if (!validCard || !validSuit || card.length > 3 || card.length < 2) {
+    throw new Error(
+      `Expected a number or face followed by a suit, but got "invalid"`
+    );
+  }
+
+  if (!validRank) {
+    throw new Error(`Valid rank: 2-10, A, J, Q, K only.`);
   }
 
   if (rank === "A") {

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

@@ -20,8 +20,32 @@ test(`Should return 10 when given J/Q/K`, () => {
 });
 //   Invalid Cards
 test(`Expected a number followed by a suit, but got invalid`, () => {
-  expect(() => getCardValue("invalid")).toThrow(
-    `Expected a number followed by a suit, but got "invalid"`
+  expect(() => getCardValue("10")).toThrow(
+    `Expected a number or face followed by a suit, but got "invalid"`
+  );
+});
+
+test(`Expected a number followed by a suit, but got invalid`, () => {
+  expect(() => getCardValue("")).toThrow(
+    `Expected a number or face followed by a suit, but got "invalid"`
+  );
+});
+
+test(`Expected a number followed by a suit, but got invalid`, () => {
+  expect(() => getCardValue("♥")).toThrow(
+    `Expected a number or face followed by a suit, but got "invalid"`
+  );
+});
+
+test(`Expected a number followed by a suit, but got invalid`, () => {
+  expect(() => getCardValue("♥10")).toThrow(
+    `Expected a number or face followed by a suit, but got "invalid"`
+  );
+});
+
+test(`Valid rank: 2-10, A, J, Q, K only`, () => {
+  expect(() => getCardValue("12♥")).toThrow(
+    `Valid rank: 2-10, A, J, Q, K only`
   );
 });