Skip to content

Commit 18a17bd

Browse files
committed
test: extract fixtures to shorten tests
1 parent c176f7c commit 18a17bd

10 files changed

+290
-407
lines changed

tests/commands/conftest.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
import os
2+
from pathlib import Path
23

34
import pytest
4-
from pytest_mock import MockerFixture
5+
from pytest_mock import MockerFixture, MockType
56

67
from commitizen import defaults
78
from commitizen.config import BaseConfig
89
from commitizen.config.json_config import JsonConfig
910

1011

11-
@pytest.fixture()
12-
def config():
12+
@pytest.fixture
13+
def config() -> BaseConfig:
1314
_config = BaseConfig()
1415
_config.settings.update({"name": defaults.DEFAULT_SETTINGS["name"]})
1516
return _config
1617

1718

18-
@pytest.fixture()
19-
def config_customize():
19+
@pytest.fixture
20+
def config_customize() -> JsonConfig:
2021
json_string = r"""{
2122
"commitizen": {
2223
"name": "cz_customize",
@@ -41,20 +42,19 @@ def config_customize():
4142
}
4243
}
4344
}"""
44-
_config = JsonConfig(data=json_string, path="not_exist.json")
45-
return _config
45+
return JsonConfig(data=json_string, path=Path("not_exist.json"))
4646

4747

48-
@pytest.fixture()
48+
@pytest.fixture
4949
def changelog_path() -> str:
5050
return os.path.join(os.getcwd(), "CHANGELOG.md")
5151

5252

53-
@pytest.fixture()
53+
@pytest.fixture
5454
def config_path() -> str:
5555
return os.path.join(os.getcwd(), "pyproject.toml")
5656

5757

58-
@pytest.fixture()
59-
def success_mock(mocker: MockerFixture):
58+
@pytest.fixture
59+
def success_mock(mocker: MockerFixture) -> MockType:
6060
return mocker.patch("commitizen.out.success")

0 commit comments

Comments
 (0)