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

First_Pull_request #210

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added .coverage
Binary file not shown.
241 changes: 241 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Python template
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/Diplom_1.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
### Структура проекта

- `praktikum` - пакет, содержащий код программы
- `tests` - пакет, содержащий тесты, разделенные по классам. Например, `bun_test.py`, `burger_test.py` и т.д.
- `tests` - пакет, содержащий тесты, разделенные по классам.

### Запуск автотестов

Expand All @@ -21,4 +21,4 @@

**Запуск автотестов и создание HTML-отчета о покрытии**

> `$ pytest --cov=praktikum --cov-report=html`
> `$ pytest --cov=tests --cov-report=html`
Binary file added __pycache__/conftest.cpython-312-pytest-7.4.4.pyc
Binary file not shown.
Binary file added __pycache__/data.cpython-312.pyc
Binary file not shown.
Binary file added __pycache__/tests.cpython-312-pytest-7.4.4.pyc
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "1cf28f8d-73c2-4b22-a183-c78321a24b01", "befores": [{"name": "bun_item", "status": "passed", "start": 1725111246621, "stop": 1725111246621}], "start": 1725111246621, "stop": 1725111246623}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "057b4f00-6b70-42e5-bf32-78d008d694de", "children": ["7571b1be-09ea-4696-86b6-813dd8e57f44"], "befores": [{"name": "database", "status": "passed", "start": 1725111246621, "stop": 1725111246621}], "start": 1725111246621, "stop": 1725111246622}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "5850c140-3008-4779-9581-3bb754026084", "befores": [{"name": "ingredient_item", "status": "passed", "start": 1725111246655, "stop": 1725111246655}], "start": 1725111246655, "stop": 1725111246657}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name": "Проверка получения типа начинки - get_type", "status": "passed", "start": 1725111246680, "stop": 1725111246681, "uuid": "78888341-86fa-4f54-9990-6ea8ae244e93", "historyId": "5e64284226378e893f05c61046d707a2", "testCaseId": "5e64284226378e893f05c61046d707a2", "fullName": "tests.test_ingredient.TestIngredients#test_get_type_filling_is_success", "labels": [{"name": "suite", "value": "Тестирование класса - Ingredients"}, {"name": "parentSuite", "value": "tests"}, {"name": "subSuite", "value": "TestIngredients"}, {"name": "host", "value": "User-PC"}, {"name": "thread", "value": "10832-MainThread"}, {"name": "framework", "value": "pytest"}, {"name": "language", "value": "cpython3"}, {"name": "package", "value": "tests.test_ingredient"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name": "Проверка добавления ингредиентов в бургер - add_ingredient", "status": "passed", "parameters": [{"name": "ingredients", "value": "'Соус фирменный Space Sauce'"}, {"name": "added_ingredient", "value": "'Соус фирменный Space Sauce'"}], "start": 1725111246592, "stop": 1725111246592, "uuid": "6adf57f5-8bc9-4e38-b0a8-bad66f630a37", "historyId": "4cf86992d69523d4588acd229492d7f8", "testCaseId": "ce5a181f184f8625be0b5bba6a0c3b74", "fullName": "tests.test_burger.TestBurger#test_add_ingredient_is_success", "labels": [{"name": "suite", "value": "Тестирование класса - Burger"}, {"name": "parentSuite", "value": "tests"}, {"name": "subSuite", "value": "TestBurger"}, {"name": "host", "value": "User-PC"}, {"name": "thread", "value": "10832-MainThread"}, {"name": "framework", "value": "pytest"}, {"name": "language", "value": "cpython3"}, {"name": "package", "value": "tests.test_burger"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name": "Проверка получения списка доступных ингредиентов,их названия,типа и стоимости-available_ingredients", "status": "passed", "parameters": [{"name": "ingredient_item", "value": "2"}, {"name": "ingredient_name", "value": "'SAUCE'"}, {"name": "ingredient_type", "value": "'chili sauce'"}, {"name": "ingredient_price", "value": "300"}], "start": 1725111246646, "stop": 1725111246646, "uuid": "a690ccb4-bc43-4aef-8cc3-709b5ca0bc4e", "historyId": "9d013cf1950821c27ebe0975e8f9cee4", "testCaseId": "6fe8b09afce6be3bb29f066af9be8c1c", "fullName": "tests.test_database.TestDataBase#test_available_ingredients_is_success", "labels": [{"name": "suite", "value": "Тестирование класса - Database"}, {"name": "parentSuite", "value": "tests"}, {"name": "subSuite", "value": "TestDataBase"}, {"name": "host", "value": "User-PC"}, {"name": "thread", "value": "10832-MainThread"}, {"name": "framework", "value": "pytest"}, {"name": "language", "value": "cpython3"}, {"name": "package", "value": "tests.test_database"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "e03ada3c-1ad6-40dd-9c9f-9ad63d4b64f4", "befores": [{"name": "ingredient_price", "status": "passed", "start": 1725111246659, "stop": 1725111246659}], "start": 1725111246659, "stop": 1725111246661}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name": "Проверка вычисления конечной стоимости всего бургера - get_price", "status": "passed", "start": 1725111246611, "stop": 1725111246611, "uuid": "e6e0d3b4-8548-40d2-a18c-419970704ef8", "historyId": "cfd845a9a757714b7aa66da2adc24833", "testCaseId": "cfd845a9a757714b7aa66da2adc24833", "fullName": "tests.test_burger.TestBurger#test_get_burger_price_is_success", "labels": [{"name": "suite", "value": "Тестирование класса - Burger"}, {"name": "parentSuite", "value": "tests"}, {"name": "subSuite", "value": "TestBurger"}, {"name": "host", "value": "User-PC"}, {"name": "thread", "value": "10832-MainThread"}, {"name": "framework", "value": "pytest"}, {"name": "language", "value": "cpython3"}, {"name": "package", "value": "tests.test_burger"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "f14f16a1-167f-4d42-85a3-3cb7195cb1f1", "befores": [{"name": "ingredient_type", "status": "passed", "start": 1725111246635, "stop": 1725111246635}], "start": 1725111246635, "stop": 1725111246639}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "cc215587-f909-4a62-aa7b-e1c74654b3d2", "children": ["582d8880-6e92-4569-8ac2-4a4a99a474b0", "c0794091-4f1d-478a-8cd8-ace784f314d8", "d03512cc-c67c-4126-8b3f-caef05b76375", "c7ae848d-29e9-493a-bc9c-67075e47654e", "509d3a2f-533e-4ceb-b4e2-bf192b551ffb", "6adf57f5-8bc9-4e38-b0a8-bad66f630a37", "d859828e-f04c-4431-bf40-1edcbbfe5123", "213701d8-ae9e-402e-88ab-edddb4c8ad2f", "87884d6f-aa29-4cb9-a489-6ebb9dc2e8f0", "3e86049c-5994-4734-9fda-b025b5ad0096", "e6e0d3b4-8548-40d2-a18c-419970704ef8", "0e3d8e18-24fb-47bf-8c7a-fdaf25be373e", "7571b1be-09ea-4696-86b6-813dd8e57f44", "5bb4c9f9-c29e-41b6-ac06-ac81ca9d9f53", "05f17960-c0b8-46cd-b665-9b98ccbcf0b4", "9aafc301-77f6-43d2-91f9-0eb96b354e19", "89fbc104-2f9f-42fb-8bc2-6fefa3270d91", "a690ccb4-bc43-4aef-8cc3-709b5ca0bc4e", "a65c62bd-6957-49e4-9cc3-1853c075bd8e", "74a87030-03b2-4721-9ca0-9d9443128cfb", "9ee90e66-8f42-4460-94d6-75074356c29d", "25f73eb2-6c02-41c2-8c6b-5b5b7526fa96", "da62ef4a-a281-45d0-9db5-f875448345a3", "cd00ebbc-f5ba-43cf-b445-e62dd6eaff61", "9c40aa60-c76d-481d-9690-03284dcbbb84", "44354287-aed1-4e7e-852f-6eb25cb1cbde", "78888341-86fa-4f54-9990-6ea8ae244e93"], "befores": [{"name": "_session_faker", "status": "passed", "start": 1725111246501, "stop": 1725111246574}], "start": 1725111246501, "stop": 1725111246681}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "92f77739-62bf-4d54-8f24-b7164022496d", "children": ["e6e0d3b4-8548-40d2-a18c-419970704ef8"], "befores": [{"name": "mock_bun", "status": "passed", "start": 1725111246610, "stop": 1725111246610}], "start": 1725111246610, "stop": 1725111246612}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "9611f99a-6549-4dc7-b8e9-d27e2cdc22c1", "children": ["74a87030-03b2-4721-9ca0-9d9443128cfb"], "befores": [{"name": "database", "status": "passed", "start": 1725111246655, "stop": 1725111246655}], "start": 1725111246655, "stop": 1725111246656}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name": "Проверка получения списка доступных ингредиентов,их названия,типа и стоимости-available_ingredients", "status": "passed", "parameters": [{"name": "ingredient_item", "value": "3"}, {"name": "ingredient_name", "value": "'FILLING'"}, {"name": "ingredient_type", "value": "'cutlet'"}, {"name": "ingredient_price", "value": "100"}], "start": 1725111246651, "stop": 1725111246651, "uuid": "a65c62bd-6957-49e4-9cc3-1853c075bd8e", "historyId": "b268263b2698ec90060854ec7b0eb262", "testCaseId": "6fe8b09afce6be3bb29f066af9be8c1c", "fullName": "tests.test_database.TestDataBase#test_available_ingredients_is_success", "labels": [{"name": "suite", "value": "Тестирование класса - Database"}, {"name": "parentSuite", "value": "tests"}, {"name": "subSuite", "value": "TestDataBase"}, {"name": "host", "value": "User-PC"}, {"name": "thread", "value": "10832-MainThread"}, {"name": "framework", "value": "pytest"}, {"name": "language", "value": "cpython3"}, {"name": "package", "value": "tests.test_database"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "cd623e55-3081-46a8-b5a1-e764c1469fac", "children": ["9c40aa60-c76d-481d-9690-03284dcbbb84"], "befores": [{"name": "mock_filling", "status": "passed", "start": 1725111246674, "stop": 1725111246674}], "start": 1725111246674, "stop": 1725111246675}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name": "Проверка возможности перемещения ингредиентов в бургере - move_ingredient", "status": "passed", "start": 1725111246608, "stop": 1725111246608, "uuid": "3e86049c-5994-4734-9fda-b025b5ad0096", "historyId": "f152829473d094311bdbd803279f7a9a", "testCaseId": "f152829473d094311bdbd803279f7a9a", "fullName": "tests.test_burger.TestBurger#test_move_ingredient_is_success", "labels": [{"name": "suite", "value": "Тестирование класса - Burger"}, {"name": "parentSuite", "value": "tests"}, {"name": "subSuite", "value": "TestBurger"}, {"name": "host", "value": "User-PC"}, {"name": "thread", "value": "10832-MainThread"}, {"name": "framework", "value": "pytest"}, {"name": "language", "value": "cpython3"}, {"name": "package", "value": "tests.test_burger"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "97485374-eb0f-4539-9e85-c6f4d57828ea", "befores": [{"name": "bun_item", "status": "passed", "start": 1725111246628, "stop": 1725111246628}], "start": 1725111246628, "stop": 1725111246631}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "dde78481-eea7-4294-a19d-b145b2d2d24b", "befores": [{"name": "ingredient_item", "status": "passed", "start": 1725111246634, "stop": 1725111246635}], "start": 1725111246634, "stop": 1725111246639}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name": "Проверка получения списка доступных ингредиентов,их названия,типа и стоимости-available_ingredients", "status": "passed", "parameters": [{"name": "ingredient_item", "value": "4"}, {"name": "ingredient_name", "value": "'FILLING'"}, {"name": "ingredient_type", "value": "'dinosaur'"}, {"name": "ingredient_price", "value": "200"}], "start": 1725111246655, "stop": 1725111246655, "uuid": "74a87030-03b2-4721-9ca0-9d9443128cfb", "historyId": "32be7d0e35db03b845a4ec22da010c73", "testCaseId": "6fe8b09afce6be3bb29f066af9be8c1c", "fullName": "tests.test_database.TestDataBase#test_available_ingredients_is_success", "labels": [{"name": "suite", "value": "Тестирование класса - Database"}, {"name": "parentSuite", "value": "tests"}, {"name": "subSuite", "value": "TestDataBase"}, {"name": "host", "value": "User-PC"}, {"name": "thread", "value": "10832-MainThread"}, {"name": "framework", "value": "pytest"}, {"name": "language", "value": "cpython3"}, {"name": "package", "value": "tests.test_database"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "63926b44-0803-4a85-8238-b57c92be5c0e", "children": ["05f17960-c0b8-46cd-b665-9b98ccbcf0b4"], "befores": [{"name": "database", "status": "passed", "start": 1725111246628, "stop": 1725111246628}], "start": 1725111246628, "stop": 1725111246630}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "b745d292-6eeb-435e-b016-83cabde3fa0d", "befores": [{"name": "bun_price", "status": "passed", "start": 1725111246628, "stop": 1725111246628}], "start": 1725111246628, "stop": 1725111246630}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "6acf0f8c-3769-4a03-98ab-04bce987b4cd", "befores": [{"name": "ingredient_item", "status": "passed", "start": 1725111246641, "stop": 1725111246641}], "start": 1725111246641, "stop": 1725111246644}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "fbbfd222-6537-44e8-ae7f-4efdde017279", "befores": [{"name": "ingredient_name", "status": "passed", "start": 1725111246641, "stop": 1725111246641}], "start": 1725111246641, "stop": 1725111246643}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "5ac1419e-73c1-4520-812c-361e0949ab64", "children": ["0e3d8e18-24fb-47bf-8c7a-fdaf25be373e"], "befores": [{"name": "mock_bun", "status": "passed", "start": 1725111246614, "stop": 1725111246614}], "start": 1725111246614, "stop": 1725111246618}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "e0d34933-13cb-4888-a0b6-c3d37ed3efa3", "children": ["a690ccb4-bc43-4aef-8cc3-709b5ca0bc4e"], "befores": [{"name": "database", "status": "passed", "start": 1725111246645, "stop": 1725111246645}], "start": 1725111246645, "stop": 1725111246646}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"uuid": "81bd6285-dae1-4f78-b771-c1d093b20cf6", "children": ["89fbc104-2f9f-42fb-8bc2-6fefa3270d91"], "befores": [{"name": "database", "status": "passed", "start": 1725111246641, "stop": 1725111246641}], "start": 1725111246641, "stop": 1725111246642}
Loading