improve variable names and card logic, add tests

Author: Elisabeth-Matulian

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

@@ -11,9 +11,14 @@
 // execute the code to ensure all tests pass.
 
 function isProperFraction(numerator, denominator) {
-  return Math.abs(numerator) < Math.abs(denominator)
+  if (denominator === 0) {
+    return false;
+  }
+  else {
+    return Math.abs(numerator) < Math.abs(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;
@@ -37,4 +42,7 @@ assertEquals(isProperFraction(-1, -2), true);
 assertEquals(isProperFraction(-2, -1), false);
 assertEquals(isProperFraction(-2, 5), true);
 assertEquals(isProperFraction(5, -2), false);
-assertEquals(isProperFraction(5, 5), false);
+assertEquals(isProperFraction(5, 5), false);
+assertEquals(isProperFraction(5, 0), false);
+assertEquals(isProperFraction(-2, 0), false);
+``

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

@@ -23,7 +23,8 @@
 
 function getCardValue(card) {
   const cardNum = card.slice(0, -1)
-  if (cardNum === "A") { return 11}
+  const cardSuit = card.slice(-1)
+  if (cardNum === "A" && "♠♥♦♣".includes(cardSuit)) { return 11}
   else if (["J", "Q", "K"].includes(cardNum)) { return 10}
   else if (Number(cardNum) >= 2 && Number(cardNum) <= 10) {return Number(cardNum)}
   else throw new Error("Invalid card");
@@ -67,4 +68,11 @@ try {
   // This line will not be reached if an error is thrown as expected
   console.error("Error was not thrown for invalid card");
 } catch (e) {}
+
+try {
+  getCardValue("AX");
+
+  // 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?

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js

@@ -5,30 +5,36 @@ const isProperFraction = require("../implement/2-is-proper-fraction");
 // TODO: Write tests in Jest syntax to cover all combinations of positives, negatives, zeros, and other categories.
 
 // Special case: numerator is zero
-test(`should return false when denominator is zero`, () => {
+test(`should return false when denominator is 0`, () => {
   expect(isProperFraction(1, 0)).toEqual(false);
 });
-test(`1/2`, () => {
+test(`should return true when numerator is less than denominator`, () => {
   expect(isProperFraction(1, 2)).toEqual(true);
 });
-test(`7/1`, () => {
+test(`should return false when numerator is greater than denominator`, () => {
   expect(isProperFraction(7, 1)).toEqual(false);
 });
-test(`0/5`, () => {
+test(`should return true when numerator is 0`, () => {
   expect(isProperFraction(0, 5)).toEqual(true);
 });
-test(`-1/-2`, () => {
+test(`should return true when numerator and denominator are negative`, () => {
   expect(isProperFraction(-1, -2)).toEqual(true);
 });
-test(`-2/-1`, () => {
+test(`should return false when numerator and denominator are negative and numerator is greater than denominator`, () => {
   expect(isProperFraction(-2, -1)).toEqual(false);
 });
-test(`-2/5`, () => {
+test(`should return true when numerator is negative and denominator is positive`, () => {
   expect(isProperFraction(-2, 5)).toEqual(true);
 });
-test(`5/-2`, () => {
+test(`should return false when numerator is positive and denominator is negative`, () => {
   expect(isProperFraction(5, -2)).toEqual(false);
 });
-test(`5/5`, () => {
+test(`should return false when numerator equals denominator`, () => {
   expect(isProperFraction(5, 5)).toEqual(false);
 });
+test(`should return false when denominator is 0`, () => {
+  expect(isProperFraction(5, 0)).toEqual(false);
+});
+test(`should return false when denominator is 0`, () => {
+  expect(isProperFraction(-2, 0)).toEqual(false);
+});

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js

@@ -26,6 +26,9 @@ test(`Should return Error when given an ♦Q`, () => {
 test(`Should return Error when given an 11♦`, () => {
   expect(function() {getCardValue("11♦")}).toThrow("Invalid card");
 });
+test(`Should return Error when given an AX`, () => {
+  expect(function() {getCardValue("11♦")}).toThrow("Invalid card");
+});
 
 
 // Suggestion: Group the remaining test data into these categories: