From c83ad2fa105ec46b8450240325be53f0668061ae Mon Sep 17 00:00:00 2001 From: Seti Mussa Date: Sat, 21 Mar 2026 12:21:46 +0000 Subject: [PATCH 1/4] Done the implement and rewrite --- .../implement/1-get-angle-type.js | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 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 9e05a871e2..a01610010c 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 @@ -1,5 +1,4 @@ // Implement a function getAngleType -// // When given an angle in degrees, it should return a string indicating the type of angle: // - "Acute angle" for angles greater than 0° and less than 90° // - "Right angle" for exactly 90° @@ -15,12 +14,34 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { - // TODO: Implement this function + function getAngleType(angle) { + if (angle <= 0 || angle >= 360) + } + + if (angle < 90) { + return "acute angle"; + } + if (angle === 90) { + return "right angle"; + } + if (angle < 180){ + return "obtuse angle"; + } + if (angle === 180){ + return "straight angle"; + } +if (angle < 360){ + return "reflex angle"; } +module.exports = getAngleType; + + + // TODO: Implement this function + // The line below allows us to load the getAngleType function into tests in other files. // This will be useful in the "rewrite tests with jest" step. -module.exports = getAngleType; + // This helper function is written to make our assertions easier to read. // If the actual output matches the target output, the test will pass @@ -35,3 +56,11 @@ function assertEquals(actualOutput, targetOutput) { // Example: Identify Right Angles const right = getAngleType(90); assertEquals(right, "Right angle"); + + // Test +assertEquals(getAngleType(45), "Acute angle"); +assertEquals(getAngleType(90), "Right angle"); +assertEquals(getAngleType(120), "Obtuse angle"); +assertEquals(getAngleType(180), "Straight angle"); +assertEquals(getAngleType(270), "Reflex angle"); +assertEquals(getAngleType(390), "Invalid angle"); From 95a7938a8bda1d1761c7d65f64551683b3512bcd Mon Sep 17 00:00:00 2001 From: Seti Mussa Date: Sat, 21 Mar 2026 13:56:19 +0000 Subject: [PATCH 2/4] Done the Implement and rewrite --- .../implement/1-get-angle-type.js | 38 +++++++++---------- .../implement/2-is-proper-fraction.js | 24 +++++++++--- .../implement/3-get-card-value.js | 26 +++++++++++-- 3 files changed, 60 insertions(+), 28 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 a01610010c..55b459f74e 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 @@ -14,35 +14,33 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { - function getAngleType(angle) { - if (angle <= 0 || angle >= 360) - } + if (angle <= 0 || angle >= 360) { + return "Invalid angle"; + } if (angle < 90) { - return "acute angle"; + return "Acute angle"; + } + if (angle === 90) { + return "Right angle"; + } + if (angle < 180) { + return "Obtuse angle"; + } + if (angle === 180) { + return "Straight angle"; + } + if (angle < 360) { + return "Reflex angle"; } - if (angle === 90) { - return "right angle"; - } - if (angle < 180){ - return "obtuse angle"; - } - if (angle === 180){ - return "straight angle"; - } -if (angle < 360){ - return "reflex angle"; } module.exports = getAngleType; - - // TODO: Implement this function - +// TODO: Implement this function // The line below allows us to load the getAngleType function into tests in other files. // This will be useful in the "rewrite tests with jest" step. - // This helper function is written to make our assertions easier to read. // If the actual output matches the target output, the test will pass function assertEquals(actualOutput, targetOutput) { @@ -57,7 +55,7 @@ function assertEquals(actualOutput, targetOutput) { const right = getAngleType(90); assertEquals(right, "Right angle"); - // Test +// Test assertEquals(getAngleType(45), "Acute angle"); assertEquals(getAngleType(90), "Right angle"); assertEquals(getAngleType(120), "Obtuse angle"); 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 970cb9b641..d93d7b611f 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 @@ -11,23 +11,37 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + return numerator < denominator; } // The line below allows us to load the isProperFraction function into tests in other files. // This will be useful in the "rewrite tests with jest" step. -module.exports = isProperFraction; -// Here's our helper again +// Here's our hel per again function assertEquals(actualOutput, targetOutput) { console.assert( actualOutput === targetOutput, `Expected ${actualOutput} to equal ${targetOutput}` ); } +module.exports = isProperFraction; // TODO: Write tests to cover all cases. // What combinations of numerators and denominators should you test? -// Example: 1/2 is a proper fraction -assertEquals(isProperFraction(1, 2), true); +//Test +// Proper fraction +assertEquals(isProperFraction(3, 5), true); +assertEquals(isProperFraction(4, 8), true); +assertEquals(isProperFraction(-1, 2), true); +assertEquals(isProperFraction(-1, -2), true); +assertEquals(isProperFraction(1, -2), true); + +//Not +assertEquals(isProperFraction(9, 7), false); +assertEquals(isProperFraction(13, 11), false); +assertEquals(isProperFraction(19, 10), false); +assertEquals(isProperFraction(17, 3), false); + +//Edge case +assertEquals(isProperFraction(0, 5), 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 c7559e787e..9aaf5241e0 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 @@ -22,12 +22,27 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + const rank = card.slice(0, -1); + const suit = card.slice(-1); + +const vaildSuits = ["♠", "♥", "♦", "♣"]; + const vailRanks = ["A","2","3","4","5","6","7","8","9","10","J","Q","k"]; + + if (!vaildSuits.includes(suit) || !validRanks.inculdes(rank)){ + throw new Error("Invaild card"); + } + if (rank === "A") return 11; + if (rank === "J" || rank === "Q" || rank === "K") return 10; + + return Number(rank); } +module.exports = getCardValue; + + // 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; + // Helper functions to make our assertions easier to read. function assertEquals(actualOutput, targetOutput) { @@ -40,13 +55,18 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. // Examples: assertEquals(getCardValue("9♠"), 9); +//Test +assertEquals(getCardvalue("A♠"), 11); +assertEquals(getCardEqual("J♣), 10); +assertEquals(getCardequal("10♥"), 10); // Handling invalid cards try { getCardValue("invalid"); + // This line will not be reached if an error is thrown as expected console.error("Error was not thrown for invalid card"); } catch (e) {} -// What other invalid card cases can you think of? +// What other invalid card cases can you think of? \ No newline at end of file From c94ac7b8dcf82d66c84ab4ac1f116ca98dfab97c Mon Sep 17 00:00:00 2001 From: Seti Mussa Date: Sat, 21 Mar 2026 14:15:06 +0000 Subject: [PATCH 3/4] fixed error --- .../implement/3-get-card-value.js | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 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 9aaf5241e0..f6b0b1e5c1 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 @@ -25,11 +25,25 @@ function getCardValue(card) { const rank = card.slice(0, -1); const suit = card.slice(-1); -const vaildSuits = ["♠", "♥", "♦", "♣"]; - const vailRanks = ["A","2","3","4","5","6","7","8","9","10","J","Q","k"]; - - if (!vaildSuits.includes(suit) || !validRanks.inculdes(rank)){ - throw new Error("Invaild card"); + const vaildSuits = ["♠", "♥", "♦", "♣"]; + const vailRanks = [ + "A", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "J", + "Q", + "K", + ]; + + if (!vaildSuits.includes(suit) || !vailRanks.includes(rank)) { + throw new Error("Invalid card"); } if (rank === "A") return 11; if (rank === "J" || rank === "Q" || rank === "K") return 10; @@ -39,11 +53,9 @@ const vaildSuits = ["♠", "♥", "♦", "♣"]; module.exports = getCardValue; - // 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. - // Helper functions to make our assertions easier to read. function assertEquals(actualOutput, targetOutput) { console.assert( @@ -56,17 +68,16 @@ function assertEquals(actualOutput, targetOutput) { // Examples: assertEquals(getCardValue("9♠"), 9); //Test -assertEquals(getCardvalue("A♠"), 11); -assertEquals(getCardEqual("J♣), 10); -assertEquals(getCardequal("10♥"), 10); +assertEquals(getCardValue("A♠"), 11); +assertEquals(getCardValue("J♣"), 10); +assertEquals(getCardValue("10♥"), 10); // Handling invalid cards try { getCardValue("invalid"); - // This line will not be reached if an error is thrown as expected console.error("Error was not thrown for invalid card"); } catch (e) {} -// What other invalid card cases can you think of? \ No newline at end of file +// What other invalid card cases can you think of? From 69bef1b39848af4a5b77ce035ea3013049fe9ee4 Mon Sep 17 00:00:00 2001 From: Seti Mussa Date: Sat, 21 Mar 2026 14:25:09 +0000 Subject: [PATCH 4/4] correct an issue --- .../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 f6b0b1e5c1..f3bb45a9aa 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 @@ -51,7 +51,7 @@ function getCardValue(card) { return Number(rank); } -module.exports = getCardValue; +export default getCardValue; // 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.