Skip to content

Commit 0b7c108

Browse files
committed
refactoring the isProperFraction task
1 parent 4d1bf8c commit 0b7c108

2 files changed

Lines changed: 18 additions & 23 deletions

File tree

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@ function isProperFraction(numerator, denominator) {
1414
// TODO: Implement this function
1515
numerator = Math.abs(numerator);
1616
denominator = Math.abs(denominator);
17-
if (numerator<denominator)
18-
{
19-
return true;
20-
}
21-
else
22-
return false;
17+
return numerator < denominator;
2318
}
24-
2519
// The line below allows us to load the isProperFraction function into tests in other files.
2620
// This will be useful in the "rewrite tests with jest" step.
2721
module.exports = isProperFraction;
@@ -40,9 +34,9 @@ function assertEquals(actualOutput, targetOutput) {
4034
// Example: 1/2 is a proper fraction.
4135
assertEquals(isProperFraction(1, 2), true);
4236

43-
assertEquals(isProperFraction(1,1),false);
44-
assertEquals(isProperFraction(40234,98543),true);
45-
assertEquals(isProperFraction(2,1),false);
46-
assertEquals(isProperFraction(-10,-1),false);
47-
assertEquals(isProperFraction(-1,-10),true);
48-
assertEquals(isProperFraction(1.5,1),false);
37+
assertEquals(isProperFraction(1, 1), false);
38+
assertEquals(isProperFraction(40234, 98543), true);
39+
assertEquals(isProperFraction(2, 1), false);
40+
assertEquals(isProperFraction(-10, -1), false);
41+
assertEquals(isProperFraction(-1, -10), true);
42+
assertEquals(isProperFraction(1.5, 1), false);

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,26 @@
2323

2424
function getCardValue(card) {
2525
// TODO: Implement this function
26-
const value = card.slice(0, -1).toUpperCase();
26+
const value = card.slice(0, -1).toUpperCase();
2727
const validSuits = "♠,♥,♦,♣".split(",");
2828
const suit = card.slice(-1);
2929

30-
31-
if(!validSuits.includes(suit)) {
30+
if (!validSuits.includes(suit)) {
3231
throw new Error("Invalid card");
3332
}
3433

35-
const faceCardValues = {'A': 11, 'J': 10, 'Q': 10, 'K': 10};
34+
const faceCardValues = { A: 11, J: 10, Q: 10, K: 10 };
3635

37-
if(faceCardValues[value] === undefined && (Number(value) < 2 || Number(value) > 10)) {
36+
if (
37+
faceCardValues[value] === undefined &&
38+
(Number(value) < 2 || Number(value) > 10)
39+
) {
3840
throw new Error("Invalid card");
3941
}
40-
42+
4143
if (faceCardValues[value] !== undefined) {
4244
return faceCardValues[value];
43-
}
45+
}
4446

4547
const numvalue = Number(value);
4648
if (numvalue >= 2 && numvalue <= 10) {
@@ -64,9 +66,8 @@ function assertEquals(actualOutput, targetOutput) {
6466
// Examples:
6567
assertEquals(getCardValue("9♠"), 9);
6668

67-
assertEquals(getCardValue("A♥"),11);
68-
assertEquals(getCardValue("10♠"),10);
69-
69+
assertEquals(getCardValue("A♥"), 11);
70+
assertEquals(getCardValue("10♠"), 10);
7071

7172
assertEquals(getCardValue("2♠"), 2);
7273
assertEquals(getCardValue("K♠"), 10);

0 commit comments

Comments
 (0)