diff --git a/resources/tester/test_m02_layer_screen.py b/resources/tester/test_m02_layer_screen.py index 17fcd6f02..3892125c6 100644 --- a/resources/tester/test_m02_layer_screen.py +++ b/resources/tester/test_m02_layer_screen.py @@ -304,13 +304,17 @@ def test_구조물_조합_제목_줄_새_항목(): 구조물 조합일 때만 보임) · 누르면 나무 「항목 추가」와 같은 창(고른 폴더 안 · 없으면 맨 위).""" main = _text(M02 / "M02_MasterTemplete_UI_Main.ts") assert "export function newItemButton(" in main and 'classList.add("m02-main__new")' in main - assert ( - "children: [back, title, slot, reload, save, ...(extras.newItem ? [extras.newItem] : [])]" - in main + assert re.search( + r"children: \[\s*back,\s*title,\s*helpSlot,\s*slot,\s*reload,\s*save," + r"\s*\.\.\.\(extras\.newItem \? \[extras\.newItem\] : \[\]\),?\s*\]", + main, ) assert "if (extras.newItem) extras.newItem.hidden = !combo;" in main page = _text(M02 / "M02_MasterTemplete_UI_Page.ts") - assert "...(canEdit(layer, isAdmin) ? { newItem: newItemButton(() => void openNew()) } : {})" in page + assert ( + "...(canEdit(layer, isAdmin) ? { newItem: newItemButton(() => void openNew()) } : {})" + in page + ) panel = _text(M02 / "M02_MasterTemplete_TreePanel.ts") assert 'return at?.kind === "folder" ? at.path : [];' in panel # 고른 폴더(39-5 folder()) assert "const newItem = (): void => void addItem(folder());" in panel diff --git a/resources/tester/test_m02_structure_panel.py b/resources/tester/test_m02_structure_panel.py index 1ac3f4d7b..323a0f461 100644 --- a/resources/tester/test_m02_structure_panel.py +++ b/resources/tester/test_m02_structure_panel.py @@ -211,7 +211,8 @@ def test_표_도구_막대에_줄_더하기_줄_지우기_손_입력_열_없음( def test_상세_화면_돌아가기는_집계표로_그_열_고른_채(): main = _text(MAIN) - assert "children: [back, title, slot, reload, save, " in main # M01 꼴 — 제목 앞(39-5) + # M01 꼴 — 제목 앞(39-5) · 49-7 [?] 칸(helpSlot)이 제목 바로 뒤 + assert re.search(r"children: \[\s*back,\s*title,\s*helpSlot,\s*slot,\s*reload,\s*save,", main) assert "!(sel.kind in NUMBER_FIELD)" in main # 구조물 도면 · 일위대가 · 면적산출만 body = main.split('back.addEventListener("click"')[1] assert "confirmLeave()" in body and "STRUCTURE_TABLE" in body