Fixes from cohort50 (#107)

Fixes issues that were encountered during the initial test of the major revision introduced starting with cohort50.

.env-example

@@ -1,5 +1,4 @@
 # Development
-ASSIGNMENT_FOLDER=assignment
 BRANCH_CHECKS=0
 ENABLE_CLEAN=1
 # HUSKY=0

.github-later/workflows/ci.yml → .github/workflows/test-reports-check.yml

@@ -1,6 +1,8 @@
 name: 'CI'
 on:
   pull_request:
+    branches:
+      - main
 jobs:
   build-test:
     runs-on: ubuntu-latest
@@ -16,9 +18,4 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci # install packages
-      - run: ./module-week.sh # run tests (configured to use jest-junit reporter)
-      - uses: actions/upload-artifact@v4 # upload test results
-        if: success() || failure() # run this step even if previous step failed
-        with:
-          name: test-results
-          path: junit.xml
+      - run: npm run test-reports-check

1-JavaScript/Week2/README.md

@@ -74,15 +74,13 @@ Let's do some grocery shopping! We're going to get some things to cook dinner wi
 
 #### Exercise instructions
 
-1. Create an array called `shoppingCart` that holds the following strings: `"bananas"` and `"milk"`.
-
-2. Complete the function named `addToShoppingCart` as follows:
+1. Complete the function named `addToShoppingCart` as follows:
 
    - It should take one parameter: a grocery item (string)
-   - It should add the grocery item to `shoppingCart`. If the number of items is more than three remove the first one in the array.
+   - It should add the grocery item to the `shoppingCart` array. If the number of items is more than three remove the first one in the array.
    - It should return a string "You bought _\<list-of-items>_!", where _\<list-of-items>_ is a comma-separated list of items from the shopping cart array.
 
-3. Confirm that your code passes the unit tests (see below).
+2. Confirm that your code passes the unit tests (see below).
 
 #### Unit tests
 

1-JavaScript/Week2/assignment/ex4-shoppingCart.js

@@ -5,19 +5,16 @@ Let's do some grocery shopping! We're going to get some things to cook dinner
 with. However, you like to spend money and always buy too many things. So when 
 you have more than 3 items in your shopping cart the first item gets taken out.
 
-1. Create an array called `shoppingCart` that holds the following strings: 
-   "bananas" and "milk".
-
-2. Complete the function named `addToShoppingCart` as follows:
+1. Complete the function named `addToShoppingCart` as follows:
 
    - It should take one argument: a grocery item (string)
-   - It should add the grocery item to `shoppingCart`. If the number of items is
+   - It should add the grocery item to the `shoppingCart` array. If the number of items is
      more than three remove the first one in the array.
    - It should return a string "You bought <list-of-items>!", where 
      <list-of-items>is a comma-separated list of items from the shopping cart 
      array.
 
-3. Confirm that your code passes the unit tests.
+2. Confirm that your code passes the unit tests.
 -----------------------------------------------------------------------------*/
 const shoppingCart = ['bananas', 'milk'];
 

1-JavaScript/Week2/assignment/ex7-mindPrivacy.js

@@ -35,7 +35,7 @@ function filterPrivateData(/* TODO parameter(s) go here */) {
 
 // ! Test functions (plain vanilla JavaScript)
 function test1() {
-  console.log('Test 1: filterPrivateData should take one parameters');
+  console.log('Test 1: filterPrivateData should take one parameter');
   console.assert(filterPrivateData.length === 1);
 }
 

1-JavaScript/Week3/README.md

@@ -6,6 +6,8 @@ The assignment for this week can be found in the `assignment` folder.
 
 > In this week we will be using a test library called [Jest](https://jestjs.io/) rather than using plain vanilla JavaScript as we did last week.
 >
+> Note: Because Jest currently does not support the newer `import` and `export` keywords of modern JavaScript (it instead expects the older `module.exports` syntax), we use Jest in HYF in combination with a tool called [Babel](https://babeljs.io/). Babel transforms the newer syntax on-the-fly to the older syntax before Jest "sees" it.
+>
 > For an introduction of Unit Testing with Jest we recommend the [Jest Crash Course - Unit Testing in JavaScript](https://youtu.be/7r4xVDI2vho) YouTube video from Traversy Media. For this week, please watch it up to the 0:21:24 time marker.
 
 ### Exercise 1: The odd ones out
@@ -480,22 +482,7 @@ walletJane.reportBalance();
 
 Since this is a browser-based exercise, the file `index.js` will be loaded via a `<script>` tag in `index.html`. The `index.html` file itself requires no further consideration here.
 
-Let's run the exercise using our convenience command `npm run it`:
-
-```text
-❯ npm start
-
-> [email protected] it C:\Users\jimcr\dev\hackyourfuture\assignments
-> node ./test-runner/run-it
-
-? Rerun last test (1-Javascript, Week4, ex5-wallet)? No
-? Which module? 1-Javascript
-? Which week? Week4
-? Which exercise? ex5-wallet
-Running exercise, please wait...
-HTTP server running at http://localhost:3030
-Press Ctrl-C to exit.
-```
+Let's run the exercise using our convenience command `npm start`. Select the `ex5-wallet` exercise from this week.
 
 This will run the exercise in the default browser (if your default browser is not Chrome then open this URL manually in Chrome: `http://locahost:3030`).
 
@@ -516,22 +503,19 @@ We seem to have a bug because we get `undefined` where we expect a name.
 Open the **Sources** panel from Developer Tools. Select `index.js` from the explorer panel and make sure that the console output is visible in the bottom panel, as shown in Figure 1.
 
 ![Dev Tools Debugger](../../assets/dev-tools-debugger.png)
+<br>Figure 1. The Chrome Developer Tools Debugger.
 
-Figure 1. The Chrome Developer Tools Debugger.
-
-First let's examine what causes the `undefined` value in the message. The `console.log` that outputs that message starts on line 26. We would like to inspect the state of the program when the execution reaches that point. For that purpose we will place a **breakpoint** at line 26. A breakpoint is a location in our code where we would like the JavaScript engine to pause execution when we run the program with the debugger.
-
-To place a breakpoint at line 26, click to the left of the number 26 in the left margin of the editor window. A blue marker will appear to indicate the presence of a breakpoint (Figure 2):
+First let's examine what causes the `undefined` value in the message. The `console.log` that outputs that message starts on line 24. We would like to inspect the state of the program when the execution reaches that point. For that purpose we will place a **breakpoint** at line 24. A breakpoint is a location in our code where we would like the JavaScript engine to pause execution when we run the program with the debugger.
 
-![Breakpoint at line 26](../../assets/wallet-breakpoint-26.png)
+To place a breakpoint at line 24, click to the left of the number 24 in the left margin of the editor window. A blue marker will appear to indicate the presence of a breakpoint (Figure 2):
 
-Figure 2. Breakpoint placed at line 26.
+![Set breakpoint](../../assets/wallet-set-breakpoint.png)
+<br>Figure 2. Breakpoint placed at line 24.
 
-With this breakpoint set, reload the page to rerun the JavaScript code. The execution will be paused at line 26, as indicated by the blue highlighting of that line:
+With this breakpoint set, reload the page to rerun the JavaScript code. The execution will be paused at line 24, as indicated by the blue highlighting of that line:
 
-![Breakpoint hit](../../assets/wallet-hit-26.png)
-
-Figure 3. Breakpoint at line 26 is hit.
+![Breakpoint hit](../../assets/wallet-breakpoint-hit.png)
+<br>Figure 3. Breakpoint at line 24 is hit.
 
 To the right of the code panel you can inspect, amongst others, **Breakpoints**, **Scope** and the **Call Stack**.
 
@@ -548,8 +532,7 @@ When we expand the variable `wallet` in the local scope of the Scope panel, we c
 There is no `name` property there. That must be the reason why we get `undefined` when we try to access `wallet.name`. Let's examine this by instructing the debugger to step over (i.e. execute) the `console.log` function call. Figure 4 below shows the debug buttons located near the upper right corner of the Developer Tools.
 
 ![Debug buttons](../../assets/dev-tools-debug-buttons.png)
-
-Figure 4. Developer Tools debug buttons
+<br>Figure 4. Developer Tools debug buttons
 
 Hover the mouse over each of these buttons in the browser and take note of the tooltips that appear.
 
@@ -563,19 +546,19 @@ However, we _do_ want to give some form of **read-only** access to the informati
 
 Let's try and make that change in the VSCode editor window. Prettier will probably now cause the `console.log` call to span five lines.
 
-Now, with the breakpoint still set at line 26, reload the page (first click the large X to cancel loading the current page and then the reload button to reload the page). Then, step over the `console.log` and inspect the console.
+Now, with the breakpoint still set at line 24, reload the page (first click the large X to cancel loading the current page and then the reload button to reload the page). Then, step over the `console.log` and inspect the console.
 
 :question: Please answer question **q4** of the quiz object.
 
 With execution paused at (now) line 31, press the **Step into next function call** button. If all is well that should take us into the function `withdraw()`, which is being called from line 31. If you hover your mouse over the variables `cash` and `amount` on line 16 you can peek at their current values, respectively `100` and `50`: that should be sufficient to make the withdrawal successful.
 
-Let's add a breakpoint at line 17. That breakpoint will only be hit in the case of insufficient funds. Press the button **Step over next function call**. What is being stepped over here is not a function call but a statement. So maybe this button is better labelled "Step over next statement"... But we will have to make do with what we got.
+Let's add a breakpoint at line 15. That breakpoint will only be hit in the case of insufficient funds. Press the button **Step over next function call**. What is being stepped over here is not a function call but a statement. So maybe this button is better labelled "Step over next statement"... But we will have to make do with what we got.
 
-In any case, the `console.log` of line 17 was not executed, as we expected.
+In any case, the `console.log` of line 15 was not executed, as we expected.
 
-With the `undefined` problem solved, we would now like to examine the instances where we get the message `Insufficient funds!`. The breakpoint at line 17 is perfect for that. But we no longer need the breakpoint at line 26. Click on that breakpoint in the left margin of the editor window to remove it again.
+With the `undefined` problem solved, we would now like to examine the instances where we get the message `Insufficient funds!`. The breakpoint at line 15 is perfect for that. But we no longer need the breakpoint at line 24. Click on that breakpoint in the left margin of the editor window to remove it again.
 
-Now, let's resume execution of the code by pressing the button **Resume script execution**. Our breakpoint at line 17 will be hit. Inspect the Scope panel to determine the name of the owner of the wallet that has insufficient funds.
+Now, let's resume execution of the code by pressing the button **Resume script execution**. Our breakpoint at line 15 will be hit. Inspect the Scope panel to determine the name of the owner of the wallet that has insufficient funds.
 
 :question: Please answer question **q5** of the `quiz` object.
 
@@ -592,19 +575,15 @@ and select to rerun the previous exercise. Note that the test will not use the b
 If you have provided all the correct answers you will see:
 
 ```console
-All unit tests passed.
+ PASS  .dist/1-JavaScript/Week3/unit-tests/ex5-wallet.test.js
+  js-wk3-ex5-wallet
+    ✅ q1: At line 24, which variables are in the scope marked Closure? (2 ms)
+    ✅ q2: What is in the Call Stack, from top to bottom?
+    ✅ q3: What tooltip appears when hovering over the third debug button?
+    ✅ q4: What is displayed in the console?
+    ✅ q5: The owner of the wallet with insufficient funds is?
 ```
 
-Otherwise you will get a message in red for each incorrect answer:
-
-```console
-*** Unit Test Error Report ***
-
-- wallet q1: At line 26, which variables are in the scope marked Closure?
-- wallet q2: What is in the Call Stack, from top to bottom?
-- wallet q3: What tooltip appears when hovering over the third debug button?
-- wallet q4: What is displayed in the console?
-- wallet q5: The owner of the wallet with insufficient funds is:
-```
+Otherwise you will each in incorrect answer will be marked with a red cross.
 
 This concludes the exercise.

1-JavaScript/Week3/unit-tests/ex5-wallet.test.js → 1-JavaScript/Week3/unit-tests/ex5-wallet.test.ts

@@ -1,8 +1,8 @@
 import { simple } from 'acorn-walk';
-import { beforeAllHelper } from '../../../.dist/test-runner/unit-test-helpers.js';
+import { beforeAllHelper } from '../../../test-runner/unit-test-helpers.js';
 
 describe('js-wk3-ex5-wallet', () => {
-  const state = { answers: [] };
+  const state = { answers: [] as string[] };
   let exInfo;
   beforeAll(async () => {
     exInfo = await beforeAllHelper(__filename, { noImport: true });
@@ -21,7 +21,7 @@ describe('js-wk3-ex5-wallet', () => {
       });
   });
 
-  test('q1: At line 26, which variables are in the scope marked Closure?', () => {
+  test('q1: At line 24, which variables are in the scope marked Closure?', () => {
     expect(state.answers[0] === 'b').toBe(true);
   });
 

2-Browsers/Week1/README.md

@@ -85,7 +85,7 @@ No homepage is safe from the logo bandit! Every time he sees a Google Logo he re
 In this exercise you're expected to write a JavaScript function that can be executed in the console of the [Google website](https://www.google.com).
 
 1. Find out how to select the element that contains the Google logo, and store it in a variable.
-2. Modify the `src` and `srcset` of the logo so that it's replaced by the HackYourFuture logo instead.
+2. Modify the `.src` and `.srcset` properties of the logo so that it's replaced by the HackYourFuture logo instead.
 
 ## Exercise 4: What's the time?
 

2-Browsers/Week1/assignment/ex1-bookList/index.html

@@ -10,6 +10,6 @@
   <body>
     <h1>My Book List</h1>
     <div id="bookList"></div>
-    <script src="./index.js" type="module"></script>
+    <script src="./index.js"></script>
   </body>
 </html>

2-Browsers/Week1/assignment/ex2-aboutMe/index.html

@@ -15,6 +15,6 @@ <h1>About Me</h1>
       <li>Hometown: <span id="hometown"></span></li>
     </ul>
 
-    <script src="index.js" type="module"></script>
+    <script src="index.js"></script>
   </body>
 </html>

2-Browsers/Week1/assignment/ex4-whatsTheTime/index.html

@@ -6,6 +6,6 @@
     <title>What's The Time?</title>
   </head>
   <body>
-    <script src="index.js" type="module"></script>
+    <script src="index.js"></script>
   </body>
 </html>

2-Browsers/Week1/assignment/ex5-catWalk/index.html

@@ -15,6 +15,6 @@
       src="http://www.anniemation.com/clip_art/images/cat-walk.gif"
       alt="Cat walking"
     />
-    <script src="index.js" type="module"></script>
+    <script src="index.js"></script>
   </body>
 </html>

2-Browsers/Week1/unit-tests/ex3-hijackLogo.test.ts

@@ -35,11 +35,11 @@ describe('br-wk1-ex3-hijackLogo', () => {
 
   testTodosRemoved(() => exInfo.source);
 
-  test('should set the `src` property', () => {
+  test('should set the `.src` property', () => {
     expect(state.src).toBeDefined();
   });
 
-  test('should set the `srcset` property', () => {
+  test('should set the `.srcset` property', () => {
     expect(state.srcset).toBeDefined();
   });
 });

3-UsingAPIs/Week1/assignment/ex3-rollDie.js

@@ -58,3 +58,5 @@ function main() {
 if (process.env.NODE_ENV !== 'test') {
   main();
 }
+
+// TODO Replace this comment by your explanation that was asked for in the assignment description.

3-UsingAPIs/Week1/assignment/ex4-pokerDiceAll.js

@@ -24,7 +24,7 @@ exercise file.
 
 // The line below makes the rollDie() function available to this file.
 // Do not change or remove it.
-const rollDie = require('../../helpers/pokerDiceRoller');
+import { rollDie } from '../../helpers/pokerDiceRoller.js';
 
 export function rollDice() {
   // TODO Refactor this function
@@ -42,3 +42,5 @@ function main() {
 if (process.env.NODE_ENV !== 'test') {
   main();
 }
+
+// TODO Replace this comment by your explanation that was asked for in the assignment description.

3-UsingAPIs/Week1/assignment/ex5-pokerDiceChain.js

@@ -12,7 +12,7 @@ to expand the given promise chain to include five dice.
 
 // The line below makes the rollDie() function available to this file.
 // Do not change or remove it.
-const rollDie = require('../../helpers/pokerDiceRoller');
+import { rollDie } from '../../helpers/pokerDiceRoller.js';
 
 export function rollDice() {
   const results = [];

3-UsingAPIs/Week2/assignment/ex4-diceRace.js

@@ -30,3 +30,5 @@ function main() {
 if (process.env.NODE_ENV !== 'test') {
   main();
 }
+
+// TODO Replace this comment by your explanation that was asked for in the assignment description.