Skip to content

Commit ad49914

Browse files
iliakaniliakan
committed
ok
1 parent 97a0f22 commit ad49914

File tree

22 files changed

+353
-512
lines changed

22 files changed

+353
-512
lines changed

‎1-js/02-first-steps/14-function-basics/article.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,6 @@ Function naming:
457457

458458
- A name should clearly describe what the function does. When we see a function call in the code, a good name instantly gives us an understanding what it does and returns.
459459
- A function is an action, so function names are usually verbal.
460-
- There is a bunch of commonly adapted verbal prefixes like `create…`, `show…`, `get…`, `check…` etc which can help. The main point is to be consistent about their meaning.
460+
- There exist many widespread function prefixes like `create…`, `show…`, `get…`, `check…` and so on. Use them to hint what a function does.
461461

462462
Functions are the main building blocks of scripts. Now we covered the basics, so we actually can start creating and using them. But that's only the beginning of the path. We are going to return to them many times, going more deeply in their advanced features.

‎1-js/03-code-quality/05-testing/article.md‎

Lines changed: 176 additions & 199 deletions
Large diffs are not rendered by default.

‎1-js/03-code-quality/05-testing/beforeafter.view/index.html‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
<!DOCTYPE html>
22
<html>
3-
43
<head>
5-
<meta charset="utf-8">
6-
7-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.css">
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.js"></script>
4+
<!-- add mocha css, to show results -->
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.css">
6+
<!-- add mocha framework code -->
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.js"></script>
98
<script>
9+
// enable bdd-style testing
1010
mocha.setup('bdd');
1111
</script>
12-
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/2.0.0/chai.js"></script>
12+
<!-- add chai -->
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/3.5.0/chai.js"></script>
1314
<script>
14-
var assert = chai.assert;
15+
// chai has a lot of stuff, let's make assert global
16+
let assert = chai.assert;
1517
</script>
1618
</head>
1719

1820
<body>
1921

20-
<!-- в этом скрипте находятся спеки -->
22+
<!-- the script with tests (describe, it...) -->
2123
<script src="test.js"></script>
2224

23-
<!-- в элементе с id="mocha" будут результаты тестов -->
25+
<!-- the element with id="mocha" will contain test results -->
2426
<div id="mocha"></div>
2527

26-
<!-- запустить тесты! -->
28+
<!-- run tests! -->
2729
<script>
2830
mocha.run();
2931
</script>
3032
</body>
3133

32-
</html>
34+
</html>

‎1-js/03-code-quality/05-testing/beforeafter.view/test.js‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
describe("Тест", function() {
1+
describe("test", function() {
22

3-
before(function() {
4-
alert("Начало всех тестов");
5-
});
6-
after(function() {
7-
alert("Окончание всех тестов");
8-
});
3+
before(() => alert("Testing started – before all tests"));
4+
after(() => alert("Testing finished – after all tests"));
95

10-
beforeEach(function() {
11-
alert("Вход в тест");
12-
});
13-
afterEach(function() {
14-
alert("Выход из теста");
15-
});
6+
beforeEach(() => alert("Before a test – enter a test"));
7+
afterEach(() => alert("After a test – exit a test"));
168

17-
it('тест 1', function() {
18-
alert('1');
19-
});
20-
it('тест 2', function() {
21-
alert('2');
22-
});
9+
it('test 1', () => alert(1));
10+
it('test 2', () => alert(2));
2311

24-
});
12+
});

‎1-js/03-code-quality/05-testing/index.html‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
11
<!DOCTYPE html>
22
<html>
3-
43
<head>
5-
<meta charset="utf-8">
6-
7-
<!-- подключаем стили Mocha, для отображения результатов -->
8-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.css">
9-
<!-- подключаем библиотеку Mocha -->
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.js"></script>
11-
<!-- настраиваем Mocha: предстоит BDD-тестирование -->
4+
<!-- add mocha css, to show results -->
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.css">
6+
<!-- add mocha framework code -->
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.js"></script>
128
<script>
9+
// enable bdd-style testing
1310
mocha.setup('bdd');
1411
</script>
15-
16-
<!-- подключаем chai -->
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/2.0.0/chai.js"></script>
18-
<!-- в chai есть много всего, выносим assert в глобальную область -->
12+
<!-- add chai -->
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/3.5.0/chai.js"></script>
1914
<script>
20-
var assert = chai.assert;
15+
// chai has a lot of stuff, let's make assert global
16+
let assert = chai.assert;
2117
</script>
2218
</head>
2319

2420
<body>
2521

2622
<script>
2723
function pow(x, n) {
28-
/* код функции, пока что пусто */
24+
/* function code is to be written, empty now */
2925
}
3026
</script>
3127

32-
<!-- в этом скрипте находятся спеки -->
28+
<!-- the script with tests (describe, it...) -->
3329
<script src="test.js"></script>
3430

35-
<!-- в элементе с id="mocha" будут результаты тестов -->
31+
<!-- the element with id="mocha" will contain test results -->
3632
<div id="mocha"></div>
3733

38-
<!-- запустить тесты! -->
34+
<!-- run tests! -->
3935
<script>
4036
mocha.run();
4137
</script>
4238
</body>
4339

44-
</html>
40+
</html>

‎1-js/03-code-quality/05-testing/pow-1.view/index.html‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
11
<!DOCTYPE html>
22
<html>
3-
43
<head>
5-
<meta charset="utf-8">
6-
7-
<!-- подключаем стили Mocha, для отображения результатов -->
8-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.css">
9-
<!-- подключаем библиотеку Mocha -->
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.js"></script>
11-
<!-- настраиваем Mocha: предстоит BDD-тестирование -->
4+
<!-- add mocha css, to show results -->
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.css">
6+
<!-- add mocha framework code -->
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.js"></script>
128
<script>
9+
// enable bdd-style testing
1310
mocha.setup('bdd');
1411
</script>
15-
16-
<!-- подключаем chai -->
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/2.0.0/chai.js"></script>
18-
<!-- в chai есть много всего, выносим assert в глобальную область -->
12+
<!-- add chai -->
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/3.5.0/chai.js"></script>
1914
<script>
20-
var assert = chai.assert;
15+
// chai has a lot of stuff, let's make assert global
16+
let assert = chai.assert;
2117
</script>
2218
</head>
2319

2420
<body>
2521

2622
<script>
2723
function pow(x, n) {
28-
/* код функции, пока что пусто */
24+
/* function code is to be written, empty now */
2925
}
3026
</script>
3127

32-
<!-- в этом скрипте находятся спеки -->
28+
<!-- the script with tests (describe, it...) -->
3329
<script src="test.js"></script>
3430

35-
<!-- в элементе с id="mocha" будут результаты тестов -->
31+
<!-- the element with id="mocha" will contain test results -->
3632
<div id="mocha"></div>
3733

38-
<!-- запустить тесты! -->
34+
<!-- run tests! -->
3935
<script>
4036
mocha.run();
4137
</script>
4238
</body>
4339

44-
</html>
40+
</html>

‎1-js/03-code-quality/05-testing/pow-1.view/test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe("pow", function() {
22

3-
it("возводит в n-ю степень", function() {
3+
it("raises to n-th power", function() {
44
assert.equal(pow(2, 3), 8);
55
});
66

7-
});
7+
});

‎1-js/03-code-quality/05-testing/pow-2.view/index.html‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,40 @@
11
<!DOCTYPE html>
22
<html>
3-
43
<head>
5-
<meta charset="utf-8">
6-
7-
<!-- подключаем стили Mocha, для отображения результатов -->
8-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.css">
9-
<!-- подключаем библиотеку Mocha -->
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.js"></script>
11-
<!-- настраиваем Mocha: предстоит BDD-тестирование -->
4+
<!-- add mocha css, to show results -->
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.css">
6+
<!-- add mocha framework code -->
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.js"></script>
128
<script>
9+
// enable bdd-style testing
1310
mocha.setup('bdd');
1411
</script>
15-
16-
<!-- подключаем chai -->
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/2.0.0/chai.js"></script>
18-
<!-- в chai есть много всего, выносим assert в глобальную область -->
12+
<!-- add chai -->
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/3.5.0/chai.js"></script>
1914
<script>
20-
var assert = chai.assert;
15+
// chai has a lot of stuff, let's make assert global
16+
let assert = chai.assert;
2117
</script>
2218
</head>
2319

2420
<body>
2521

2622
<script>
27-
function pow(x, n) {
28-
return 8;
23+
function pow() {
24+
return 8; // :) we cheat!
2925
}
3026
</script>
3127

32-
<!-- в этом скрипте находятся спеки -->
28+
<!-- the script with tests (describe, it...) -->
3329
<script src="test.js"></script>
3430

35-
<!-- в элементе с id="mocha" будут результаты тестов -->
31+
<!-- the element with id="mocha" will contain test results -->
3632
<div id="mocha"></div>
3733

38-
<!-- запустить тесты! -->
34+
<!-- run tests! -->
3935
<script>
4036
mocha.run();
4137
</script>
4238
</body>
4339

44-
</html>
40+
</html>

‎1-js/03-code-quality/05-testing/pow-2.view/test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
describe("pow", function() {
22

3-
it("при возведении 2 в 3ю степень результат 8", function() {
3+
it("2 raised to power 3 is 8", function() {
44
assert.equal(pow(2, 3), 8);
55
});
66

7-
it("при возведении 3 в 4ю степень равен 81", function() {
8-
assert.equal(pow(3, 4), 81);
7+
it("3 raised to power 3 is 27", function() {
8+
assert.equal(pow(3, 3), 27);
99
});
1010

11-
});
11+
});

‎1-js/03-code-quality/05-testing/pow-3.view/index.html‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,46 @@
11
<!DOCTYPE html>
22
<html>
3-
43
<head>
5-
<meta charset="utf-8">
6-
7-
<!-- подключаем стили Mocha, для отображения результатов -->
8-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.css">
9-
<!-- подключаем библиотеку Mocha -->
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/2.1.0/mocha.js"></script>
11-
<!-- настраиваем Mocha: предстоит BDD-тестирование -->
4+
<!-- add mocha css, to show results -->
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.css">
6+
<!-- add mocha framework code -->
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.2.0/mocha.js"></script>
128
<script>
9+
// enable bdd-style testing
1310
mocha.setup('bdd');
1411
</script>
15-
16-
<!-- подключаем chai -->
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/2.0.0/chai.js"></script>
18-
<!-- в chai есть много всего, выносим assert в глобальную область -->
12+
<!-- add chai -->
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/chai/3.5.0/chai.js"></script>
1914
<script>
20-
var assert = chai.assert;
15+
// chai has a lot of stuff, let's make assert global
16+
let assert = chai.assert;
2117
</script>
2218
</head>
2319

2420
<body>
2521

2622
<script>
2723
function pow(x, n) {
28-
var result = 1;
24+
let result = 1;
2925

30-
for (var i = 0; i < n; i++) {
26+
for (let i = 0; i < n; i++) {
3127
result *= x;
3228
}
3329

3430
return result;
3531
}
3632
</script>
3733

38-
<!-- в этом скрипте находятся спеки -->
34+
<!-- the script with tests (describe, it...) -->
3935
<script src="test.js"></script>
4036

41-
<!-- в элементе с id="mocha" будут результаты тестов -->
37+
<!-- the element with id="mocha" will contain test results -->
4238
<div id="mocha"></div>
4339

44-
<!-- запустить тесты! -->
40+
<!-- run tests! -->
4541
<script>
4642
mocha.run();
4743
</script>
4844
</body>
4945

50-
</html>
46+
</html>

0 commit comments

Comments
 (0)