From 8175d4d7c07d012bf810e44fb4c1c2d2a9d793d2 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 22 Oct 2025 19:43:29 +0100
Subject: [PATCH 01/11] Completed 1-get-angle-type.js exercise

---
 .../implement/1-get-angle-type.js             | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js
index ca1dfe7f2..390509ddb 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js
@@ -8,11 +8,19 @@
 // Then, write the next test! :) Go through this process until all the cases are implemented
 
 function getAngleType(angle) {
-  if (angle === 90) {
+  if (angle < 90) {
+    return "Acute angle";
+  } else if (angle === 90) {
     return "Right angle";
+  } else if (angle > 90 && angle < 180) {
+    return "Obtuse angle";
+  } else if (angle === 180) {
+    return "Straight angle";
+  } else if (angle < 360) {
+    return "Reflex angle";
   }
-   // Run the tests, work out what Case 2 is testing, and implement the required code here.
-   // Then keep going for the other cases, one at a time.
+  // Run the tests, work out what Case 2 is testing, and implement the required code here.
+  // Then keep going for the other cases, one at a time.
 }
 
 // The line below allows us to load the getAngleType function into tests in other files.
@@ -50,14 +58,17 @@ assertEquals(acute, "Acute angle");
 // When the angle is greater than 90 degrees and less than 180 degrees,
 // Then the function should return "Obtuse angle"
 const obtuse = getAngleType(120);
-// ====> write your test here, and then add a line to pass the test in the function above
+assertEquals(obtuse, "Obtuse angle");
 
 // Case 4: Identify Straight Angles:
 // When the angle is exactly 180 degrees,
 // Then the function should return "Straight angle"
-// ====> write your test here, and then add a line to pass the test in the function above
+const straight = getAngleType(180);
+assertEquals(straight, "Straight angle");
 
 // Case 5: Identify Reflex Angles:
 // When the angle is greater than 180 degrees and less than 360 degrees,
 // Then the function should return "Reflex angle"
-// ====> write your test here, and then add a line to pass the test in the function above
\ No newline at end of file
+// ====> write your test here, and then add a line to pass the test in the function above
+const reflex = getAngleType(200);
+assertEquals(reflex, "Reflex angle");

From 52ca6f05045702346b1fe608dfb36fd8ca547d9c Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 22 Oct 2025 19:48:01 +0100
Subject: [PATCH 02/11] Completed 2-is-proper-fraction.js exercise

---
 .../implement/2-is-proper-fraction.js                       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
index a4739af77..09a878b08 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
@@ -10,6 +10,8 @@
 function isProperFraction(numerator, denominator) {
   if (numerator < denominator) {
     return true;
+  } else {
+    return false;
   }
 }
 
@@ -46,14 +48,14 @@ assertEquals(improperFraction, false);
 // target output: true
 // Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true.
 const negativeFraction = isProperFraction(-4, 7);
-// ====> complete with your assertion
+assertEquals(negativeFraction, true);
 
 // Equal Numerator and Denominator check:
 // Input: numerator = 3, denominator = 3
 // target output: false
 // Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false.
 const equalFraction = isProperFraction(3, 3);
-// ====> complete with your assertion
+assertEquals(equalFraction, false);
 
 // Stretch:
 // What other scenarios could you test for?

From c947491bfdf54448d91b37be0cde2a2178d518a7 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 22 Oct 2025 21:41:43 +0100
Subject: [PATCH 03/11] Completed 3-get-card-value.js exercise

---
 .../implement/3-get-card-value.js                | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
index 266525d1b..f74a508dd 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -8,8 +8,16 @@
 // write one test at a time, and make it pass, build your solution up methodically
 // just make one change at a time -- don't rush -- programmers are deep and careful thinkers
 function getCardValue(card) {
+  const rank = card[0];
+
   if (rank === "A") {
     return 11;
+  } else if (["J", "Q", "K"].includes(rank)) {
+    return 10;
+  } else if (rank >= 2 || rank <= 10) {
+    return Number(rank);
+  } else {
+    return "Invalid card rank.";
   }
 }
 
@@ -39,19 +47,25 @@ assertEquals(aceofSpades, 11);
 // When the function is called with such a card,
 // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5).
 const fiveofHearts = getCardValue("5♥");
-// ====> write your test here, and then add a line to pass the test in the function above
+assertEquals(fiveofHearts, 5);
 
 // Handle Face Cards (J, Q, K):
 // Given a card with a rank of "10," "J," "Q," or "K",
 // When the function is called with such a card,
 // Then it should return the value 10, as these cards are worth 10 points each in blackjack.
+const jackOfDiamonds = getCardValue("J♢");
+assertEquals(jackOfDiamonds, 10);
 
 // Handle Ace (A):
 // Given a card with a rank of "A",
 // When the function is called with an Ace,
 // Then it should, by default, assume the Ace is worth 11 points, which is a common rule in blackjack.
+const ace = getCardValue("A");
+assertEquals(ace, 11);
 
 // Handle Invalid Cards:
 // Given a card with an invalid rank (neither a number nor a recognized face card),
 // When the function is called with such a card,
 // Then it should throw an error indicating "Invalid card rank."
+const invalidRank = getCardValue("@");
+assertEquals(invalidRank, "Invalid card rank.");

From 69d77556cda4668b66b900d51a8c8203f987bd90 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 22 Oct 2025 21:52:21 +0100
Subject: [PATCH 04/11] Completed 1-get-angle-type.test.js exercise

---
 .../rewrite-tests-with-jest/1-get-angle-type.test.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
index 4a92a3e82..375bf2ab9 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
@@ -12,15 +12,27 @@ test("should identify right angle (90°)", () => {
 // Case 2: Identify Acute Angles:
 // When the angle is less than 90 degrees,
 // Then the function should return "Acute angle"
+test("should identify acute angle (<90°)", () => {
+  expect(getAngleType(45)).toEqual("Acute angle");
+});
 
 // Case 3: Identify Obtuse Angles:
 // When the angle is greater than 90 degrees and less than 180 degrees,
 // Then the function should return "Obtuse angle"
+test("should identify obtuse angle (>90° and <180°)", () => {
+  expect(getAngleType(135)).toEqual("Obtuse angle");
+});
 
 // Case 4: Identify Straight Angles:
 // When the angle is exactly 180 degrees,
 // Then the function should return "Straight angle"
+test("should identify straight angle (180°)", () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
 
 // Case 5: Identify Reflex Angles:
 // When the angle is greater than 180 degrees and less than 360 degrees,
 // Then the function should return "Reflex angle"
+test("should identify reflex angle (> 180° and < 360°)", () => {
+  expect(getAngleType(225)).toEqual("Reflex angle");
+});

From 0631bd4df952eee09bea83d183a56c7c06a47cb9 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 22 Oct 2025 21:58:12 +0100
Subject: [PATCH 05/11] Completed 2-is-proper-fraction.test.js exercise

---
 .../rewrite-tests-with-jest/2-is-proper-fraction.test.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
index caf08d15b..7d4b81697 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
@@ -7,7 +7,16 @@ test("should return true for a proper fraction", () => {
 });
 
 // Case 2: Identify Improper Fractions:
+test("should return false for an import fraction", () => {
+  expect(isProperFraction(3, 2)).toEqual(false);
+});
 
 // Case 3: Identify Negative Fractions:
+test("should return true for a negative fraction", () => {
+  expect(isProperFraction(-4, 7)).toEqual(true);
+});
 
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false for a fraction whose numerator and denominator are the same", () => {
+  expect(isProperFraction(3, 3)).toEqual(false);
+});

From c98b47729af7996886e0477c374857fae3b17aad Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 22 Oct 2025 22:04:43 +0100
Subject: [PATCH 06/11] Completed 3-get-card-value.test.js exercise

---
 .../3-get-card-value.test.js                  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
index 04418ff72..491cfad33 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
@@ -8,6 +8,25 @@ test("should return 11 for Ace of Spades", () => {
 });
 
 // Case 2: Handle Number Cards (2-10):
+test("should return 5 for a number card", () => {
+  const fiveofHearts = getCardValue("5♥");
+  expect(fiveofHearts).toEqual(5);
+});
+
 // Case 3: Handle Face Cards (J, Q, K):
+test("should return 10 for a face card", () => {
+  const jackOfDiamonds = getCardValue("J♢");
+  expect(jackOfDiamonds).toEqual(10);
+});
+
 // Case 4: Handle Ace (A):
+test("should return 11 for an Ace", () => {
+  const ace = getCardValue("A");
+  expect(ace).toEqual(11);
+});
+
 // Case 5: Handle Invalid Cards:
+test("should return `Invalid card rank.` for an invalid card", () => {
+  const invalidRank = getCardValue("@");
+  expect(invalidRank).toEqual("Invalid card rank.");
+});

From a95ca143432b11c9c92275895b42c5f75afbeb62 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 29 Oct 2025 17:09:14 +0000
Subject: [PATCH 07/11] Address the issues from the pull request comments

---
 .../implement/2-is-proper-fraction.js         | 12 +++++++---
 .../implement/3-get-card-value.js             |  4 ++--
 .../2-is-proper-fraction.test.js              | 10 +++++++-
 .../3-get-card-value.test.js                  | 24 ++++++++++++-------
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
index 09a878b08..ed0f2a236 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
@@ -8,11 +8,11 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
-  if (numerator < denominator) {
-    return true;
-  } else {
+  if (denominator === 0) {
     return false;
   }
+
+  return Math.abs(numerator) < Math.abs(denominator);
 }
 
 // The line below allows us to load the isProperFraction function into tests in other files.
@@ -59,3 +59,9 @@ assertEquals(equalFraction, false);
 
 // Stretch:
 // What other scenarios could you test for?
+
+const divideByZero = isProperFraction(3, 0);
+assertEquals(divideByZero, false);
+
+const zeroNumerator = isProperFraction(0, 3);
+assertEquals(zeroNumerator, true);
diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
index f74a508dd..59a3dab55 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -8,13 +8,13 @@
 // write one test at a time, and make it pass, build your solution up methodically
 // just make one change at a time -- don't rush -- programmers are deep and careful thinkers
 function getCardValue(card) {
-  const rank = card[0];
+  const rank = card.slice(0, -1);
 
   if (rank === "A") {
     return 11;
   } else if (["J", "Q", "K"].includes(rank)) {
     return 10;
-  } else if (rank >= 2 || rank <= 10) {
+  } else if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 10) {
     return Number(rank);
   } else {
     return "Invalid card rank.";
diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
index 7d4b81697..e55046e35 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
@@ -7,15 +7,23 @@ test("should return true for a proper fraction", () => {
 });
 
 // Case 2: Identify Improper Fractions:
-test("should return false for an import fraction", () => {
+test("should return false for an improper fraction", () => {
   expect(isProperFraction(3, 2)).toEqual(false);
 });
 
+test("should return false for an improper fraction", () => {
+  expect(isProperFraction(-5, 3)).toEqual(false);
+});
+
 // Case 3: Identify Negative Fractions:
 test("should return true for a negative fraction", () => {
   expect(isProperFraction(-4, 7)).toEqual(true);
 });
 
+test("should return true for a negative fraction", () => {
+  expect(isProperFraction(4, -7)).toEqual(true);
+});
+
 // Case 4: Identify Equal Numerator and Denominator:
 test("should return false for a fraction whose numerator and denominator are the same", () => {
   expect(isProperFraction(3, 3)).toEqual(false);
diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
index 491cfad33..9ce3d003e 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
@@ -8,20 +8,26 @@ test("should return 11 for Ace of Spades", () => {
 });
 
 // Case 2: Handle Number Cards (2-10):
-test("should return 5 for a number card", () => {
-  const fiveofHearts = getCardValue("5♥");
-  expect(fiveofHearts).toEqual(5);
-});
+for (let i = 2; i <= 10; i++) {
+  test(`should return ${i} for a number card ${i}♥`, () => {
+    const card = getCardValue(`${i}♥`);
+    expect(card).toEqual(i);
+  });
+}
 
 // Case 3: Handle Face Cards (J, Q, K):
-test("should return 10 for a face card", () => {
-  const jackOfDiamonds = getCardValue("J♢");
-  expect(jackOfDiamonds).toEqual(10);
-});
+const faceCards = ["J", "Q", "K"];
+
+for (let faceCard of faceCards) {
+  test(`should return 10 for a card card ${faceCard}♢`, () => {
+    const card = getCardValue(`${faceCard}♢`);
+    expect(card).toEqual(10);
+  });
+}
 
 // Case 4: Handle Ace (A):
 test("should return 11 for an Ace", () => {
-  const ace = getCardValue("A");
+  const ace = getCardValue("A♠");
   expect(ace).toEqual(11);
 });
 

From 31270ee4a949894997a0ff98a8d01d907e77ffc5 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 29 Oct 2025 19:01:50 +0000
Subject: [PATCH 08/11] Address the issues from the pull request comments again

---
 .../implement/3-get-card-value.js                           | 2 +-
 .../rewrite-tests-with-jest/2-is-proper-fraction.test.js    | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
index 59a3dab55..a9aa8f281 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -14,7 +14,7 @@ function getCardValue(card) {
     return 11;
   } else if (["J", "Q", "K"].includes(rank)) {
     return 10;
-  } else if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 10) {
+  } else if (!isNaN(rank) && rank >= 2 && rank <= 10) {
     return Number(rank);
   } else {
     return "Invalid card rank.";
diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
index e55046e35..335863fed 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
@@ -9,18 +9,12 @@ test("should return true for a proper fraction", () => {
 // Case 2: Identify Improper Fractions:
 test("should return false for an improper fraction", () => {
   expect(isProperFraction(3, 2)).toEqual(false);
-});
-
-test("should return false for an improper fraction", () => {
   expect(isProperFraction(-5, 3)).toEqual(false);
 });
 
 // Case 3: Identify Negative Fractions:
 test("should return true for a negative fraction", () => {
   expect(isProperFraction(-4, 7)).toEqual(true);
-});
-
-test("should return true for a negative fraction", () => {
   expect(isProperFraction(4, -7)).toEqual(true);
 });
 

From 0bf44366e4ed1abc0a0bff533f7860a269efc971 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Wed, 29 Oct 2025 21:36:19 +0000
Subject: [PATCH 09/11] Remove isNaN check because of coerced conversion

---
 .../1-implement-and-rewrite-tests/implement/3-get-card-value.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
index a9aa8f281..58f9748a0 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -14,7 +14,7 @@ function getCardValue(card) {
     return 11;
   } else if (["J", "Q", "K"].includes(rank)) {
     return 10;
-  } else if (!isNaN(rank) && rank >= 2 && rank <= 10) {
+  } else if (rank >= 2 && rank <= 10) {
     return Number(rank);
   } else {
     return "Invalid card rank.";

From 3f52c42407bd7dce5f5616e114c57695cd71a5e5 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Thu, 30 Oct 2025 14:30:41 +0000
Subject: [PATCH 10/11] Throw an error for "Invalid card rank." and update the
 test to expect an error to be thrown

---
 .../implement/3-get-card-value.js                              | 2 +-
 .../rewrite-tests-with-jest/3-get-card-value.test.js           | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
index 58f9748a0..efbe14b55 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -17,7 +17,7 @@ function getCardValue(card) {
   } else if (rank >= 2 && rank <= 10) {
     return Number(rank);
   } else {
-    return "Invalid card rank.";
+    return new Error("Invalid card rank.");
   }
 }
 
diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
index 9ce3d003e..d7b5737a0 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
@@ -33,6 +33,5 @@ test("should return 11 for an Ace", () => {
 
 // Case 5: Handle Invalid Cards:
 test("should return `Invalid card rank.` for an invalid card", () => {
-  const invalidRank = getCardValue("@");
-  expect(invalidRank).toEqual("Invalid card rank.");
+  expect(() => getCardValue("@").toThrow("Invalid card rank."));
 });

From e8fd53d2a139cb97391f753c4a46c2e31b504358 Mon Sep 17 00:00:00 2001
From: Ammad <anosidium@hotmail.com>
Date: Thu, 30 Oct 2025 14:55:21 +0000
Subject: [PATCH 11/11] Improve getCardValue() to handle the parameter as well
 as validating the rank when it comes to handling number cards

---
 .../implement/3-get-card-value.js                    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
index efbe14b55..2b80fbb56 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -8,13 +8,13 @@
 // write one test at a time, and make it pass, build your solution up methodically
 // just make one change at a time -- don't rush -- programmers are deep and careful thinkers
 function getCardValue(card) {
-  const rank = card.slice(0, -1);
+  const rank = card.length > 1 ? card.slice(0, -1) : card;
 
   if (rank === "A") {
     return 11;
   } else if (["J", "Q", "K"].includes(rank)) {
     return 10;
-  } else if (rank >= 2 && rank <= 10) {
+  } else if (/^(?:[2-9]|10)$/.test(rank)) {
     return Number(rank);
   } else {
     return new Error("Invalid card rank.");
@@ -67,5 +67,13 @@ assertEquals(ace, 11);
 // Given a card with an invalid rank (neither a number nor a recognized face card),
 // When the function is called with such a card,
 // Then it should throw an error indicating "Invalid card rank."
+
+// assertEquals() doesn’t handle an actual Error being thrown, so the console will display:
+//
+// Expected Error: Invalid card rank. to equal Invalid card rank.
+// 3-get-card-value.js:32
+// Assertion failed: Expected Error: Invalid card rank. to equal Invalid card rank.
+//
+// It will work if getCardValue() returns a string instead.
 const invalidRank = getCardValue("@");
 assertEquals(invalidRank, "Invalid card rank.");