diff --git a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/iterate-with-javascript-do...while-loops.english.md b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/iterate-with-javascript-do...while-loops.english.md
index f68e125d24..dac93ad9b2 100644
--- a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/iterate-with-javascript-do...while-loops.english.md
+++ b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/iterate-with-javascript-do...while-loops.english.md
@@ -7,23 +7,22 @@ videoUrl: 'https://scrimba.com/c/cDqWGcp'
## Description
-You can run the same code multiple times by using a loop.
-The next type of loop you will learn is called a "do...while
" loop because it first will "do
" one pass of the code inside the loop no matter what, and then it runs "while
" a specified condition is true and stops once that condition is no longer true. Let's look at an example.
+The next type of loop you will learn is called a "do...while
" loop. It is called a do...while
loop because it will first "do
" one pass of the code inside the loop no matter what, and then continue to run the loop "while
" the specified condition evaluates to true
.
var ourArray = [];
var i = 0;
do {
ourArray.push(i);
i++;
} while (i < 5);
-This behaves just as you would expect with any other type of loop, and the resulting array will look like [0, 1, 2, 3, 4]
. However, what makes the do...while
different from other loops is how it behaves when the condition fails on the first check. Let's see this in action.
-Here is a regular while loop that will run the code in the loop as long as i < 5
.
+The example above behaves similar to other types of loops, and the resulting array will look like [0, 1, 2, 3, 4]
. However, what makes the do...while
different from other loops is how it behaves when the condition fails on the first check. Let's see this in action:
+Here is a regular while
loop that will run the code in the loop as long as i < 5
:
var ourArray = [];
var i = 5;
while (i < 5) {
ourArray.push(i);
i++;
}
-Notice that we initialize the value of i
to be 5. When we execute the next line, we notice that i
is not less than 5. So we do not execute the code inside the loop. The result is that ourArray
will end up with nothing added to it, so it will still look like this []
when all the code in the example above finishes running.
-Now, take a look at a do...while
loop.
+In this example, we initialize the value of myArray
to an empty array and the value of i
to 5. When we execute the while
loop, the condition evaluates to false
because i
is not less than 5, so we do not execute the code inside the loop. The result is that ourArray
will end up with no values added to it, and it will still look like []
when all of the code in the example above has completed running.
+Now, take a look at a do...while
loop:
var ourArray = [];
var i = 5;
do {
ourArray.push(i);
i++;
} while (i < 5);
-In this case, we initialize the value of i
as 5, just like we did with the while loop. When we get to the next line, there is no check for the value of i
, so we go to the code inside the curly braces and execute it. We will add one element to the array and increment i
before we get to the condition check. Then, when we get to checking if i < 5
see that i
is now 6, which fails the conditional check. So we exit the loop and are done. At the end of the above example, the value of ourArray
is [5]
.
+In this case, we initialize the value of i
to 5, just like we did with the while
loop. When we get to the next line, there is no condition to evaluate, so we go to the code inside the curly braces and execute it. We will add a single element to the array and then increment i
before we get to the condition check. When we finally evaluate the condition i < 5
on the last line, we see that i
is now 6, which fails the conditional check, so we exit the loop and are done. At the end of the above example, the value of ourArray
is [5]
.
Essentially, a do...while
loop ensures that the code inside the loop will run at least once.
Let's try getting a do...while
loop to work by pushing values to an array.
## Instructions
-Change the while
loop in the code to a do...while
loop so that the loop will only push the number 10 to myArray
, and i
will be equal to 11
when your code finishes running.
+Change the while
loop in the code to a do...while
loop so the loop will push only the number 10
to myArray
, and i
will be equal to 11
when your code has finished running.
## Tests
@@ -31,13 +30,12 @@ Change the while
loop in the code to a do...while
loop
```yml
tests:
- - text: You should be using a do...while
loop for this.
- testString: assert(code.match(/do/g), 'You should be using a do...while
loop for this.');
+ - text: You should be using a do...while
loop for this exercise.
+ testString: assert(code.match(/do/g), 'You should be using a do...while
loop for this exercise.');
- text: myArray
should equal [10]
.
testString: assert.deepEqual(myArray, [10], 'myArray
should equal [10]
.');
- text: i
should equal 11
- testString: assert.deepEqual(i, 11, 'i
should equal 11
');
-
+ testString: assert.equal(i, 11, 'i
should equal 11
');
```
@@ -52,13 +50,11 @@ tests:
var myArray = [];
var i = 10;
-// Only change code below this line.
-
+// Only change code below this line
while (i < 5) {
myArray.push(i);
i++;
}
-
```