From 3760f67004ea07e4a7f753c803022c303371481b Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 09:30:13 +0000 Subject: [PATCH 01/12] The 1-get-angle-type.js has been solved --- .../implement/1-get-angle-type.js | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 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..47770c09d 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 @@ -10,9 +10,20 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; + } else if (angle < 90) { + return "Acute angle"; + } else if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } else if (angle === 180) { + return "Straight 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. + else { + 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. } // The line below allows us to load the getAngleType function into tests in other files. @@ -51,13 +62,17 @@ assertEquals(acute, "Acute angle"); // 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(240); +assertEquals(reflex,"Reflex angle"); \ No newline at end of file From 9da6cfa20e7441b56d3c710d2da7b7f765c71f42 Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 11:09:31 +0000 Subject: [PATCH 02/12] The 2-is-proper-fraction.js task has been solved --- .../implement/2-is-proper-fraction.js | 17 +++++++++++++++-- 1 file changed, 15 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..fa6216994 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 @@ -5,11 +5,17 @@ // Written here like this: 1/2 == Numerator/Denominator // the first test and first case is written for you // complete the rest of the tests and cases -// write one test at a time, and make it pass, build your solution up methodically +// write one test at a time, and make it pass, build your solution up function isProperFraction(numerator, denominator) { + if (denominator === 0) return false; + if (numerator < 1) numerator = numerator * -1; + if (denominator < 1) denominator = Math.abs(denominator); + if (numerator < denominator) { return true; + } else { + return false; } } @@ -47,6 +53,7 @@ assertEquals(improperFraction, false); // 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 @@ -54,6 +61,12 @@ const negativeFraction = isProperFraction(-4, 7); // 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? +//Negative fraction check +//Input: numerator=-4, denominator=2; +//target output: false +// Explanation: The fraction -4/2 is not a proper fraction because the absolute value of the numerator (4) is more than the denominator (2). The function should return false. +const negativeFractionCase2 = isProperFraction(-4, 2); +assertEquals(negativeFractionCase2, false); From 12ac0d314669c6504bf5b37e17611d26be39ba9b Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 13:43:11 +0000 Subject: [PATCH 03/12] The 3-get-card-value.js task has been solved --- .../implement/3-get-card-value.js | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 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 266525d1b..8f4012afc 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,11 +8,23 @@ // 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); if (rank === "A") { return 11; } + if(rank==="J" || rank==="Q" || rank==="K") + { + return 10; + } + const convertTheStringtoNumber=Number(rank); +if (convertTheStringtoNumber>=2 && convertTheStringtoNumber<=10){ + return convertTheStringtoNumber; +} +else +{ + return "Invalid card rank"; +} } - // 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; @@ -40,18 +52,26 @@ assertEquals(aceofSpades, 11); // 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 jackofHearts = getCardValue("J♥"); +assertEquals(jackofHearts,10); +const queenofSpades = getCardValue("Q♠"); +assertEquals(queenofSpades,10); +const kingofSpades = getCardValue("K♠"); +assertEquals(kingofSpades,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 aceofHearts = getCardValue("A♥"); +assertEquals(aceofHearts, 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 invalidCards = getCardValue("B♥"); +assertEquals(invalidCards, "Invalid card rank"); \ No newline at end of file From b8f42709dee0d5661fe26b0931068a065f3b9559 Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 17:36:23 +0000 Subject: [PATCH 04/12] the 1get-angle-type.test.js task has been solved --- .../1-get-angle-type.test.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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..61746493f 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,25 @@ 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 Angles",()=>{ + expect(getAngleType(70)).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 Angles",()=>{ + expect(getAngleType(120)).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 Angles",()=>{ + 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 Angles",()=>{ + expect(getAngleType(240)).toEqual("Reflex angle"); +}); From 4a5a46b02ae948eef5009891047f312fd8179e4a Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 21:06:27 +0000 Subject: [PATCH 05/12] the 2-is-proper-fraction.test.js has been solved --- .../2-is-proper-fraction.test.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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..1a3e1a02b 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,14 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: - +test("returns false for an improper fraction",()=>{ + expect(isProperFraction(5,2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: - +test("returns true for a negative proper fraction( absolute value of the numerator is less than the denominator)", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("returns false when numerator equals denominator", () => { + expect(isProperFraction(9, 9)).toEqual(false); +}); \ No newline at end of file From 331e4ff61e2533a2c95f9727cefbb0778b6db9b4 Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 21:26:58 +0000 Subject: [PATCH 06/12] the 3-get-card-value.test.js task has been solved --- .../3-get-card-value.test.js | 21 +++++++++++++++++++ 1 file changed, 21 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..6213af628 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,27 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return the numeric value for number cards (2-10)",()=>{ + const fiveofHearts = getCardValue("5♥"); + expect(fiveofHearts).toEqual(5); + const tenofHearts = getCardValue("10♥"); + expect(tenofHearts).toEqual(10); +}); // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for face cards (J, Q, K)",()=>{ + const kingofHearts = getCardValue("K♥"); + expect(kingofHearts).toEqual(10); + const queenofHearts = getCardValue("Q♥"); + expect(queenofHearts).toEqual(10); +}); // Case 4: Handle Ace (A): +test("should return 11 for an Ace",()=>{ +const aceofHearts = getCardValue("A♥"); +expect(aceofHearts).toEqual(11); +}); + // Case 5: Handle Invalid Cards: +test("should return invalid card rank",()=>{ + const twelveofHearts = getCardValue("12♥"); + expect(twelveofHearts).toEqual("Invalid card rank") +}) From 2163ec2b9643cd33436fabc0397167554f806633 Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 21:29:04 +0000 Subject: [PATCH 07/12] final touch format document for all file in rewrite-tests-with-jest --- .../1-get-angle-type.test.js | 8 ++++---- .../2-is-proper-fraction.test.js | 6 +++--- .../3-get-card-value.test.js | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) 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 61746493f..00c03866f 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,25 +12,25 @@ 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 Angles",()=>{ +test("should identify Acute Angles", () => { expect(getAngleType(70)).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 Angles",()=>{ +test("should identify Obtuse Angles", () => { expect(getAngleType(120)).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 Angles",()=>{ +test("should identify Straight Angles", () => { 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 Angles",()=>{ +test("should identify Reflex Angles", () => { expect(getAngleType(240)).toEqual("Reflex angle"); }); 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 1a3e1a02b..c305257b9 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,8 +7,8 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: -test("returns false for an improper fraction",()=>{ - expect(isProperFraction(5,2)).toEqual(false); +test("returns false for an improper fraction", () => { + expect(isProperFraction(5, 2)).toEqual(false); }); // Case 3: Identify Negative Fractions: test("returns true for a negative proper fraction( absolute value of the numerator is less than the denominator)", () => { @@ -17,4 +17,4 @@ test("returns true for a negative proper fraction( absolute value of the numerat // Case 4: Identify Equal Numerator and Denominator: test("returns false when numerator equals denominator", () => { expect(isProperFraction(9, 9)).toEqual(false); -}); \ No newline at end of file +}); 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 6213af628..25bf1970c 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,27 +8,27 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): -test("should return the numeric value for number cards (2-10)",()=>{ +test("should return the numeric value for number cards (2-10)", () => { const fiveofHearts = getCardValue("5♥"); expect(fiveofHearts).toEqual(5); const tenofHearts = getCardValue("10♥"); expect(tenofHearts).toEqual(10); }); // Case 3: Handle Face Cards (J, Q, K): -test("should return 10 for face cards (J, Q, K)",()=>{ +test("should return 10 for face cards (J, Q, K)", () => { const kingofHearts = getCardValue("K♥"); expect(kingofHearts).toEqual(10); const queenofHearts = getCardValue("Q♥"); expect(queenofHearts).toEqual(10); }); // Case 4: Handle Ace (A): -test("should return 11 for an Ace",()=>{ -const aceofHearts = getCardValue("A♥"); -expect(aceofHearts).toEqual(11); +test("should return 11 for an Ace", () => { + const aceofHearts = getCardValue("A♥"); + expect(aceofHearts).toEqual(11); }); // Case 5: Handle Invalid Cards: -test("should return invalid card rank",()=>{ +test("should return invalid card rank", () => { const twelveofHearts = getCardValue("12♥"); - expect(twelveofHearts).toEqual("Invalid card rank") -}) + expect(twelveofHearts).toEqual("Invalid card rank"); +}); From ebad589121ce3172b69b989fc9ca11a866da413f Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Sun, 26 Oct 2025 21:31:52 +0000 Subject: [PATCH 08/12] final touch format document for all file in implement --- .../implement/1-get-angle-type.js | 8 ++--- .../implement/3-get-card-value.js | 29 +++++++++---------- 2 files changed, 16 insertions(+), 21 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 47770c09d..b1c9c58a3 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 @@ -16,12 +16,10 @@ function getAngleType(angle) { return "Obtuse angle"; } else if (angle === 180) { return "Straight angle"; - } - else { + } else { 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. } @@ -74,5 +72,5 @@ assertEquals(straight, "Straight angle"); // 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 -const reflex=getAngleType(240); -assertEquals(reflex,"Reflex angle"); \ No newline at end of file +const reflex = getAngleType(240); +assertEquals(reflex, "Reflex angle"); 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 8f4012afc..ff350c1f6 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,22 +8,19 @@ // 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.slice(0, -1); if (rank === "A") { return 11; } - if(rank==="J" || rank==="Q" || rank==="K") - { + if (rank === "J" || rank === "Q" || rank === "K") { return 10; } - const convertTheStringtoNumber=Number(rank); -if (convertTheStringtoNumber>=2 && convertTheStringtoNumber<=10){ - return convertTheStringtoNumber; -} -else -{ - return "Invalid card rank"; -} + const convertTheStringtoNumber = Number(rank); + if (convertTheStringtoNumber >= 2 && convertTheStringtoNumber <= 10) { + return convertTheStringtoNumber; + } else { + return "Invalid card rank"; + } } // 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. @@ -52,17 +49,17 @@ assertEquals(aceofSpades, 11); // 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); +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 jackofHearts = getCardValue("J♥"); -assertEquals(jackofHearts,10); +assertEquals(jackofHearts, 10); const queenofSpades = getCardValue("Q♠"); -assertEquals(queenofSpades,10); +assertEquals(queenofSpades, 10); const kingofSpades = getCardValue("K♠"); -assertEquals(kingofSpades,10); +assertEquals(kingofSpades, 10); // Handle Ace (A): // Given a card with a rank of "A", // When the function is called with an Ace, @@ -74,4 +71,4 @@ assertEquals(aceofHearts, 11); // When the function is called with such a card, // Then it should throw an error indicating "Invalid card rank." const invalidCards = getCardValue("B♥"); -assertEquals(invalidCards, "Invalid card rank"); \ No newline at end of file +assertEquals(invalidCards, "Invalid card rank"); From 3e9ab285a37ad50036846cc2098b11b67501f30c Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Wed, 29 Oct 2025 07:45:49 +0000 Subject: [PATCH 09/12] Use Math.abs function for both numerator and denominator --- .../implement/2-is-proper-fraction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa6216994..3c415dacc 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 @@ -9,7 +9,7 @@ function isProperFraction(numerator, denominator) { if (denominator === 0) return false; - if (numerator < 1) numerator = numerator * -1; + if (numerator < 1) numerator = Math.abs(numerator) ; if (denominator < 1) denominator = Math.abs(denominator); if (numerator < denominator) { From 922e296bdc2902e03bd4485da80beeb5ddfe15f7 Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Wed, 29 Oct 2025 08:22:16 +0000 Subject: [PATCH 10/12] solve the invalid issue be using .include() method --- .../implement/3-get-card-value.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 ff350c1f6..24c8b2ce0 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 @@ -15,12 +15,11 @@ function getCardValue(card) { if (rank === "J" || rank === "Q" || rank === "K") { return 10; } - const convertTheStringtoNumber = Number(rank); - if (convertTheStringtoNumber >= 2 && convertTheStringtoNumber <= 10) { - return convertTheStringtoNumber; - } else { - return "Invalid card rank"; - } + + const validRank = ["2", "3", "4", "5", "6", "7", "8", "9", "10"]; + if (validRank.includes(rank)) { + return Number(rank); + } else return "Invalid card rank"; } // 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. From cf43501344612735ac93ba3520843c898e5f78f6 Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Wed, 29 Oct 2025 20:56:15 +0000 Subject: [PATCH 11/12] Add three more tests to cover different situations --- .../2-is-proper-fraction.test.js | 11 +++++++++++ 1 file changed, 11 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 c305257b9..c42e63fb7 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 @@ -18,3 +18,14 @@ test("returns true for a negative proper fraction( absolute value of the numerat test("returns false when numerator equals denominator", () => { expect(isProperFraction(9, 9)).toEqual(false); }); + +test("return false when numerator equals denominator when both are negative",()=>{ + expect(isProperFraction(-4,-4)).toEqual(false); +}); + +test("returns false for a negative proper fraction( absolute value of the denominator is less than the numerator)", () => { + expect(isProperFraction(-7, 4)).toEqual(false); +}); +test("returns false when denominator is zero", () => { + expect(isProperFraction(3, 0)).toEqual(false); +}); \ No newline at end of file From 1bb6c7ed4202b65669dc909088eead8473c94da5 Mon Sep 17 00:00:00 2001 From: Ahmad Hmedan Date: Wed, 29 Oct 2025 20:57:19 +0000 Subject: [PATCH 12/12] Format document --- .../rewrite-tests-with-jest/2-is-proper-fraction.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c42e63fb7..fe0650211 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 @@ -19,8 +19,8 @@ test("returns false when numerator equals denominator", () => { expect(isProperFraction(9, 9)).toEqual(false); }); -test("return false when numerator equals denominator when both are negative",()=>{ - expect(isProperFraction(-4,-4)).toEqual(false); +test("return false when numerator equals denominator when both are negative", () => { + expect(isProperFraction(-4, -4)).toEqual(false); }); test("returns false for a negative proper fraction( absolute value of the denominator is less than the numerator)", () => { @@ -28,4 +28,4 @@ test("returns false for a negative proper fraction( absolute value of the denomi }); test("returns false when denominator is zero", () => { expect(isProperFraction(3, 0)).toEqual(false); -}); \ No newline at end of file +});