From 5dc945203e40284d89047030ac420372cdc3de28 Mon Sep 17 00:00:00 2001 From: Jennet Turkkan <67760504+jennethydyrova@users.noreply.github.com> Date: Fri, 31 Oct 2025 11:36:45 +0000 Subject: [PATCH 01/10] Rename repeat function to make its purpose more clear (#826) --- Sprint-3/2-practice-tdd/README.md | 2 +- Sprint-3/2-practice-tdd/repeat-str.js | 5 +++++ .../{repeat.test.js => repeat-str.test.js} | 16 ++++++++-------- Sprint-3/2-practice-tdd/repeat.js | 5 ----- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 Sprint-3/2-practice-tdd/repeat-str.js rename Sprint-3/2-practice-tdd/{repeat.test.js => repeat-str.test.js} (70%) delete mode 100644 Sprint-3/2-practice-tdd/repeat.js diff --git a/Sprint-3/2-practice-tdd/README.md b/Sprint-3/2-practice-tdd/README.md index ff28c131c..f7d82fe43 100644 --- a/Sprint-3/2-practice-tdd/README.md +++ b/Sprint-3/2-practice-tdd/README.md @@ -9,5 +9,5 @@ Write the tests _before_ the code that will make them pass. Recommended order: 1. `count.test.js` -1. `repeat.test.js` +1. `repeat-str.test.js` 1. `get-ordinal-number.test.js` diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js new file mode 100644 index 000000000..3838c7b00 --- /dev/null +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -0,0 +1,5 @@ +function repeatStr() { + return "hellohellohello"; +} + +module.exports = repeatStr; diff --git a/Sprint-3/2-practice-tdd/repeat.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js similarity index 70% rename from Sprint-3/2-practice-tdd/repeat.test.js rename to Sprint-3/2-practice-tdd/repeat-str.test.js index 34097b09c..fc59d019e 100644 --- a/Sprint-3/2-practice-tdd/repeat.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -1,32 +1,32 @@ -// Implement a function repeat -const repeat = require("./repeat"); +// Implement a function repeatStr +const repeatStr = require("./repeat-str"); // Given a target string str and a positive integer count, -// When the repeat function is called with these inputs, +// When the repeatStr function is called with these inputs, // Then it should: // case: repeat String: // Given a target string str and a positive integer count, -// When the repeat function is called with these inputs, +// When the repeatStr function is called with these inputs, // Then it should repeat the str count times and return a new string containing the repeated str values. test("should repeat the string count times", () => { const str = "hello"; const count = 3; - const repeatedStr = repeat(str, count); + const repeatedStr = repeatStr(str, count); expect(repeatedStr).toEqual("hellohellohello"); }); // case: handle Count of 1: // Given a target string str and a count equal to 1, -// When the repeat function is called with these inputs, +// When the repeatStr function is called with these inputs, // Then it should return the original str without repetition, ensuring that a count of 1 results in no repetition. // case: Handle Count of 0: // Given a target string str and a count equal to 0, -// When the repeat function is called with these inputs, +// When the repeatStr function is called with these inputs, // Then it should return an empty string, ensuring that a count of 0 results in an empty output. // case: Negative Count: // Given a target string str and a negative integer count, -// When the repeat function is called with these inputs, +// When the repeatStr function is called with these inputs, // Then it should throw an error or return an appropriate error message, as negative counts are not valid. diff --git a/Sprint-3/2-practice-tdd/repeat.js b/Sprint-3/2-practice-tdd/repeat.js deleted file mode 100644 index 00e60d7f3..000000000 --- a/Sprint-3/2-practice-tdd/repeat.js +++ /dev/null @@ -1,5 +0,0 @@ -function repeat() { - return "hellohellohello"; -} - -module.exports = repeat; From 31f50ad84d12460cd87a1ac20948e02b686390f3 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Thu, 6 Nov 2025 15:54:22 +0000 Subject: [PATCH 02/10] count.js updated --- Sprint-3/2-practice-tdd/count.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..d22559ff9 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -3,3 +3,19 @@ function countChar(stringOfCharacters, findCharacter) { } module.exports = countChar; + +const countChar = require('../countChar'); + +describe('countChar()', () => { + test('always returns 5', () => { + expect(countChar('anything', 'a')).toBe(5); + }); + + test('still returns 5 with empty string', () => { + expect(countChar('', 'z')).toBe(5); + }); + + test('still returns 5 with special characters', () => { + expect(countChar('!!!', '!')).toBe(5); + }); +}); From a61f9b1abe9dea5aac3ac4507f95948c6116465a Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Thu, 6 Nov 2025 16:45:34 +0000 Subject: [PATCH 03/10] updated pr template --- Sprint-3/2-practice-tdd/count.test.js | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 42baf4b4b..a94c93701 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -16,6 +16,36 @@ test("should count multiple occurrences of a character", () => { const count = countChar(str, char); expect(count).toEqual(5); }); +test("should return 0 when the character is not found", () => { + const str = "hello"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Scenario: Case Sensitivity +// It should be case-sensitive, meaning 'A' != 'a'. +test("should be case-sensitive when counting characters", () => { + const str = "Banana"; + expect(countChar(str, "a")).toEqual(3); + expect(countChar(str, "A")).toEqual(0); +}); + +// Scenario: Empty String +// It should return 0 when the input string is empty. +test("should return 0 when the input string is empty", () => { + const str = ""; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Scenario: Special Characters +// It should correctly count spaces and punctuation. +test("should count special characters like spaces or punctuation", () => { + expect(countChar("a b a b", " ")).toEqual(2); + expect(countChar("wow!!!", "!")).toEqual(3); +}); // Scenario: No Occurrences // Given the input string str, From 2a422f5a25e64669d2d89d65cb0402fb758df15a Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Thu, 6 Nov 2025 16:47:59 +0000 Subject: [PATCH 04/10] updated PR template --- Sprint-3/2-practice-tdd/count.test.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index a94c93701..1bf611fc3 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -1,5 +1,16 @@ // implement a function countChar that counts the number of times a character occurs in a string const countChar = require("./count"); + +function countChar(stringOfCharacters, findCharacter) { + let count = 0; + for (let char of stringOfCharacters) { + if (char === findCharacter) count++; + } + return count; +} + +module.exports = countChar; + // Given a string str and a single character char to search for, // When the countChar function is called with these inputs, // Then it should: From 04f5a7f8ee56748a989b8717d1bbc2c55f362c3b Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Thu, 6 Nov 2025 16:53:18 +0000 Subject: [PATCH 05/10] get ordinal numbers updated template --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 58 ++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db1..318f08619 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,61 @@ + function getOrdinalNumber(num) { - return "1st"; + const remainder10 = num % 10; + const remainder100 = num % 100; + + if (remainder100 >= 11 && remainder100 <= 13) { + return `${num}th`; + } + + switch (remainder10) { + case 1: + return `${num}st`; + case 2: + return `${num}nd`; + case 3: + return `${num}rd`; + default: + return `${num}th`; + } } module.exports = getOrdinalNumber; + + +const getOrdinalNumber = require("./getOrdinalNumber"); + +describe("getOrdinalNumber()", () => { + test("should return '1st' for 1", () => { + expect(getOrdinalNumber(1)).toBe("1st"); + }); + + test("should return '2nd' for 2", () => { + expect(getOrdinalNumber(2)).toBe("2nd"); + }); + + test("should return '3rd' for 3", () => { + expect(getOrdinalNumber(3)).toBe("3rd"); + }); + + test("should return '4th' for 4", () => { + expect(getOrdinalNumber(4)).toBe("4th"); + }); + + test("should return '11th', '12th', '13th' for special cases", () => { + expect(getOrdinalNumber(11)).toBe("11th"); + expect(getOrdinalNumber(12)).toBe("12th"); + expect(getOrdinalNumber(13)).toBe("13th"); + }); + + test("should return correct suffixes for 21, 22, 23", () => { + expect(getOrdinalNumber(21)).toBe("21st"); + expect(getOrdinalNumber(22)).toBe("22nd"); + expect(getOrdinalNumber(23)).toBe("23rd"); + }); + + test("should return '111th' for numbers ending with 11, 12, 13 even if larger", () => { + expect(getOrdinalNumber(111)).toBe("111th"); + expect(getOrdinalNumber(112)).toBe("112th"); + expect(getOrdinalNumber(113)).toBe("113th"); + }); +}); From 7e9160de067f75480b16378d9e1e7294d945079b Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Thu, 6 Nov 2025 17:01:07 +0000 Subject: [PATCH 06/10] ordinal numbers updated PR template --- Sprint-3/2-practice-tdd/get-ordinal-number.test.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js index dfe4b6091..b3d6419f7 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -1,4 +1,11 @@ const getOrdinalNumber = require("./get-ordinal-number"); + +function getOrdinalNumber(num) { + return "1st"; +} + +module.exports = getOrdinalNumber; + // In this week's prep, we started implementing getOrdinalNumber // continue testing and implementing getOrdinalNumber for additional cases From 6c17f89d394e39dc8b106af75a2a7dbbec8b92c8 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Thu, 6 Nov 2025 17:05:54 +0000 Subject: [PATCH 07/10] repeat.js updated template --- Sprint-3/2-practice-tdd/repeat.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sprint-3/2-practice-tdd/repeat.js b/Sprint-3/2-practice-tdd/repeat.js index 00e60d7f3..125840b92 100644 --- a/Sprint-3/2-practice-tdd/repeat.js +++ b/Sprint-3/2-practice-tdd/repeat.js @@ -3,3 +3,7 @@ function repeat() { } module.exports = repeat; + +test("should repeat the given word three times", () => { + expect(repeat("hi", 3)).toBe("hihihi"); +}); From 94de70c2ac1de336a9cc76864e944dbe7ce19f48 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Thu, 6 Nov 2025 17:10:16 +0000 Subject: [PATCH 08/10] repeat.test.js updated template --- Sprint-3/2-practice-tdd/repeat.js | 2 ++ Sprint-3/2-practice-tdd/repeat.test.js | 40 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/Sprint-3/2-practice-tdd/repeat.js b/Sprint-3/2-practice-tdd/repeat.js index 125840b92..6aea34899 100644 --- a/Sprint-3/2-practice-tdd/repeat.js +++ b/Sprint-3/2-practice-tdd/repeat.js @@ -1,3 +1,5 @@ +const repeat = require("./repeat"); + function repeat() { return "hellohellohello"; } diff --git a/Sprint-3/2-practice-tdd/repeat.test.js b/Sprint-3/2-practice-tdd/repeat.test.js index 34097b09c..6bf18ed73 100644 --- a/Sprint-3/2-practice-tdd/repeat.test.js +++ b/Sprint-3/2-practice-tdd/repeat.test.js @@ -3,6 +3,14 @@ const repeat = require("./repeat"); // Given a target string str and a positive integer count, // When the repeat function is called with these inputs, // Then it should: +function repeat(str, count) { + if (count < 0) { + throw new Error("Count must be a non-negative integer"); + } + return str.repeat(count); +} + +module.exports = repeat; // case: repeat String: // Given a target string str and a positive integer count, @@ -30,3 +38,35 @@ test("should repeat the string count times", () => { // Given a target string str and a negative integer count, // When the repeat function is called with these inputs, // Then it should throw an error or return an appropriate error message, as negative counts are not valid. +const repeat = require("./repeat"); + +// Case 1: Repeat string multiple times +test("should repeat the string count times", () => { + const str = "hello"; + const count = 3; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("hellohellohello"); +}); + +// Case 2: Handle count of 1 +test("should return the original string when count is 1", () => { + const str = "world"; + const count = 1; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("world"); +}); + +// Case 3: Handle count of 0 +test("should return an empty string when count is 0", () => { + const str = "test"; + const count = 0; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual(""); +}); + +// Case 4: Negative count +test("should throw an error when count is negative", () => { + const str = "oops"; + const count = -2; + expect(() => repeat(str, count)).toThrow("Count must be a non-negative integer"); +}); From 44ce5680649e9a12e69620cbf3836617cc547575 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Sat, 8 Nov 2025 14:27:18 +0000 Subject: [PATCH 09/10] adjusted Pr template --- Sprint-3/2-practice-tdd/count.js | 1 + Sprint-3/3-stretch/card-validator.md | 61 ++++++++++++++++++++++++ Sprint-3/3-stretch/password-validator.js | 38 ++++++++++++++- 3 files changed, 99 insertions(+), 1 deletion(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index d22559ff9..8d794c34a 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -19,3 +19,4 @@ describe('countChar()', () => { expect(countChar('!!!', '!')).toBe(5); }); }); +//this is the end. diff --git a/Sprint-3/3-stretch/card-validator.md b/Sprint-3/3-stretch/card-validator.md index e39c6ace6..96336b244 100644 --- a/Sprint-3/3-stretch/card-validator.md +++ b/Sprint-3/3-stretch/card-validator.md @@ -33,3 +33,64 @@ These are the requirements your project needs to fulfill: - Return a boolean from the function to indicate whether the credit card number is valid. Good luck! + +function validateCreditCard(number) { + // Convert input to a string so we can check characters easily + const numStr = String(number); + + // Rule 1: Must be 16 digits, all numbers + if (!/^\d{16}$/.test(numStr)) { + return false; + } + + // Rule 2: Must contain at least two different digits + const uniqueDigits = new Set(numStr); + if (uniqueDigits.size < 2) { + return false; + } + + // Rule 3: The last digit must be even + const lastDigit = parseInt(numStr[numStr.length - 1]); + if (lastDigit % 2 !== 0) { + return false; + } + + // Rule 4: The sum of all digits must be greater than 16 + const sum = numStr + .split("") + .map(Number) + .reduce((a, b) => a + b, 0); + + if (sum <= 16) { + return false; + } + + // If all checks pass, return true ✅ + return true; +} + +module.exports = validateCreditCard; + +const validateCreditCard = require("./validateCreditCard"); + +test("valid credit card numbers should return true", () => { + expect(validateCreditCard("9999777788880000")).toBe(true); + expect(validateCreditCard("6666666666661666")).toBe(true); +}); + +test("invalid cards with letters should return false", () => { + expect(validateCreditCard("a92332119c011112")).toBe(false); +}); + +test("invalid cards with all same digits should return false", () => { + expect(validateCreditCard("4444444444444444")).toBe(false); +}); + +test("invalid cards with sum less than 16 should return false", () => { + expect(validateCreditCard("1111111111111110")).toBe(false); +}); + +test("invalid cards with odd final digit should return false", () => { + expect(validateCreditCard("6666666666666661")).toBe(false); +}); + diff --git a/Sprint-3/3-stretch/password-validator.js b/Sprint-3/3-stretch/password-validator.js index b55d527db..dcef0bdf7 100644 --- a/Sprint-3/3-stretch/password-validator.js +++ b/Sprint-3/3-stretch/password-validator.js @@ -3,4 +3,40 @@ function passwordValidator(password) { } -module.exports = passwordValidator; \ No newline at end of file +module.exports = passwordValidator; +function validateCreditCard(number) { + // Convert input to a string so we can check characters easily + const numStr = String(number); + + // Rule 1: Must be 16 digits, all numbers + if (!/^\d{16}$/.test(numStr)) { + return false; + } + + // Rule 2: Must contain at least two different digits + const uniqueDigits = new Set(numStr); + if (uniqueDigits.size < 2) { + return false; + } + + // Rule 3: The last digit must be even + const lastDigit = parseInt(numStr[numStr.length - 1]); + if (lastDigit % 2 !== 0) { + return false; + } + + // Rule 4: The sum of all digits must be greater than 16 + const sum = numStr + .split("") + .map(Number) + .reduce((a, b) => a + b, 0); + + if (sum <= 16) { + return false; + } + + // If all checks pass, return true ✅ + return true; +} + +module.exports = validateCreditCard; From 8eaf08cc6cf9fe0d4e6f30d3e8363c5b1f8f9be3 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Sat, 8 Nov 2025 14:30:07 +0000 Subject: [PATCH 10/10] Added comment --- Sprint-3/2-practice-tdd/count.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 8d794c34a..90689ddca 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -20,3 +20,4 @@ describe('countChar()', () => { }); }); //this is the end. +// Last line \ No newline at end of file