Skip to content
Merged
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/lang/zh-CN/

## [Unreleased]

### Fixed

- 修复输出支持适配器列表未排序的问题

## [2.6.1] - 2023-06-26

### Added
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/publish/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def type_validator(cls, v: str) -> str:
return v

@validator("supported_adapters", pre=True)
def supported_adapters_validator(cls, v: str | set[str] | None) -> set[str] | None:
def supported_adapters_validator(cls, v: str | set[str] | None) -> list[str] | None:
# 如果是从 issue 中获取的数据,需要先解码
if isinstance(v, str):
try:
Expand All @@ -309,7 +309,7 @@ def supported_adapters_validator(cls, v: str | set[str] | None) -> set[str] | No
raise ValueError(
f"⚠️ 适配器 {', '.join(missing_adapters)} 不存在。<dt>请确保适配器模块名称正确。</dt>"
)
return supported_adapters
return sorted(supported_adapters)

@classmethod
def get_type(cls) -> PublishType:
Expand Down
12 changes: 11 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,17 @@ def mocked_api(respx_mock: MockRouter):
"homepage": "https://onebot.adapters.nonebot.dev/",
"tags": [],
"is_official": True,
}
},
{
"module_name": "nonebot.adapters.onebot.v12",
"project_link": "nonebot-adapter-onebot",
"name": "OneBot V12",
"desc": "OneBot V12 协议",
"author": "yanyongyu",
"homepage": "https://onebot.adapters.nonebot.dev/",
"tags": [],
"is_official": True,
},
],
)
yield respx_mock
9 changes: 7 additions & 2 deletions tests/publish/models/test_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ async def test_plugin_from_issue_skip_plugin_test(
mocker.patch.object(plugin_config, "plugin_test_result", "")

mock_issue = mocker.MagicMock()
mock_issue.body = generate_issue_body_plugin_skip_test()
mock_issue.body = generate_issue_body_plugin_skip_test(
supported_adapters=["~onebot.v12", "nonebot.adapters.onebot.v11"]
)
mock_issue.user.login = "author"

info = PluginPublishInfo.from_issue(mock_issue)
Expand All @@ -89,7 +91,10 @@ async def test_plugin_from_issue_skip_plugin_test(
tags=[{"label": "test", "color": "#ffffff"}],
is_official=False,
type="application",
supported_adapters=["nonebot.adapters.onebot.v11"],
supported_adapters=[
"nonebot.adapters.onebot.v11",
"nonebot.adapters.onebot.v12",
],
)

assert mocked_api["project_link"].called
Expand Down