Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ДЗ: Закрепление базового синтаксиса языка #1

Merged
merged 41 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3a17905
Добавлены настройки для запуска тестов (Node.js, jest)
SergeyAkkuratov Feb 23, 2024
bc56188
ДЗ №1: Решена 1 задача
SergeyAkkuratov Feb 23, 2024
71565c0
ДЗ №1: Решена задача 2
SergeyAkkuratov Feb 23, 2024
cd88950
ДЗ №1: Решна задача 3
SergeyAkkuratov Feb 23, 2024
9879a2e
Исправление для ДЗ №1, задание 3. Убран мок, добавлено корректное ото…
SergeyAkkuratov Feb 23, 2024
0821e26
ДЗ №2: Решение задачи номер 1.
SergeyAkkuratov Feb 23, 2024
f88048b
ДЗ №2: Решение задачи номер 2.
SergeyAkkuratov Feb 23, 2024
b4018d9
ДЗ №2: Решение задачи номер 3.
SergeyAkkuratov Feb 23, 2024
1100457
ДЗ №3: Решение задачи №1
SergeyAkkuratov Feb 23, 2024
15236d5
ДЗ №3: Решение задачи №2
SergeyAkkuratov Feb 23, 2024
fb0fe58
ДЗ №3: Решение задачи №1
SergeyAkkuratov Feb 23, 2024
a64054a
Добавлен coverage report и добавлены недостающие тесты.
SergeyAkkuratov Feb 23, 2024
792ba25
ДЗ 04: Решение всех задач в одном скрипте.
SergeyAkkuratov Feb 26, 2024
22f616a
ДЗ 04: Поправил явное определение Number для возраста.
SergeyAkkuratov Feb 26, 2024
97a0ddb
ДЗ 05: Решение задачи №1.
SergeyAkkuratov Feb 26, 2024
3194d96
ДЗ 05: Решение задачи №2.
SergeyAkkuratov Feb 26, 2024
d2f7805
ДЗ 05: Решение задачи №3.
SergeyAkkuratov Feb 26, 2024
3602e8e
ДЗ 05: Добавил тест для покрытие всех строк кода.
SergeyAkkuratov Feb 26, 2024
181a093
ДЗ 06: Решение задачи №1.
SergeyAkkuratov Feb 26, 2024
57ac312
ДЗ 06: Решение задачи №2.
SergeyAkkuratov Feb 26, 2024
b514079
ДЗ 06: Решение задачи №3.
SergeyAkkuratov Feb 26, 2024
0918083
ДЗ 06: Решение всех задач.
SergeyAkkuratov Feb 26, 2024
c18c11c
ДЗ 08: Добавлено решение задачи №1.
SergeyAkkuratov Feb 26, 2024
158934d
ДЗ 08: Добавлено решение задачи №2.
SergeyAkkuratov Feb 26, 2024
59dd625
ДЗ 08: Добавлено решение задачи №3.
SergeyAkkuratov Feb 26, 2024
b9249bc
ДЗ 09: Решение задачи №1.
SergeyAkkuratov Feb 26, 2024
41ace57
ДЗ 09: Решение задачи №2 и №3.
SergeyAkkuratov Feb 26, 2024
cc6ae1b
ДЗ 10: функция для решения первой задачи.
SergeyAkkuratov Feb 27, 2024
8de14a3
ДЗ 10: функция для решения второй задачи.
SergeyAkkuratov Feb 27, 2024
d17965a
ДЗ 10: функция для решения третьей задачи.
SergeyAkkuratov Feb 27, 2024
8d391f7
ДЗ 10: удалил лишнее из решения первой задачи.
SergeyAkkuratov Feb 27, 2024
cd9c80d
ДЗ 10: Добавл общую страницу для отображения решения.
SergeyAkkuratov Feb 27, 2024
69a23ad
Во всех ДЗ добавлено тестирование pormpt()
SergeyAkkuratov Feb 27, 2024
1881ccb
Удалены лишние index.html
SergeyAkkuratov Feb 27, 2024
fa0cf78
Ещё удалены лишние index.html
SergeyAkkuratov Feb 27, 2024
e32f846
Добавлена обработка prompt() и убраны index.html
SergeyAkkuratov Feb 27, 2024
f0df70d
Исправление замечаний.
SergeyAkkuratov Mar 5, 2024
f0e16fd
Исправил модули.
SergeyAkkuratov Mar 5, 2024
8d38703
Добавление линтера и GitHub Actions
SergeyAkkuratov Mar 6, 2024
6d65a51
Испаравление для husky
SergeyAkkuratov Mar 6, 2024
1336f5c
Fix tests
SergeyAkkuratov Mar 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
module.exports = {
env: {
browser: true,
es2021: true,
"jest/globals": true,
},
extends: ["airbnb-base", "prettier"],
overrides: [
{
env: {
node: true,
},
files: [".eslintrc.{js,cjs}"],
parserOptions: {
sourceType: "script",
},
},
],
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
},
plugins: ["jest"],
rules: {
"no-console": "off",
"no-alert": "off",
"no-plusplus": "off",
},
};
22 changes: 22 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: PR Sanity Check

on: pull_request

jobs:
lint:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Packages
run: |
npm install

- name: Lint check
run: |
npm run lint

- name: Test check
run: |
npm run test
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# OTUS_homework_lesson06 "Закрепление базового синтаксиса языка"

Домашнее задание для https://github.com/vvscode/otus--javascript-basic/blob/master/lessons/lesson06/homework.md

## Требования
Expand All @@ -9,4 +10,9 @@
4. Покрыть решение задач автоматическими тестами
5. Сделать коммит (а лучше несколько - по одному на задание)
6. Открыть пуллреквест
7. Прислать ссылку на пуллревест в чат с преподавателем"
7. Прислать ссылку на пуллревест в чат с преподавателем"

### Запуск

1. Для запуска тестов использовать команду: **npm test**
2. Для запуска локального сервера, для проверки отобржаения задач: **npm start ./src/**<имя папки>\***\*, где **<имя папки>\*\* - это имя папки с ДЗ, в который находится необходимый файл с index.html
3 changes: 3 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
presets: [["@babel/preset-env", { targets: { node: "current" } }]],
};
198 changes: 198 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
/**
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/configuration
*/

/** @type {import('jest').Config} */
const config = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "C:\\Users\\Сергей\\AppData\\Local\\Temp\\jest",

// Automatically clear mock calls, instances, contexts and results before every test
// clearMocks: false,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
// coverageDirectory: undefined,

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "\\\\node_modules\\\\"
// ],

// Indicates which provider should be used to instrument code for coverage
// coverageProvider: "babel",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// The default configuration for fake timers
// fakeTimers: {
// "enableGlobally": false
// },

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "mjs",
// "cjs",
// "jsx",
// "ts",
// "tsx",
// "json",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: undefined,

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state before every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state and implementation before every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "jsdom",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "\\\\node_modules\\\\"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "\\\\node_modules\\\\",
// "\\.pnp\\.[^\\\\]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};

module.exports = config;
Loading
Loading