Skip to content

Commit 346f612

Browse files
Merge branch 'main' into comparisons-assertions-breaking-down-problems-sprint-2
2 parents d3f986b + 1a1b90b commit 346f612

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

Sprint-2/4-mandatory-interpret/time-format.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,16 @@ console.log(formatTimeDisplay(61));
3333
// d) What is the value assigned to num when pad is called for the last time in this program? Explain your answer
3434
// =============> write your answer here
3535

36+
<<<<<<< comparisons-assertions-breaking-down-problems-sprint-2
3637
/*The assign value to num when the function pad when it
3738
last called will be 1. Because when the pad function called for the third time, it will
3839
receive the value from the variable remainingSeconds(seconds % 60 = 1);
3940
*/
4041

4142
// e) What is the return value assigned to num when pad is called for the last time in this program? Explain your answer
43+
=======
44+
// e) What is the return value of pad when it is called for the last time in this program? Explain your answer
45+
>>>>>>> main
4246
// =============> write your answer here
4347
/*
4448
the assign return value to num when the function pad when it last called will be 01,

Sprint-3/1-implement-and-rewrite-tests/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ to choose test values that thoroughly test a function.
88
In the `implement` directory you've got a number of functions you'll need to implement.
99
For each function, you also have a number of different cases you'll need to check for your function.
1010

11-
Write your assertions and build up your program case by case. Don't rush to a solution. The point of these assignments is to learn how to write assertions and build up a program step by step.
11+
Write your implementation and your tests to cover the cases the function should fulfil.
1212

1313
Here is a recommended order:
1414

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ try {
4646
getCardValue("invalid");
4747

4848
// This line will not be reached if an error is thrown as expected
49-
console.error("Error was not thrown for invalid card");
50-
} catch (e) {}
49+
console.error("Error was not thrown for invalid card 😢");
50+
} catch (e) {
51+
console.log("Error thrown for invalid card 🎉");
52+
}
5153

5254
// What other invalid card cases can you think of?

0 commit comments

Comments
 (0)