From 1eb4e07fe265f7ef02dd224503f81371dceebece Mon Sep 17 00:00:00 2001 From: Abayie Date: Sat, 21 Jun 2025 07:26:24 +0100 Subject: [PATCH 01/11] prep --- prep/example.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 prep/example.js diff --git a/prep/example.js b/prep/example.js new file mode 100644 index 000000000..f3bfd7449 --- /dev/null +++ b/prep/example.js @@ -0,0 +1,5 @@ +// function decimalTopercent(num){ +// let percent = num * 100; +// return percent +// } +// console.log(decimalTopercent(0.5) + "%"); From bc143cef416bae1b5539f4a7f7d31147aefb236f Mon Sep 17 00:00:00 2001 From: Abayie Date: Sat, 21 Jun 2025 07:41:16 +0100 Subject: [PATCH 02/11] prep-files --- prep/example.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/prep/example.js b/prep/example.js index f3bfd7449..eddee5ebe 100644 --- a/prep/example.js +++ b/prep/example.js @@ -3,3 +3,12 @@ // return percent // } // console.log(decimalTopercent(0.5) + "%"); + +const decimalNumber = 0.5; + +function convertToPercentage() { + const percentage = `${decimalNumber * 100}%`; +} + +convertToPercentage(0.5); +console.log(percentage); \ No newline at end of file From 5cb7a479613203db1bbf200eed04aed40653d8b4 Mon Sep 17 00:00:00 2001 From: Abayie Date: Sat, 21 Jun 2025 08:02:03 +0100 Subject: [PATCH 03/11] functions --- prep/example.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/prep/example.js b/prep/example.js index eddee5ebe..5fb4293a2 100644 --- a/prep/example.js +++ b/prep/example.js @@ -4,11 +4,12 @@ // } // console.log(decimalTopercent(0.5) + "%"); -const decimalNumber = 0.5; - -function convertToPercentage() { +function convertToPercentage(decimalNumber) { const percentage = `${decimalNumber * 100}%`; + return percentage; } -convertToPercentage(0.5); -console.log(percentage); \ No newline at end of file +const result = convertToPercentage(0.5); +const result1 = convertToPercentage(0.231); +console.log(result); +console.log(result1); From 3e6cc95633b93c7de4fe3f5285c05b0924b73b94 Mon Sep 17 00:00:00 2001 From: Abayie Date: Sun, 23 Nov 2025 22:53:17 +0000 Subject: [PATCH 04/11] Implement 1 get angle type --- .../implement/1-get-angle-type.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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..79ae3a2f3 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 @@ -12,7 +12,19 @@ function getAngleType(angle) { return "Right 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. + // Then keep going for the other cases, one at a time. + if (angle < 90) { + return "Acute angle"; + } + if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } + if (angle === 180) { + return "Straight angle"; + } + if (angle > 180 && angle < 360) { + return "Reflex angle"; + } } // The line below allows us to load the getAngleType function into tests in other files. From 2c8b2094681f8a42be08452c62320cd7a316af58 Mon Sep 17 00:00:00 2001 From: Abayie Date: Sun, 23 Nov 2025 22:59:55 +0000 Subject: [PATCH 05/11] implement 1 get angle continued --- .../implement/1-get-angle-type.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 79ae3a2f3..6ffdf0e0c 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 @@ -63,13 +63,18 @@ 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/line"); // 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(270); +assertEquals(reflex, "Reflex angle"); \ No newline at end of file From c2f900d30c920bff2bf750469e6820ad2145d2dd Mon Sep 17 00:00:00 2001 From: Abayie Date: Sun, 23 Nov 2025 23:16:13 +0000 Subject: [PATCH 06/11] implement 2 is proper fraction --- .../implement/2-is-proper-fraction.js | 26 +++++++++++++++++-- 1 file changed, 24 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..8eee2d5d5 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,9 +8,10 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { + if (Math.abs(numerator) < Math.abs(denominator)) { return true; } + return false; } // The line below allows us to load the isProperFraction function into tests in other files. @@ -47,6 +48,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 +56,26 @@ 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? +// What other scenarios could you test for? Zero numerator => always proper +const zeroNumerator = isProperFraction(0, 10); +assertEquals(zeroNumerator, true); + +//Negarive denominator => use absoluet values +const negativeDenominator = isProperFraction(3, -5); +assertEquals(negativeDenominator, true); + +//Both negatives +const bothNegative = isProperFraction(-2, -3); +assertEquals(bothNegative, true); + +//fractions like 8/8 should be false +const improperEqual = isProperFraction(9, 9); +assertEquals(improperEqual, false); + +//zero denominator - maths says undefined so can return false or throw error +const zeroDenominator = isProperFraction(1, 0); +assertEquals(zeroDenominator, false); + From 0d56af283f671edb83c98bddd5cfec5f8834c38b Mon Sep 17 00:00:00 2001 From: Abayie Date: Sun, 23 Nov 2025 23:26:10 +0000 Subject: [PATCH 07/11] implement 3 get card value --- .../implement/3-get-card-value.js | 34 +++++++++++++++++-- 1 file changed, 32 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 266525d1b..a4e094211 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,9 +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) { - if (rank === "A") { - return 11; + const rank = card.slice(0, -1); //everything except the suit + if (rank === "A") return 11; + + if (["J", "Q", "K", "10"].includes(rank)) { + return 10; + } + + const num = Number(rank); + if (!isNaN(num) && num >= 2 && num <= 9) { + return num; } + throw new Error("Invalid card rank"); + } // The line below allows us to load the getCardValue function into tests in other files. @@ -40,11 +50,24 @@ 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 jack = getCardValue("J♣"); +assertEquals(jack, 10); + +const queen = getCardValue("Q♦"); +assertEquals(queen, 10); + +const king = getCardValue("K♥"); +assertEquals(king, 10); + +const ten = getCardValue("10♠"); +assertEquals(ten, 10); + // Handle Ace (A): // Given a card with a rank of "A", @@ -55,3 +78,10 @@ const fiveofHearts = getCardValue("5♥"); // 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." +try { + getCardValue("Z♠"); + console.assert(false, "Expected an error for invalid rank"); +} catch (e) { + assertEquals(e.message, "Invalid card rank"); +} + From ec3f79fb45de8bb358e10fb27215da7e24ae39c8 Mon Sep 17 00:00:00 2001 From: Abayie Date: Sun, 23 Nov 2025 23:31:38 +0000 Subject: [PATCH 08/11] rewrite tests with jest --- .../1-get-angle-type.test.js | 19 +++++++++++++++++++ 1 file changed, 19 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..d8476d0ab 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,34 @@ 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 (< 90°)", () => { + expect(getAngleType(30)).toEqual("Acute angle"); + expect(getAngleType(1)).toEqual("Acute angle"); + expect(getAngleType(89)).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 (90° < angle < 180°)", () => { + expect(getAngleType(120)).toEqual("Obtuse angle"); + expect(getAngleType(100)).toEqual("Obtuse angle"); + expect(getAngleType(179)).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 (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 angles (180° < angle < 360°)", () => { + expect(getAngleType(200)).toEqual("Reflex angle"); + expect(getAngleType(250)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); +}); \ No newline at end of file From 4d59d9699f905543160d188d8291647a6cb66d94 Mon Sep 17 00:00:00 2001 From: Abayie Date: Mon, 24 Nov 2025 18:46:48 +0000 Subject: [PATCH 09/11] removed prep folder --- prep/example.js | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 prep/example.js diff --git a/prep/example.js b/prep/example.js deleted file mode 100644 index 5fb4293a2..000000000 --- a/prep/example.js +++ /dev/null @@ -1,15 +0,0 @@ -// function decimalTopercent(num){ -// let percent = num * 100; -// return percent -// } -// console.log(decimalTopercent(0.5) + "%"); - -function convertToPercentage(decimalNumber) { - const percentage = `${decimalNumber * 100}%`; - return percentage; -} - -const result = convertToPercentage(0.5); -const result1 = convertToPercentage(0.231); -console.log(result); -console.log(result1); From 16959cf0357046e83ffa8a7914b5e27f115ee72c Mon Sep 17 00:00:00 2001 From: Abayie Date: Mon, 24 Nov 2025 22:51:13 +0000 Subject: [PATCH 10/11] added two test cases for implement --- .../2-is-proper-fraction.test.js | 14 ++++++-- .../3-get-card-value.test.js | 34 ++++++++++++++++--- 2 files changed, 41 insertions(+), 7 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..cb9de78ec 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 @@ -1,5 +1,3 @@ -// This statement loads the isProperFraction function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. const isProperFraction = require("../implement/2-is-proper-fraction"); test("should return true for a proper fraction", () => { @@ -7,7 +5,19 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for improper fractions (numerator >= denominator)", () => { + expect(isProperFraction(5, 2)).toEqual(false); // 5/2 + expect(isProperFraction(7, 3)).toEqual(false); // 7/3 +}); // Case 3: Identify Negative Fractions: +test("should correctly handle negative fractions using absolute value of numerator", () => { + expect(isProperFraction(-4, 7)).toEqual(true); // |−4| < 7 → proper + expect(isProperFraction(-5, 2)).toEqual(false); // |−5| >= 2 → improper +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false when numerator equals denominator", () => { + expect(isProperFraction(3, 3)).toEqual(false); // 3/3 + expect(isProperFraction(-6, -6)).toEqual(false); // -6/-6 +}); 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..77f724b05 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 @@ -1,13 +1,37 @@ // This statement loads the getCardValue function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. const getCardValue = require("../implement/3-get-card-value"); +// Case 1: Ace test("should return 11 for Ace of Spades", () => { const aceofSpades = getCardValue("A♠"); expect(aceofSpades).toEqual(11); }); -// Case 2: Handle Number Cards (2-10): -// Case 3: Handle Face Cards (J, Q, K): -// Case 4: Handle Ace (A): -// Case 5: Handle Invalid Cards: +// Case 2: Handle Number Cards (2–10) +test("should return numeric value for number cards 2–10", () => { + expect(getCardValue("2♥")).toEqual(2); + expect(getCardValue("7♦")).toEqual(7); + expect(getCardValue("9♣")).toEqual(9); + expect(getCardValue("10♠")).toEqual(10); +}); + +// Case 3: Handle Face Cards (J, Q, K) +test("should return 10 for face cards J, Q, K", () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("Q♦")).toEqual(10); + expect(getCardValue("K♥")).toEqual(10); +}); + +// Case 4: Handle Ace (A) +test("should return 11 for any Ace", () => { + expect(getCardValue("A♣")).toEqual(11); + expect(getCardValue("A♦")).toEqual(11); + expect(getCardValue("A♥")).toEqual(11); +}); + +// Case 5: Handle Invalid Cards +test("should throw an error for invalid card rank", () => { + expect(() => getCardValue("Z♠")).toThrow("Invalid card rank"); + expect(() => getCardValue("1♦")).toThrow("Invalid card rank"); + expect(() => getCardValue("XY")).toThrow("Invalid card rank"); +}); From c6cbfe883a2a3509dde9659d442086f63714cf4d Mon Sep 17 00:00:00 2001 From: Abayie Date: Tue, 25 Nov 2025 23:23:12 +0000 Subject: [PATCH 11/11] implementation for coercision abuse, whitepaces etc --- .../implement/3-get-card-value.js | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 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 a4e094211..3099b38bd 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,21 +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); //everything except the suit - if (rank === "A") return 11; + const rank = card.slice(0, -1); - if (["J", "Q", "K", "10"].includes(rank)) { - return 10; + // Numeric cards 2–10 + if (["2", "3", "4", "5", "6", "7", "8", "9", "10"].includes(rank)) { + return Number(rank); } - const num = Number(rank); - if (!isNaN(num) && num >= 2 && num <= 9) { - return num; - } + // Face cards + if (["J", "Q", "K"].includes(rank)) return 10; + + // Ace + if (rank === "A") return 11; + throw new Error("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;