changed after feedback

Author: libanj0161

Sprint-3/2-practice-tdd/get-ordinal-number.js

@@ -1,4 +1,5 @@
 function getOrdinalNumber(num) {
+<<<<<<< Updated upstream
   const lastdigit = num % 10;
   if (lastdigit === 1) {
     return `${num}st`;
@@ -13,6 +14,20 @@ function getOrdinalNumber(num) {
   } else {
     return `${num}th`;
   }
+=======
+  const lastDigit = num % 10;
+  const lastTwoDigits = num % 100;
+
+  if (lastTwoDigits >= 11 && lastTwoDigits <= 13) {
+    return num + "th";
+  }
+
+  if (lastDigit === 1) return num + "st";
+  if (lastDigit === 2) return num + "nd";
+  if (lastDigit === 3) return num + "rd";
+
+  return num + "th";
+>>>>>>> Stashed changes
 }
 
 module.exports = getOrdinalNumber;

Sprint-3/2-practice-tdd/get-ordinal-number.test.js

@@ -19,14 +19,53 @@ test("should append 'st' for numbers ending with 1, except those ending with 11"
   expect(getOrdinalNumber(131)).toEqual("131st");
 });
 
+<<<<<<< Updated upstream
 test("should append 'nd' for numbers ending with 2", () => {
+=======
+// Case 2: Numbers ending with 2 (but not 12)
+// When the number ends with 2, except those ending with 12,
+// Then the function should return a string by appending "nd" to the number
+test("Numbers ending with 2 (but not 12) should return 'nd'", () => {
+>>>>>>> Stashed changes
   expect(getOrdinalNumber(2)).toEqual("2nd");
   expect(getOrdinalNumber(22)).toEqual("22nd");
   expect(getOrdinalNumber(132)).toEqual("132nd");
 });
 
+<<<<<<< Updated upstream
 test("should append 'rd' for numbers ending with 3, except those ending with 13", () => {
   expect(getOrdinalNumber(3)).toEqual("3rd");
   expect(getOrdinalNumber(33)).toEqual("33rd");
   expect(getOrdinalNumber(133)).toEqual("133rd");
 });
+=======
+// Case 3: Numbers ending with 3 (but not 13)
+// When the number ends with 3, except those ending with 13,
+// Then the function should return a string by appending "rd" to the number
+test("Numbers ending with 3 (but not 13) should return 'rd'", () => {
+  expect(getOrdinalNumber(3)).toEqual("3rd");
+  expect(getOrdinalNumber(23)).toEqual("23rd");
+  expect(getOrdinalNumber(133)).toEqual("133rd");
+});
+
+// Case 4: Numbers ending with 0,4-9
+// When the number ends with 0, 4, 5, 6, 7, 8, or 9,
+// Then the function should return a string by appending "th" to the number
+test("Numbers ending with 0,4-9 should return 'th'", () => {
+  expect(getOrdinalNumber(4)).toEqual("4th");
+  expect(getOrdinalNumber(10)).toEqual("10th");
+  expect(getOrdinalNumber(25)).toEqual("25th");
+});
+
+// Case 5: Numbers ending with 11, 12, or 13
+// When the number ends with 11, 12, or 13,
+// Then the function should return a string by appending "th" to the number
+test("Numbers ending with 11,12,13 should return 'th'", () => {
+  expect(getOrdinalNumber(11)).toEqual("11th");
+  expect(getOrdinalNumber(12)).toEqual("12th");
+  expect(getOrdinalNumber(13)).toEqual("13th");
+  expect(getOrdinalNumber(111)).toEqual("111th");
+  expect(getOrdinalNumber(112)).toEqual("112th");
+  expect(getOrdinalNumber(113)).toEqual("113th");
+});
+>>>>>>> Stashed changes

Sprint-3/2-practice-tdd/repeat-str.js

@@ -1,8 +1,29 @@
 function repeatStr(str, count) {
   if (count < 0) {
+<<<<<<< Updated upstream
     throw new Error("invalid count");
   }
   return str.repeat(count);
+=======
+    throw new Error("Count cannot be negative");
+  }
+
+  if (count === 0) {
+    return "";
+  }
+
+  if (count === 1) {
+    return str;
+  }
+
+  let result = "";
+
+  for (let i = 0; i < count; i++) {
+    result += str;
+  }
+
+  return result;
+>>>>>>> Stashed changes
 }
 // call the repeat function on the string and pass in count.
 module.exports = repeatStr;

Sprint-3/2-practice-tdd/repeat-str.test.js

@@ -20,6 +20,9 @@ test("should repeat the string count times", () => {
 // Given a target string `str` and a `count` equal to 1,
 // When the repeatStr function is called with these inputs,
 // Then it should return the original `str` without repetition.
+test("given a string and count of 1, returns the original string", () => {
+  expect(repeatStr("hello", 1)).toBe("hello");
+});
 
 test("should repeat the string count times", () => {
   const str = "hello";
@@ -32,6 +35,9 @@ test("should repeat the string count times", () => {
 // Given a target string `str` and a `count` equal to 0,
 // When the repeatStr function is called with these inputs,
 // Then it should return an empty string.
+test("given a string and count of 0, returns an empty string", () => {
+  expect(repeatStr("hello", 0)).toBe("");
+});
 
 test("should repeat the string count times", () => {
   const str = "hello";
@@ -44,10 +50,15 @@ test("should repeat the string count times", () => {
 // Given a target string `str` and a negative integer `count`,
 // When the repeatStr function is called with these inputs,
 // Then it should throw an error, as negative counts are not valid.
+<<<<<<< Updated upstream
 
 test("should repeat the string count times", () => {
   const str = "hello";
   const count = -2;
   // const repeatedStr = repeatStr(str, count);
   expect(() => repeatStr(str, count)).toThrow("invalid count");
+=======
+test("given a string and a negative count, throws an error", () => {
+  expect(() => repeatStr("hello", -1)).toThrow();
+>>>>>>> Stashed changes
 });