diff --git a/tests/skills/README.md b/tests/skills/README.md index 03a681c9..c7741d25 100644 --- a/tests/skills/README.md +++ b/tests/skills/README.md @@ -247,6 +247,14 @@ ibcmd-проход автоматически `○ skipped`, если рядом `preRun` — шаги подготовки перед основным навыком. Каждый шаг: `script` (путь без расширения), `input` (JSON), `args` (маппинг с `{workDir}` и `{inputFile}` плейсхолдерами). +### Каталог расширения внутри рабочей директории + +Расширение кейсы кладут в подкаталог `cfe`, не `ext`: в корне конфигурации уже лежит платформенный +`Ext/`, и на регистронезависимой ФС (Windows, APFS) каталоги сливаются в один — эталон фиксирует +слипшееся дерево, верное только на этих ФС, а на Linux тот же кейс даёт другой результат (issue #74). +Раннер это проверяет: имя из `params.extensionPath` / `params.outputDir`, совпавшее без учёта +регистра с содержимым фикстуры, валит кейс с объяснением. + ### Кейс с реальной выгрузкой ```json diff --git a/tests/skills/cases/cfe-borrow/catalog-with-owner.json b/tests/skills/cases/cfe-borrow/catalog-with-owner.json index 6e2ab0a0..00146eb2 100644 --- a/tests/skills/cases/cfe-borrow/catalog-with-owner.json +++ b/tests/skills/cases/cfe-borrow/catalog-with-owner.json @@ -13,15 +13,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Catalog.Терминалы" }, + "params": { "extensionPath": "cfe", "object": "Catalog.Терминалы" }, "expect": { "fileContains": { - "file": "ext/Catalogs/Терминалы.xml", + "file": "cfe/Catalogs/Терминалы.xml", "text": "Catalog.Договоры" }, - "files": ["ext/Catalogs/Договоры.xml"] + "files": ["cfe/Catalogs/Договоры.xml"] } } diff --git a/tests/skills/cases/cfe-borrow/catalog.json b/tests/skills/cases/cfe-borrow/catalog.json index b164ab7c..395bda48 100644 --- a/tests/skills/cases/cfe-borrow/catalog.json +++ b/tests/skills/cases/cfe-borrow/catalog.json @@ -16,18 +16,18 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Тест", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "object": "Catalog.Товары" }, "expect": { "preserves": { - "file": "Ext/Catalogs/Товары.xml", + "file": "cfe/Catalogs/Товары.xml", "bom": true, "eol": "crlf", "encoding": "UTF-8", diff --git a/tests/skills/cases/cfe-borrow/common-module.json b/tests/skills/cases/cfe-borrow/common-module.json index 9a975e4c..c556ae28 100644 --- a/tests/skills/cases/cfe-borrow/common-module.json +++ b/tests/skills/cases/cfe-borrow/common-module.json @@ -8,8 +8,8 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "CommonModule.ОбщийМодуль1" } + "params": { "extensionPath": "cfe", "object": "CommonModule.ОбщийМодуль1" } } diff --git a/tests/skills/cases/cfe-borrow/container-types.json b/tests/skills/cases/cfe-borrow/container-types.json index 6ddd5585..4cb2a585 100644 --- a/tests/skills/cases/cfe-borrow/container-types.json +++ b/tests/skills/cases/cfe-borrow/container-types.json @@ -100,13 +100,13 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Тест", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "object": "Report.ОстаткиТоваров ;; DocumentJournal.Складские ;; Sequence.ПартионныйУчет ;; HTTPService.ОбменДанными ;; WebService.СервисОбмена ;; FilterCriterion.ПоКонтрагенту ;; SettingsStorage.ХранилищеОтчетов" } } diff --git a/tests/skills/cases/cfe-borrow/dataprocessor.json b/tests/skills/cases/cfe-borrow/dataprocessor.json index 86d45b93..faf172a9 100644 --- a/tests/skills/cases/cfe-borrow/dataprocessor.json +++ b/tests/skills/cases/cfe-borrow/dataprocessor.json @@ -8,8 +8,8 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "DataProcessor.ЗагрузкаДанных" } + "params": { "extensionPath": "cfe", "object": "DataProcessor.ЗагрузкаДанных" } } diff --git a/tests/skills/cases/cfe-borrow/document.json b/tests/skills/cases/cfe-borrow/document.json index 4c9e8266..1253f0b4 100644 --- a/tests/skills/cases/cfe-borrow/document.json +++ b/tests/skills/cases/cfe-borrow/document.json @@ -8,8 +8,8 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Document.ПриходТоваров" } + "params": { "extensionPath": "cfe", "object": "Document.ПриходТоваров" } } diff --git a/tests/skills/cases/cfe-borrow/enum.json b/tests/skills/cases/cfe-borrow/enum.json index 516ecc4a..31b99b9a 100644 --- a/tests/skills/cases/cfe-borrow/enum.json +++ b/tests/skills/cases/cfe-borrow/enum.json @@ -8,8 +8,8 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Enum.ВидыОплат" } + "params": { "extensionPath": "cfe", "object": "Enum.ВидыОплат" } } diff --git a/tests/skills/cases/cfe-borrow/form-bindings.json b/tests/skills/cases/cfe-borrow/form-bindings.json index 6e580e5b..34515270 100644 --- a/tests/skills/cases/cfe-borrow/form-bindings.json +++ b/tests/skills/cases/cfe-borrow/form-bindings.json @@ -29,20 +29,20 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары.Form.ФормаЭлемента", "-BorrowMainAttribute": "Form" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары.Form.ФормаЭлемента", "-BorrowMainAttribute": "Form" } }, { "writeFile": { - "path": "ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl", + "path": "cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl", "content": "&НаСервере\nПроцедура ПриСозданииНаСервере(Отказ, СтандартнаяОбработка)\n\t// пользовательский код — не должен затираться повторным заимствованием\nКонецПроцедуры" } } ], - "params": { "extensionPath": "ext", "object": "Catalog.Товары.Form.ФормаЭлемента" }, + "params": { "extensionPath": "cfe", "object": "Catalog.Товары.Form.ФормаЭлемента" }, "args_extra": ["-BorrowMainAttribute", "Form"], "idempotent": true } diff --git a/tests/skills/cases/cfe-borrow/form-choice-link-dangling.json b/tests/skills/cases/cfe-borrow/form-choice-link-dangling.json index 4d62d07f..95897fd1 100644 --- a/tests/skills/cases/cfe-borrow/form-choice-link-dangling.json +++ b/tests/skills/cases/cfe-borrow/form-choice-link-dangling.json @@ -80,18 +80,18 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Тест", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "object": "Document.Размещение.Form.ФормаДокумента" }, "expect": { "fileNotContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": [ "", "" diff --git a/tests/skills/cases/cfe-borrow/form-choice-link-form-attr-main.json b/tests/skills/cases/cfe-borrow/form-choice-link-form-attr-main.json index 812a6df1..36bb4e07 100644 --- a/tests/skills/cases/cfe-borrow/form-choice-link-form-attr-main.json +++ b/tests/skills/cases/cfe-borrow/form-choice-link-form-attr-main.json @@ -84,22 +84,22 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Тест", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "object": "Document.Размещение.Form.ФормаДокумента" }, "expect": { "fileContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": "" }, "fileNotContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": "Склад" } }, diff --git a/tests/skills/cases/cfe-borrow/form-choice-link-form-attr.json b/tests/skills/cases/cfe-borrow/form-choice-link-form-attr.json index 394f4591..b26110e4 100644 --- a/tests/skills/cases/cfe-borrow/form-choice-link-form-attr.json +++ b/tests/skills/cases/cfe-borrow/form-choice-link-form-attr.json @@ -44,17 +44,17 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Document.Размещение.Form.ФормаДокумента" }, + "params": { "extensionPath": "cfe", "object": "Document.Размещение.Form.ФормаДокумента" }, "expect": { "fileContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": "" }, "fileNotContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": "Склад" } } diff --git a/tests/skills/cases/cfe-borrow/form-choice-link-items.json b/tests/skills/cases/cfe-borrow/form-choice-link-items.json index bb0c838f..fda1aaa1 100644 --- a/tests/skills/cases/cfe-borrow/form-choice-link-items.json +++ b/tests/skills/cases/cfe-borrow/form-choice-link-items.json @@ -52,13 +52,13 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Document.Размещение.Form.ФормаДокумента" }, + "params": { "extensionPath": "cfe", "object": "Document.Размещение.Form.ФормаДокумента" }, "expect": { "fileNotContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": ["", "Items.Строки.CurrentData.Склад"] } } diff --git a/tests/skills/cases/cfe-borrow/form-choice-link-standard-field.json b/tests/skills/cases/cfe-borrow/form-choice-link-standard-field.json index 71d95cb1..e9a2f2cc 100644 --- a/tests/skills/cases/cfe-borrow/form-choice-link-standard-field.json +++ b/tests/skills/cases/cfe-borrow/form-choice-link-standard-field.json @@ -80,22 +80,22 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Тест", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "object": "Document.Размещение.Form.ФормаДокумента" }, "expect": { "fileContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": "" }, "fileNotContains": { - "file": "ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml", "text": "Объект.Ref" } }, diff --git a/tests/skills/cases/cfe-borrow/form-choice-param-links.json b/tests/skills/cases/cfe-borrow/form-choice-param-links.json index 6ebcdbbc..c956041e 100644 --- a/tests/skills/cases/cfe-borrow/form-choice-param-links.json +++ b/tests/skills/cases/cfe-borrow/form-choice-param-links.json @@ -45,8 +45,8 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Document.ЗаказПоставщику.Form.ФормаДокумента" } + "params": { "extensionPath": "cfe", "object": "Document.ЗаказПоставщику.Form.ФормаДокумента" } } diff --git a/tests/skills/cases/cfe-borrow/form-main-attr-columns.json b/tests/skills/cases/cfe-borrow/form-main-attr-columns.json index dd3068b2..7ed8bed4 100644 --- a/tests/skills/cases/cfe-borrow/form-main-attr-columns.json +++ b/tests/skills/cases/cfe-borrow/form-main-attr-columns.json @@ -121,13 +121,13 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Тест", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "object": "Document.ЗаказКлиента.Form.ФормаДокумента" }, "args_extra": [ diff --git a/tests/skills/cases/cfe-borrow/form-main-attr-dynamic-list.json b/tests/skills/cases/cfe-borrow/form-main-attr-dynamic-list.json index f0f602a8..5624eb9c 100644 --- a/tests/skills/cases/cfe-borrow/form-main-attr-dynamic-list.json +++ b/tests/skills/cases/cfe-borrow/form-main-attr-dynamic-list.json @@ -4,14 +4,14 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Document.Расход.Form.ФормаСписка" }, + "params": { "extensionPath": "cfe", "object": "Document.Расход.Form.ФормаСписка" }, "args_extra": ["-BorrowMainAttribute", "Form"], "expect": { "fileContains": { - "file": "ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml", + "file": "cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml", "text": [ "", "cfg:DynamicList", @@ -22,7 +22,7 @@ ] }, "fileNotContains": { - "file": "ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml", + "file": "cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml", "text": ["name=\"Объект\"", ""] } } diff --git a/tests/skills/cases/cfe-borrow/form-main-attr-list-query.json b/tests/skills/cases/cfe-borrow/form-main-attr-list-query.json index 37017256..8467efe3 100644 --- a/tests/skills/cases/cfe-borrow/form-main-attr-list-query.json +++ b/tests/skills/cases/cfe-borrow/form-main-attr-list-query.json @@ -4,18 +4,18 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Document.Расход.Form.ФормаСпискаЗапрос" }, + "params": { "extensionPath": "cfe", "object": "Document.Расход.Form.ФормаСпискаЗапрос" }, "args_extra": ["-BorrowMainAttribute", "Form"], "expect": { "fileContains": { - "file": "ext/Documents/Расход.xml", + "file": "cfe/Documents/Расход.xml", "text": ["Комментарий", "Склад"] }, "fileNotContains": { - "file": "ext/Documents/Расход.xml", + "file": "cfe/Documents/Расход.xml", "text": "Товары" } } diff --git a/tests/skills/cases/cfe-borrow/form-main-attr-record-manager.json b/tests/skills/cases/cfe-borrow/form-main-attr-record-manager.json index efbaa854..f30e2680 100644 --- a/tests/skills/cases/cfe-borrow/form-main-attr-record-manager.json +++ b/tests/skills/cases/cfe-borrow/form-main-attr-record-manager.json @@ -4,15 +4,15 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "InformationRegister.Настройка.Form.ФормаЗаписи" }, + "params": { "extensionPath": "cfe", "object": "InformationRegister.Настройка.Form.ФормаЗаписи" }, "args_extra": ["-BorrowMainAttribute", "Form"], "expect": { "fileContains": [ { - "file": "ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml", + "file": "cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml", "text": [ "", "cfg:InformationRegisterRecordManager.Настройка", @@ -20,12 +20,12 @@ ] }, { - "file": "ext/InformationRegisters/Настройка.xml", + "file": "cfe/InformationRegisters/Настройка.xml", "text": ["Организация", "Лимит"] } ], "fileNotContains": { - "file": "ext/InformationRegisters/Настройка.xml", + "file": "cfe/InformationRegisters/Настройка.xml", "text": "Post", "DontUse", @@ -19,7 +19,7 @@ ] }, "fileNotContains": { - "file": "ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml", "text": [ "MoveUp", "", diff --git a/tests/skills/cases/cfe-borrow/form-row-picture-path.json b/tests/skills/cases/cfe-borrow/form-row-picture-path.json index c1b44bd5..fc64236b 100644 --- a/tests/skills/cases/cfe-borrow/form-row-picture-path.json +++ b/tests/skills/cases/cfe-borrow/form-row-picture-path.json @@ -4,14 +4,14 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Document.Расход.Form.ФормаДокумента" }, + "params": { "extensionPath": "cfe", "object": "Document.Расход.Form.ФормаДокумента" }, "args_extra": ["-BorrowMainAttribute", "Form"], "expect": { "fileContains": { - "file": "ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml", "text": [ "Объект.Товары.ИндексКартинки", "Post", @@ -19,7 +19,7 @@ ] }, "fileNotContains": { - "file": "ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml", + "file": "cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml", "text": ["MoveUp", ""] } } diff --git a/tests/skills/cases/cfe-borrow/format-221.json b/tests/skills/cases/cfe-borrow/format-221.json index a4d7a530..b1dda807 100644 --- a/tests/skills/cases/cfe-borrow/format-221.json +++ b/tests/skills/cases/cfe-borrow/format-221.json @@ -24,23 +24,23 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Расш", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext" + "extensionPath": "cfe" }, "object": "Catalog.Товары.Form.ФормаЭлемента", "expect": { "fileContains": [ { - "file": "ext/Catalogs/Товары.xml", + "file": "cfe/Catalogs/Товары.xml", "text": "xmlns:lf=\"http://v8.1c.ru/8.2/managed-application/logform\" xmlns:pal=\"http://v8.1c.ru/8.1/data/ui/colors/palette\" xmlns:style=" }, { - "file": "ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml", + "file": "cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml", "text": [ "xmlns:lf=\"http://v8.1c.ru/8.2/managed-application/logform\" xmlns:pal=\"http://v8.1c.ru/8.1/data/ui/colors/palette\" xmlns:style=", "version=\"2.21\"" diff --git a/tests/skills/cases/cfe-borrow/gentypes-full.json b/tests/skills/cases/cfe-borrow/gentypes-full.json index 7ae6c58b..0a645a89 100644 --- a/tests/skills/cases/cfe-borrow/gentypes-full.json +++ b/tests/skills/cases/cfe-borrow/gentypes-full.json @@ -115,13 +115,13 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Тест", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "object": "ChartOfCharacteristicTypes.ВидыСубконто ;; ChartOfAccounts.Хозрасчетный ;; ChartOfCalculationTypes.ОсновныеНачисления ;; AccountingRegister.Хозрасчетный ;; CalculationRegister.Начисления ;; BusinessProcess.Согласование" } } diff --git a/tests/skills/cases/cfe-borrow/multiple-objects.json b/tests/skills/cases/cfe-borrow/multiple-objects.json index 8e2e3539..62ca1f22 100644 --- a/tests/skills/cases/cfe-borrow/multiple-objects.json +++ b/tests/skills/cases/cfe-borrow/multiple-objects.json @@ -13,8 +13,8 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext", "object": "Catalog.Товары ;; Enum.Статусы" } + "params": { "extensionPath": "cfe", "object": "Catalog.Товары ;; Enum.Статусы" } } diff --git a/tests/skills/cases/cfe-borrow/shell-reborrow-tabular-sections.json b/tests/skills/cases/cfe-borrow/shell-reborrow-tabular-sections.json index b4a47854..d0a07279 100644 --- a/tests/skills/cases/cfe-borrow/shell-reborrow-tabular-sections.json +++ b/tests/skills/cases/cfe-borrow/shell-reborrow-tabular-sections.json @@ -4,23 +4,23 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", "args": { - "-ExtensionPath": "{workDir}/ext", + "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Document.Расход.Form.ФормаДокумента", "-BorrowMainAttribute": "Form" } } ], - "params": { "extensionPath": "ext", "object": "Document.Расход.Form.ФормаСписка" }, + "params": { "extensionPath": "cfe", "object": "Document.Расход.Form.ФормаСписка" }, "args_extra": ["-BorrowMainAttribute", "All"], "expect": { "fileContains": { - "file": "ext/Documents/Расход.xml", + "file": "cfe/Documents/Расход.xml", "text": ["Товары", "Комментарий", "Склад"] } } diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Catalogs/Договоры.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Catalogs/Договоры.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Catalogs/Договоры.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Catalogs/Договоры.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Catalogs/Терминалы.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Catalogs/Терминалы.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Catalogs/Терминалы.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Catalogs/Терминалы.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog-with-owner/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/catalog/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/catalog/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/common-module/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/common-module/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/common-module/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-borrow/snapshots/common-module/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/common-module/ext/CommonModules/ОбщийМодуль1.xml b/tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/CommonModules/ОбщийМодуль1.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/common-module/ext/CommonModules/ОбщийМодуль1.xml rename to tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/CommonModules/ОбщийМодуль1.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/common-module/ext/CommonModules/ОбщийМодуль1/Ext/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/CommonModules/ОбщийМодуль1/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/common-module/ext/CommonModules/ОбщийМодуль1/Ext/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/CommonModules/ОбщийМодуль1/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/common-module/ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/common-module/ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/common-module/ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/common-module/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/common-module/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/common-module/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/common-module/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/DocumentJournals/Складские.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/DocumentJournals/Складские.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/DocumentJournals/Складские.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/DocumentJournals/Складские.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/FilterCriteria/ПоКонтрагенту.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/FilterCriteria/ПоКонтрагенту.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/FilterCriteria/ПоКонтрагенту.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/FilterCriteria/ПоКонтрагенту.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/HTTPServices/ОбменДанными.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/HTTPServices/ОбменДанными.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/HTTPServices/ОбменДанными.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/HTTPServices/ОбменДанными.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/HTTPServices/ОбменДанными/Ext/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/HTTPServices/ОбменДанными/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/HTTPServices/ОбменДанными/Ext/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/HTTPServices/ОбменДанными/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Reports/ОстаткиТоваров.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Reports/ОстаткиТоваров.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Reports/ОстаткиТоваров.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Reports/ОстаткиТоваров.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Sequences/ПартионныйУчет.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Sequences/ПартионныйУчет.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/Sequences/ПартионныйУчет.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/Sequences/ПартионныйУчет.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/SettingsStorages/ХранилищеОтчетов.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/SettingsStorages/ХранилищеОтчетов.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/SettingsStorages/ХранилищеОтчетов.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/SettingsStorages/ХранилищеОтчетов.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/WebServices/СервисОбмена.xml b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/WebServices/СервисОбмена.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/WebServices/СервисОбмена.xml rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/WebServices/СервисОбмена.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/WebServices/СервисОбмена/Ext/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/WebServices/СервисОбмена/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/container-types/Ext/WebServices/СервисОбмена/Ext/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/container-types/cfe/WebServices/СервисОбмена/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/DataProcessors/ЗагрузкаДанных.xml b/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/DataProcessors/ЗагрузкаДанных.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/DataProcessors/ЗагрузкаДанных.xml rename to tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/DataProcessors/ЗагрузкаДанных.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/dataprocessor/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/dataprocessor/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/document/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/document/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/document/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-borrow/snapshots/document/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/document/ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/document/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/document/ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/document/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/document/ext/Documents/ПриходТоваров.xml b/tests/skills/cases/cfe-borrow/snapshots/document/cfe/Documents/ПриходТоваров.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/document/ext/Documents/ПриходТоваров.xml rename to tests/skills/cases/cfe-borrow/snapshots/document/cfe/Documents/ПриходТоваров.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/document/ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/document/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/document/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/document/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/document/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/document/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/document/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/document/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/enum/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/enum/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/enum/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-borrow/snapshots/enum/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/enum/ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/enum/ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/enum/ext/Enums/ВидыОплат.xml b/tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Enums/ВидыОплат.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/enum/ext/Enums/ВидыОплат.xml rename to tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Enums/ВидыОплат.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/enum/ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/enum/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/enum/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/enum/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/enum/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары/Forms/ФормаЭлемента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары/Forms/ФормаЭлемента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-bindings/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-bindings/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-dangling/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Catalogs/Ячейки.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Catalogs/Ячейки.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Catalogs/Ячейки.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Catalogs/Ячейки.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr-main/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-form-attr/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-items/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Catalogs/Ячейки.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Catalogs/Ячейки.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Catalogs/Ячейки.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Catalogs/Ячейки.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Documents/Размещение/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-link-standard-field/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Documents/ЗаказПоставщику/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-choice-param-links/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Catalogs/Номенклатура.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Catalogs/Номенклатура.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Catalogs/Номенклатура.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Catalogs/Номенклатура.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Documents/ЗаказКлиента/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-columns/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход/Forms/ФормаСписка.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход/Forms/ФормаСписка.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход/Forms/ФормаСписка.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход/Forms/ФормаСписка.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-dynamic-list/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход/Forms/ФормаСпискаЗапрос.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход/Forms/ФормаСпискаЗапрос.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Documents/Расход/Forms/ФормаСпискаЗапрос/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-list-query/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-main-attr-record-manager/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход.xml b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-props-after-commandset/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход.xml b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/form-row-picture-path/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары/Forms/ФормаЭлемента.xml b/tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары/Forms/ФормаЭлемента.xml rename to tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Roles/Расш_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Roles/Расш_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/format-221/Ext/Roles/Расш_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/format-221/cfe/Roles/Расш_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/AccountingRegisters/Хозрасчетный.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/AccountingRegisters/Хозрасчетный.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/AccountingRegisters/Хозрасчетный.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/AccountingRegisters/Хозрасчетный.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/BusinessProcesses/Согласование.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/BusinessProcesses/Согласование.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/BusinessProcesses/Согласование.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/BusinessProcesses/Согласование.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/CalculationRegisters/Начисления.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/CalculationRegisters/Начисления.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/CalculationRegisters/Начисления.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/CalculationRegisters/Начисления.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/ChartsOfAccounts/Хозрасчетный.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/ChartsOfAccounts/Хозрасчетный.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/ChartsOfAccounts/Хозрасчетный.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/ChartsOfAccounts/Хозрасчетный.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/ChartsOfCalculationTypes/ОсновныеНачисления.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/ChartsOfCalculationTypes/ОсновныеНачисления.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/ChartsOfCalculationTypes/ОсновныеНачисления.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/ChartsOfCalculationTypes/ОсновныеНачисления.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/ChartsOfCharacteristicTypes/ВидыСубконто.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/ChartsOfCharacteristicTypes/ВидыСубконто.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/ChartsOfCharacteristicTypes/ВидыСубконто.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/ChartsOfCharacteristicTypes/ВидыСубконто.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/gentypes-full/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/gentypes-full/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-borrow/snapshots/multiple-objects/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Enums/Статусы.xml b/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Enums/Статусы.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Enums/Статусы.xml rename to tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Enums/Статусы.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/multiple-objects/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/multiple-objects/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Configuration.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Configuration.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаДокумента.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаДокумента.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаДокумента.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаДокумента.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаДокумента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаСписка.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаСписка.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаСписка.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаСписка.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-borrow/snapshots/shell-reborrow-tabular-sections/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-diff/empty-extension.json b/tests/skills/cases/cfe-diff/empty-extension.json index 89ccdb47..89105521 100644 --- a/tests/skills/cases/cfe-diff/empty-extension.json +++ b/tests/skills/cases/cfe-diff/empty-extension.json @@ -3,8 +3,8 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext" } + "params": { "extensionPath": "cfe" } } diff --git a/tests/skills/cases/cfe-diff/own-service-objects.json b/tests/skills/cases/cfe-diff/own-service-objects.json index 881c6d65..fe164d1b 100644 --- a/tests/skills/cases/cfe-diff/own-service-objects.json +++ b/tests/skills/cases/cfe-diff/own-service-objects.json @@ -5,7 +5,7 @@ "script": "cfe-init/scripts/cfe-init", "args": { "-Name": "Сервисы", - "-OutputDir": "{workDir}/ext", + "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, @@ -19,7 +19,7 @@ }, "args": { "-JsonPath": "{inputFile}", - "-OutputDir": "{workDir}/ext" + "-OutputDir": "{workDir}/cfe" } }, { @@ -27,12 +27,12 @@ "args": { "-Xsd": "", "-Name": "Сервисы_Пакет", - "-OutputDir": "{workDir}/ext" + "-OutputDir": "{workDir}/cfe" } } ], "params": { - "extensionPath": "ext" + "extensionPath": "cfe" }, "expect": { "stdoutContains": ["HTTPService.Сервисы_API", "XDTOPackage.Сервисы_Пакет"], diff --git a/tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-diff/snapshots/empty-extension/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-diff/snapshots/empty-extension/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/Configuration.xml b/tests/skills/cases/cfe-diff/snapshots/empty-extension/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/Configuration.xml rename to tests/skills/cases/cfe-diff/snapshots/empty-extension/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/Languages/Русский.xml b/tests/skills/cases/cfe-diff/snapshots/empty-extension/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-diff/snapshots/empty-extension/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-diff/snapshots/empty-extension/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/empty-extension/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-diff/snapshots/empty-extension/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/Configuration.xml b/tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/Configuration.xml rename to tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/HTTPServices/Сервисы_API.xml b/tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/HTTPServices/Сервисы_API.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/HTTPServices/Сервисы_API.xml rename to tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/HTTPServices/Сервисы_API.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/HTTPServices/Сервисы_API/Ext/Module.bsl b/tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/HTTPServices/Сервисы_API/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/HTTPServices/Сервисы_API/Ext/Module.bsl rename to tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/HTTPServices/Сервисы_API/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/Roles/Сервисы_ОсновнаяРоль.xml b/tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/Roles/Сервисы_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/Roles/Сервисы_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/Roles/Сервисы_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/XDTOPackages/Сервисы_Пакет.xml b/tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/XDTOPackages/Сервисы_Пакет.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/XDTOPackages/Сервисы_Пакет.xml rename to tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/XDTOPackages/Сервисы_Пакет.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/XDTOPackages/Сервисы_Пакет/Ext/Package.bin b/tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/XDTOPackages/Сервисы_Пакет/Ext/Package.bin similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/own-service-objects/Ext/XDTOPackages/Сервисы_Пакет/Ext/Package.bin rename to tests/skills/cases/cfe-diff/snapshots/own-service-objects/cfe/XDTOPackages/Сервисы_Пакет/Ext/Package.bin diff --git a/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Configuration.xml b/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Configuration.xml rename to tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Languages/Русский.xml b/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-diff/snapshots/with-borrowed-catalog/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-diff/snapshots/with-common-module/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-diff/snapshots/with-common-module/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/CommonModules/ОбщийМодуль1.xml b/tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/CommonModules/ОбщийМодуль1.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/CommonModules/ОбщийМодуль1.xml rename to tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/CommonModules/ОбщийМодуль1.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/CommonModules/ОбщийМодуль1/Ext/Module.bsl b/tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/CommonModules/ОбщийМодуль1/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/CommonModules/ОбщийМодуль1/Ext/Module.bsl rename to tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/CommonModules/ОбщийМодуль1/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/Configuration.xml b/tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/Configuration.xml rename to tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/Languages/Русский.xml b/tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-diff/snapshots/with-common-module/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-diff/snapshots/with-common-module/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-diff/with-borrowed-catalog.json b/tests/skills/cases/cfe-diff/with-borrowed-catalog.json index 471e581a..8fd539e5 100644 --- a/tests/skills/cases/cfe-diff/with-borrowed-catalog.json +++ b/tests/skills/cases/cfe-diff/with-borrowed-catalog.json @@ -8,13 +8,13 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "expect": { "stdoutContains": "Catalog" } } diff --git a/tests/skills/cases/cfe-diff/with-common-module.json b/tests/skills/cases/cfe-diff/with-common-module.json index a1eed381..6aa9c254 100644 --- a/tests/skills/cases/cfe-diff/with-common-module.json +++ b/tests/skills/cases/cfe-diff/with-common-module.json @@ -8,13 +8,13 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль1" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль1" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "expect": { "stdoutContains": "CommonModule" } } diff --git a/tests/skills/cases/cfe-init/addon-purpose.json b/tests/skills/cases/cfe-init/addon-purpose.json index 3889ef34..484758ab 100644 --- a/tests/skills/cases/cfe-init/addon-purpose.json +++ b/tests/skills/cases/cfe-init/addon-purpose.json @@ -1,9 +1,9 @@ { "name": "Расширение-дополнение (AddOn)", - "params": { "name": "Дополнение", "outputDir": "ext" }, + "params": { "name": "Дополнение", "outputDir": "cfe" }, "args_extra": ["-Purpose", "AddOn"], - "validatePath": "ext", + "validatePath": "cfe", "expect": { - "files": ["ext/Configuration.xml"] + "files": ["cfe/Configuration.xml"] } } diff --git a/tests/skills/cases/cfe-init/basic.json b/tests/skills/cases/cfe-init/basic.json index d0d07159..db1cbf99 100644 --- a/tests/skills/cases/cfe-init/basic.json +++ b/tests/skills/cases/cfe-init/basic.json @@ -2,12 +2,12 @@ "name": "Пустое расширение", "params": { "name": "МоёРасширение", - "outputDir": "ext" + "outputDir": "cfe" }, - "validatePath": "ext", + "validatePath": "cfe", "expect": { "files": [ - "ext/Configuration.xml" + "cfe/Configuration.xml" ], "preserves": { "file": "Configuration.xml", diff --git a/tests/skills/cases/cfe-init/format-221.json b/tests/skills/cases/cfe-init/format-221.json index 2928c11c..56403ff0 100644 --- a/tests/skills/cases/cfe-init/format-221.json +++ b/tests/skills/cases/cfe-init/format-221.json @@ -3,13 +3,13 @@ "setup": "empty-config-221", "params": { "name": "Расш221", - "outputDir": "ext" + "outputDir": "cfe" }, - "validatePath": "ext", + "validatePath": "cfe", "expect": { "fileContains": [ { - "file": "ext/Configuration.xml", + "file": "cfe/Configuration.xml", "text": [ "xmlns:lf=\"http://v8.1c.ru/8.2/managed-application/logform\" xmlns:pal=\"http://v8.1c.ru/8.1/data/ui/colors/palette\" xmlns:style=", "version=\"2.21\"", @@ -18,7 +18,7 @@ ] }, { - "file": "ext/Languages/Русский.xml", + "file": "cfe/Languages/Русский.xml", "text": "xmlns:lf=\"http://v8.1c.ru/8.2/managed-application/logform\" xmlns:pal=\"http://v8.1c.ru/8.1/data/ui/colors/palette\" xmlns:style=" } ] diff --git a/tests/skills/cases/cfe-init/no-role.json b/tests/skills/cases/cfe-init/no-role.json index 737f0ec3..e4511e63 100644 --- a/tests/skills/cases/cfe-init/no-role.json +++ b/tests/skills/cases/cfe-init/no-role.json @@ -1,9 +1,9 @@ { "name": "Расширение без роли", - "params": { "name": "БезРоли", "outputDir": "ext" }, + "params": { "name": "БезРоли", "outputDir": "cfe" }, "args_extra": ["-NoRole"], - "validatePath": "ext", + "validatePath": "cfe", "expect": { - "files": ["ext/Configuration.xml"] + "files": ["cfe/Configuration.xml"] } } diff --git a/tests/skills/cases/cfe-init/patch-purpose.json b/tests/skills/cases/cfe-init/patch-purpose.json index 990c1031..298862f2 100644 --- a/tests/skills/cases/cfe-init/patch-purpose.json +++ b/tests/skills/cases/cfe-init/patch-purpose.json @@ -1,9 +1,9 @@ { "name": "Расширение-исправление (Patch)", - "params": { "name": "Исправление", "outputDir": "ext" }, + "params": { "name": "Исправление", "outputDir": "cfe" }, "args_extra": ["-Purpose", "Patch"], - "validatePath": "ext", + "validatePath": "cfe", "expect": { - "files": ["ext/Configuration.xml"] + "files": ["cfe/Configuration.xml"] } } diff --git a/tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-init/snapshots/addon-purpose/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-init/snapshots/addon-purpose/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/Configuration.xml b/tests/skills/cases/cfe-init/snapshots/addon-purpose/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/Configuration.xml rename to tests/skills/cases/cfe-init/snapshots/addon-purpose/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/Languages/Русский.xml b/tests/skills/cases/cfe-init/snapshots/addon-purpose/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-init/snapshots/addon-purpose/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/Roles/Дополнение_ОсновнаяРоль.xml b/tests/skills/cases/cfe-init/snapshots/addon-purpose/cfe/Roles/Дополнение_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/addon-purpose/ext/Roles/Дополнение_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-init/snapshots/addon-purpose/cfe/Roles/Дополнение_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-init/snapshots/basic/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-init/snapshots/basic/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/basic/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-init/snapshots/basic/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-init/snapshots/basic/ext/Configuration.xml b/tests/skills/cases/cfe-init/snapshots/basic/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/basic/ext/Configuration.xml rename to tests/skills/cases/cfe-init/snapshots/basic/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-init/snapshots/basic/ext/Languages/Русский.xml b/tests/skills/cases/cfe-init/snapshots/basic/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/basic/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-init/snapshots/basic/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-init/snapshots/basic/ext/Roles/МоёРасширение_ОсновнаяРоль.xml b/tests/skills/cases/cfe-init/snapshots/basic/cfe/Roles/МоёРасширение_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/basic/ext/Roles/МоёРасширение_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-init/snapshots/basic/cfe/Roles/МоёРасширение_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-init/snapshots/format-221/Ext/Configuration.xml b/tests/skills/cases/cfe-init/snapshots/format-221/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/format-221/Ext/Configuration.xml rename to tests/skills/cases/cfe-init/snapshots/format-221/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-init/snapshots/format-221/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-init/snapshots/format-221/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/format-221/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-init/snapshots/format-221/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-init/snapshots/format-221/Ext/Roles/Расш221_ОсновнаяРоль.xml b/tests/skills/cases/cfe-init/snapshots/format-221/cfe/Roles/Расш221_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/format-221/Ext/Roles/Расш221_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-init/snapshots/format-221/cfe/Roles/Расш221_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-init/snapshots/no-role/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-init/snapshots/no-role/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/no-role/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-init/snapshots/no-role/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-init/snapshots/no-role/ext/Configuration.xml b/tests/skills/cases/cfe-init/snapshots/no-role/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/no-role/ext/Configuration.xml rename to tests/skills/cases/cfe-init/snapshots/no-role/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-init/snapshots/no-role/ext/Languages/Русский.xml b/tests/skills/cases/cfe-init/snapshots/no-role/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/no-role/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-init/snapshots/no-role/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-init/snapshots/patch-purpose/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-init/snapshots/patch-purpose/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/Configuration.xml b/tests/skills/cases/cfe-init/snapshots/patch-purpose/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/Configuration.xml rename to tests/skills/cases/cfe-init/snapshots/patch-purpose/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/Languages/Русский.xml b/tests/skills/cases/cfe-init/snapshots/patch-purpose/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-init/snapshots/patch-purpose/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/Roles/Исправление_ОсновнаяРоль.xml b/tests/skills/cases/cfe-init/snapshots/patch-purpose/cfe/Roles/Исправление_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/patch-purpose/ext/Roles/Исправление_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-init/snapshots/patch-purpose/cfe/Roles/Исправление_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-prefix/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-init/snapshots/with-prefix/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-prefix/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-init/snapshots/with-prefix/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-prefix/ext/Configuration.xml b/tests/skills/cases/cfe-init/snapshots/with-prefix/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-prefix/ext/Configuration.xml rename to tests/skills/cases/cfe-init/snapshots/with-prefix/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-prefix/ext/Languages/Русский.xml b/tests/skills/cases/cfe-init/snapshots/with-prefix/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-prefix/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-init/snapshots/with-prefix/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-prefix/ext/Roles/РП_ОсновнаяРоль.xml b/tests/skills/cases/cfe-init/snapshots/with-prefix/cfe/Roles/РП_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-prefix/ext/Roles/РП_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-init/snapshots/with-prefix/cfe/Roles/РП_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-init/snapshots/with-version-vendor/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-init/snapshots/with-version-vendor/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/Configuration.xml b/tests/skills/cases/cfe-init/snapshots/with-version-vendor/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/Configuration.xml rename to tests/skills/cases/cfe-init/snapshots/with-version-vendor/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/Languages/Русский.xml b/tests/skills/cases/cfe-init/snapshots/with-version-vendor/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-init/snapshots/with-version-vendor/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/Roles/РасшВерсия_ОсновнаяРоль.xml b/tests/skills/cases/cfe-init/snapshots/with-version-vendor/cfe/Roles/РасшВерсия_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-init/snapshots/with-version-vendor/ext/Roles/РасшВерсия_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-init/snapshots/with-version-vendor/cfe/Roles/РасшВерсия_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-init/with-prefix.json b/tests/skills/cases/cfe-init/with-prefix.json index b976b6dd..363e10be 100644 --- a/tests/skills/cases/cfe-init/with-prefix.json +++ b/tests/skills/cases/cfe-init/with-prefix.json @@ -1,9 +1,9 @@ { "name": "Расширение с явным префиксом", - "params": { "name": "РасшПрефикс", "outputDir": "ext" }, + "params": { "name": "РасшПрефикс", "outputDir": "cfe" }, "args_extra": ["-NamePrefix", "РП_"], - "validatePath": "ext", + "validatePath": "cfe", "expect": { - "files": ["ext/Configuration.xml"] + "files": ["cfe/Configuration.xml"] } } diff --git a/tests/skills/cases/cfe-init/with-version-vendor.json b/tests/skills/cases/cfe-init/with-version-vendor.json index 49287737..1107a82c 100644 --- a/tests/skills/cases/cfe-init/with-version-vendor.json +++ b/tests/skills/cases/cfe-init/with-version-vendor.json @@ -1,9 +1,9 @@ { "name": "Расширение с версией и поставщиком", - "params": { "name": "РасшВерсия", "outputDir": "ext" }, + "params": { "name": "РасшВерсия", "outputDir": "cfe" }, "args_extra": ["-Version", "1.0.0.1", "-Vendor", "ТестКомпания"], - "validatePath": "ext", + "validatePath": "cfe", "expect": { - "files": ["ext/Configuration.xml"] + "files": ["cfe/Configuration.xml"] } } diff --git a/tests/skills/cases/cfe-patch-method/actualize-batch.json b/tests/skills/cases/cfe-patch-method/actualize-batch.json index 8d65973c..2abb0c48 100644 --- a/tests/skills/cases/cfe-patch-method/actualize-batch.json +++ b/tests/skills/cases/cfe-patch-method/actualize-batch.json @@ -14,20 +14,20 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.БатчМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.БатчМод" } }, { "writeFile": { - "path": "ext/CommonModules/БатчМод/Ext/Module.bsl", + "path": "cfe/CommonModules/БатчМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"РасчётА\")\nФункция Тест_РасчётА()\n\tХ = 1;\n\tВозврат Х;\nКонецФункции\n&ИзменениеИКонтроль(\"РасчётБ\")\nФункция Тест_РасчётБ()\n\tY = 2;\n\tВозврат Y;\nКонецФункции\n#КонецОбласти\n" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "args_extra": ["-Actualize"], "expect": { "stdoutContains": "актуализировано: 1" } } diff --git a/tests/skills/cases/cfe-patch-method/after-handler.json b/tests/skills/cases/cfe-patch-method/after-handler.json index 5c34f9c2..a217d4a1 100644 --- a/tests/skills/cases/cfe-patch-method/after-handler.json +++ b/tests/skills/cases/cfe-patch-method/after-handler.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "Catalog.Товары.ObjectModule", "methodName": "ПриЗаписи", "interceptorType": "After" diff --git a/tests/skills/cases/cfe-patch-method/before-handler.json b/tests/skills/cases/cfe-patch-method/before-handler.json index 80a7dcd3..d72cf00e 100644 --- a/tests/skills/cases/cfe-patch-method/before-handler.json +++ b/tests/skills/cases/cfe-patch-method/before-handler.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "Catalog.Товары.ObjectModule", "methodName": "ПриЗаписи", "interceptorType": "Before" @@ -30,7 +30,7 @@ "expect": { "stdoutContains": "&Перед(\"ПриЗаписи\")", "preserves": { - "file": "Ext/Catalogs/Товары/Ext/ObjectModule.bsl", + "file": "cfe/Catalogs/Товары/Ext/ObjectModule.bsl", "bom": true, "eol": "crlf" } diff --git a/tests/skills/cases/cfe-patch-method/check-clean.json b/tests/skills/cases/cfe-patch-method/check-clean.json index 2055a03c..51b96795 100644 --- a/tests/skills/cases/cfe-patch-method/check-clean.json +++ b/tests/skills/cases/cfe-patch-method/check-clean.json @@ -14,20 +14,20 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.БатчМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.БатчМод" } }, { "writeFile": { - "path": "ext/CommonModules/БатчМод/Ext/Module.bsl", + "path": "cfe/CommonModules/БатчМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"РасчётА\")\nФункция Тест_РасчётА()\n\tХ = 1;\n\tВозврат Х;\nКонецФункции\n&ИзменениеИКонтроль(\"РасчётБ\")\nФункция Тест_РасчётБ()\n\tY = 2;\n\tВозврат Y;\nКонецФункции\n#КонецОбласти\n" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "args_extra": ["-Check"], "expect": { "stdoutContains": "2/2 актуальны" } } diff --git a/tests/skills/cases/cfe-patch-method/check-drift.json b/tests/skills/cases/cfe-patch-method/check-drift.json index cfd7b9fd..1090a755 100644 --- a/tests/skills/cases/cfe-patch-method/check-drift.json +++ b/tests/skills/cases/cfe-patch-method/check-drift.json @@ -14,20 +14,20 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.БатчМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.БатчМод" } }, { "writeFile": { - "path": "ext/CommonModules/БатчМод/Ext/Module.bsl", + "path": "cfe/CommonModules/БатчМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"РасчётА\")\nФункция Тест_РасчётА()\n\tХ = 1;\n\tВозврат Х;\nКонецФункции\n&ИзменениеИКонтроль(\"РасчётБ\")\nФункция Тест_РасчётБ()\n\tY = 2;\n\tВозврат Y;\nКонецФункции\n#КонецОбласти\n" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "args_extra": ["-Check"], "expectError": true } diff --git a/tests/skills/cases/cfe-patch-method/document-manager.json b/tests/skills/cases/cfe-patch-method/document-manager.json index 8a31279a..1e036095 100644 --- a/tests/skills/cases/cfe-patch-method/document-manager.json +++ b/tests/skills/cases/cfe-patch-method/document-manager.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Document.ПриходТоваров" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Document.ПриходТоваров" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "Document.ПриходТоваров.ManagerModule", "methodName": "ОбработкаПолученияДанныхВыбора", "interceptorType": "Before" diff --git a/tests/skills/cases/cfe-patch-method/filepath-mode.json b/tests/skills/cases/cfe-patch-method/filepath-mode.json index d9d65069..623565f7 100644 --- a/tests/skills/cases/cfe-patch-method/filepath-mode.json +++ b/tests/skills/cases/cfe-patch-method/filepath-mode.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ФПМодуль" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ФПМодуль" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModules/ФПМодуль/Ext/Module.bsl", "methodName": "ОбработатьДанные", "interceptorType": "Before" diff --git a/tests/skills/cases/cfe-patch-method/form-handler.json b/tests/skills/cases/cfe-patch-method/form-handler.json index 2aa2c410..c71835b3 100644 --- a/tests/skills/cases/cfe-patch-method/form-handler.json +++ b/tests/skills/cases/cfe-patch-method/form-handler.json @@ -27,15 +27,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары.Form.ФормаЭлемента" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары.Form.ФормаЭлемента" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "Catalog.Товары.Form.ФормаЭлемента", "methodName": "ОбработкаОповещения", "interceptorType": "After" diff --git a/tests/skills/cases/cfe-patch-method/guard-function.json b/tests/skills/cases/cfe-patch-method/guard-function.json index 680cc2d9..34b1841d 100644 --- a/tests/skills/cases/cfe-patch-method/guard-function.json +++ b/tests/skills/cases/cfe-patch-method/guard-function.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль3" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль3" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ОбщийМодуль3", "methodName": "Вычислить", "interceptorType": "After" diff --git a/tests/skills/cases/cfe-patch-method/instead-function.json b/tests/skills/cases/cfe-patch-method/instead-function.json index 4f639787..2bebf644 100644 --- a/tests/skills/cases/cfe-patch-method/instead-function.json +++ b/tests/skills/cases/cfe-patch-method/instead-function.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль2" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль2" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ОбщийМодуль2", "methodName": "ПолучитьЗначение", "interceptorType": "Instead" diff --git a/tests/skills/cases/cfe-patch-method/mod-and-control.json b/tests/skills/cases/cfe-patch-method/mod-and-control.json index d9f09a54..3f197e21 100644 --- a/tests/skills/cases/cfe-patch-method/mod-and-control.json +++ b/tests/skills/cases/cfe-patch-method/mod-and-control.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль1" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ОбщийМодуль1" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ОбщийМодуль1", "methodName": "ПолучитьДанные", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/preproc-wrap.json b/tests/skills/cases/cfe-patch-method/preproc-wrap.json index e8242e6b..99a1b1c8 100644 --- a/tests/skills/cases/cfe-patch-method/preproc-wrap.json +++ b/tests/skills/cases/cfe-patch-method/preproc-wrap.json @@ -14,15 +14,15 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Document.РасходТоваров" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Document.РасходТоваров" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "Document.РасходТоваров.ObjectModule", "methodName": "ОбработкаПроведения", "interceptorType": "Before" diff --git a/tests/skills/cases/cfe-patch-method/reanchor-comment-stable.json b/tests/skills/cases/cfe-patch-method/reanchor-comment-stable.json index b72b9d67..272e2b5a 100644 --- a/tests/skills/cases/cfe-patch-method/reanchor-comment-stable.json +++ b/tests/skills/cases/cfe-patch-method/reanchor-comment-stable.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПрозрМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПрозрМод" } }, { "writeFile": { - "path": "ext/CommonModules/ПрозрМод/Ext/Module.bsl", + "path": "cfe/CommonModules/ПрозрМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"П\")\nПроцедура Тест_П()\n\tРассчитатьСумму();\n\t// Проверка лимита\n#Вставка\n\tПроверитьЛимит();\n#КонецВставки\n\tЗаписать();\nКонецПроцедуры\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ПрозрМод", "methodName": "П", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/region-reuse.json b/tests/skills/cases/cfe-patch-method/region-reuse.json index ae54a14c..82438507 100644 --- a/tests/skills/cases/cfe-patch-method/region-reuse.json +++ b/tests/skills/cases/cfe-patch-method/region-reuse.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РеюзМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РеюзМод" } }, { "writeFile": { - "path": "ext/CommonModules/РеюзМод/Ext/Module.bsl", + "path": "cfe/CommonModules/РеюзМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n\n&Перед(\"МетодА\")\nПроцедура Тест_МетодА(П)\n\t// уже есть\nКонецПроцедуры\n\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.РеюзМод", "methodName": "МетодБ", "interceptorType": "Before" diff --git a/tests/skills/cases/cfe-patch-method/resync-conflict.json b/tests/skills/cases/cfe-patch-method/resync-conflict.json index d7e76d26..806cb248 100644 --- a/tests/skills/cases/cfe-patch-method/resync-conflict.json +++ b/tests/skills/cases/cfe-patch-method/resync-conflict.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РесинкКонфл" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РесинкКонфл" } }, { "writeFile": { - "path": "ext/CommonModules/РесинкКонфл/Ext/Module.bsl", + "path": "cfe/CommonModules/РесинкКонфл/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"Расчёт\")\nФункция Тест_Расчёт(А, Б)\n\tИтог = 0;\n\tДля Сч = 1 По А Цикл\n#Вставка\n\t\tИтог = Итог + Б;\n#КонецВставки\n\t\tИтог = Итог + 1;\n\tКонецЦикла;\n\tВозврат Итог;\nКонецФункции\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.РесинкКонфл", "methodName": "Расчёт", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/resync-noop.json b/tests/skills/cases/cfe-patch-method/resync-noop.json index c7c80e67..e2bd00d4 100644 --- a/tests/skills/cases/cfe-patch-method/resync-noop.json +++ b/tests/skills/cases/cfe-patch-method/resync-noop.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РесинкМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РесинкМод" } }, { "writeFile": { - "path": "ext/CommonModules/РесинкМод/Ext/Module.bsl", + "path": "cfe/CommonModules/РесинкМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"Расчёт\")\nФункция Тест_Расчёт(А, Б)\n\tИтог = 0;\n#Вставка\n\tИтог = 100;\n#КонецВставки\n\tИтог = А + Б;\n\tВозврат Итог;\nКонецФункции\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.РесинкМод", "methodName": "Расчёт", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/resync-reanchor.json b/tests/skills/cases/cfe-patch-method/resync-reanchor.json index 6976c86f..f995f273 100644 --- a/tests/skills/cases/cfe-patch-method/resync-reanchor.json +++ b/tests/skills/cases/cfe-patch-method/resync-reanchor.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РеанкорМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.РеанкорМод" } }, { "writeFile": { - "path": "ext/CommonModules/РеанкорМод/Ext/Module.bsl", + "path": "cfe/CommonModules/РеанкорМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"П\")\nПроцедура Тест_П(Сп)\n\tДля Каждого Э Из Сп Цикл\n\t\tЭ.Обработать();\n\tКонецЦикла;\n#Вставка\n\tСообщить(\"вставка\");\n#КонецВставки\n\tСообщить(\"A\");\n\tДля Каждого Э Из Сп Цикл\n\t\tЭ.Проверить();\n\tКонецЦикла;\nКонецПроцедуры\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.РеанкорМод", "methodName": "П", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/CommonModules/БатчМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/CommonModules/БатчМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/CommonModules/БатчМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/CommonModules/БатчМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/CommonModules/БатчМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/CommonModules/БатчМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/CommonModules/БатчМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/CommonModules/БатчМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/actualize-batch/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-patch-method/snapshots/after-handler/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-patch-method/snapshots/after-handler/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Catalogs/Товары/Ext/ObjectModule.bsl b/tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Catalogs/Товары/Ext/ObjectModule.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Catalogs/Товары/Ext/ObjectModule.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Catalogs/Товары/Ext/ObjectModule.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/after-handler/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/after-handler/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-patch-method/snapshots/before-handler/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-patch-method/snapshots/before-handler/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Catalogs/Товары/Ext/ObjectModule.bsl b/tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Catalogs/Товары/Ext/ObjectModule.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Catalogs/Товары/Ext/ObjectModule.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Catalogs/Товары/Ext/ObjectModule.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/before-handler/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/before-handler/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/CommonModules/БатчМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/CommonModules/БатчМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/CommonModules/БатчМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/CommonModules/БатчМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/CommonModules/БатчМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/CommonModules/БатчМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/CommonModules/БатчМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/CommonModules/БатчМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/check-clean/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/check-clean/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-patch-method/snapshots/document-manager/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-patch-method/snapshots/document-manager/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Documents/ПриходТоваров.xml b/tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Documents/ПриходТоваров.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Documents/ПриходТоваров.xml rename to tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Documents/ПриходТоваров.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Documents/ПриходТоваров/Ext/ManagerModule.bsl b/tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Documents/ПриходТоваров/Ext/ManagerModule.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Documents/ПриходТоваров/Ext/ManagerModule.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Documents/ПриходТоваров/Ext/ManagerModule.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/document-manager/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/document-manager/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/CommonModules/ФПМодуль.xml b/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/CommonModules/ФПМодуль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/CommonModules/ФПМодуль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/CommonModules/ФПМодуль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/CommonModules/ФПМодуль/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/CommonModules/ФПМодуль/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/CommonModules/ФПМодуль/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/CommonModules/ФПМодуль/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/filepath-mode/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары/Forms/ФормаЭлемента.xml b/tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары/Forms/ФормаЭлемента.xml rename to tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары/Forms/ФормаЭлемента.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml b/tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml rename to tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Catalogs/Товары/Forms/ФормаЭлемента/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/form-handler/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/form-handler/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/CommonModules/ОбщийМодуль2.xml b/tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/CommonModules/ОбщийМодуль2.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/CommonModules/ОбщийМодуль2.xml rename to tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/CommonModules/ОбщийМодуль2.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/CommonModules/ОбщийМодуль2/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/CommonModules/ОбщийМодуль2/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/CommonModules/ОбщийМодуль2/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/CommonModules/ОбщийМодуль2/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/instead-function/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/instead-function/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/CommonModules/ОбщийМодуль1.xml b/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/CommonModules/ОбщийМодуль1.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/CommonModules/ОбщийМодуль1.xml rename to tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/CommonModules/ОбщийМодуль1.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/CommonModules/ОбщийМодуль1/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/CommonModules/ОбщийМодуль1/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/CommonModules/ОбщийМодуль1/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/CommonModules/ОбщийМодуль1/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/mod-and-control/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Documents/РасходТоваров.xml b/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Documents/РасходТоваров.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Documents/РасходТоваров.xml rename to tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Documents/РасходТоваров.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Documents/РасходТоваров/Ext/ObjectModule.bsl b/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Documents/РасходТоваров/Ext/ObjectModule.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Documents/РасходТоваров/Ext/ObjectModule.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Documents/РасходТоваров/Ext/ObjectModule.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/preproc-wrap/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/CommonModules/ПрозрМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/CommonModules/ПрозрМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/CommonModules/ПрозрМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/CommonModules/ПрозрМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/CommonModules/ПрозрМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/CommonModules/ПрозрМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/CommonModules/ПрозрМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/CommonModules/ПрозрМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/reanchor-comment-stable/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/CommonModules/РеюзМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/CommonModules/РеюзМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/CommonModules/РеюзМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/CommonModules/РеюзМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/CommonModules/РеюзМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/CommonModules/РеюзМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/CommonModules/РеюзМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/CommonModules/РеюзМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/region-reuse/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/region-reuse/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/CommonModules/РесинкКонфл.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/CommonModules/РесинкКонфл.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/CommonModules/РесинкКонфл.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/CommonModules/РесинкКонфл.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/CommonModules/РесинкКонфл/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/CommonModules/РесинкКонфл/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/CommonModules/РесинкКонфл/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/CommonModules/РесинкКонфл/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-conflict/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/CommonModules/РесинкМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/CommonModules/РесинкМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/CommonModules/РесинкМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/CommonModules/РесинкМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/CommonModules/РесинкМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/CommonModules/РесинкМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/CommonModules/РесинкМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/CommonModules/РесинкМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-noop/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-noop/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/CommonModules/РеанкорМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/CommonModules/РеанкорМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/CommonModules/РеанкорМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/CommonModules/РеанкорМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/CommonModules/РеанкорМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/CommonModules/РеанкорМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/CommonModules/РеанкорМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/CommonModules/РеанкорМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/resync-reanchor/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/CommonModules/ПрозрМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/CommonModules/ПрозрМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/CommonModules/ПрозрМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/CommonModules/ПрозрМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/CommonModules/ПрозрМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/CommonModules/ПрозрМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/CommonModules/ПрозрМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/CommonModules/ПрозрМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-blankskew/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/CommonModules/ПереносМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/CommonModules/ПереносМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/CommonModules/ПереносМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/CommonModules/ПереносМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/CommonModules/ПереносМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/CommonModules/ПереносМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/CommonModules/ПереносМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/CommonModules/ПереносМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-delete/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/CommonModules/ПереносМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/CommonModules/ПереносМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/CommonModules/ПереносМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/CommonModules/ПереносМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/CommonModules/ПереносМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/CommonModules/ПереносМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/CommonModules/ПереносМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/CommonModules/ПереносМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-insert/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/CommonModules/ПрозрМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/CommonModules/ПрозрМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/CommonModules/ПрозрМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/CommonModules/ПрозрМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/CommonModules/ПрозрМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/CommonModules/ПрозрМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/CommonModules/ПрозрМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/CommonModules/ПрозрМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-orphan-comment/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/CommonModules/ПереносМод.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/CommonModules/ПереносМод.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/CommonModules/ПереносМод.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/CommonModules/ПереносМод.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/CommonModules/ПереносМод/Ext/Module.bsl b/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/CommonModules/ПереносМод/Ext/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/CommonModules/ПереносМод/Ext/Module.bsl rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/CommonModules/ПереносМод/Ext/Module.bsl diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/Configuration.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/Configuration.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-patch-method/snapshots/transferred-partial/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-patch-method/transferred-blankskew.json b/tests/skills/cases/cfe-patch-method/transferred-blankskew.json index 127d2572..3da3edf4 100644 --- a/tests/skills/cases/cfe-patch-method/transferred-blankskew.json +++ b/tests/skills/cases/cfe-patch-method/transferred-blankskew.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПрозрМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПрозрМод" } }, { "writeFile": { - "path": "ext/CommonModules/ПрозрМод/Ext/Module.bsl", + "path": "cfe/CommonModules/ПрозрМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"П\")\nПроцедура Тест_П()\n\tА();\n#Вставка\n\tБ();\n#КонецВставки\n\tВ();\nКонецПроцедуры\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ПрозрМод", "methodName": "П", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/transferred-delete.json b/tests/skills/cases/cfe-patch-method/transferred-delete.json index f5f6bca6..dc428b60 100644 --- a/tests/skills/cases/cfe-patch-method/transferred-delete.json +++ b/tests/skills/cases/cfe-patch-method/transferred-delete.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПереносМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПереносМод" } }, { "writeFile": { - "path": "ext/CommonModules/ПереносМод/Ext/Module.bsl", + "path": "cfe/CommonModules/ПереносМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"П\")\nПроцедура Тест_П()\n\tШаг1();\n#Удаление\n\tШаг2();\n#КонецУдаления\n\tШаг3();\nКонецПроцедуры\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ПереносМод", "methodName": "П", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/transferred-insert.json b/tests/skills/cases/cfe-patch-method/transferred-insert.json index 011c04d1..62cec465 100644 --- a/tests/skills/cases/cfe-patch-method/transferred-insert.json +++ b/tests/skills/cases/cfe-patch-method/transferred-insert.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПереносМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПереносМод" } }, { "writeFile": { - "path": "ext/CommonModules/ПереносМод/Ext/Module.bsl", + "path": "cfe/CommonModules/ПереносМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"П\")\nПроцедура Тест_П(Спр)\n\tНачатьТранзакцию();\n#Вставка\n\tСпр.Записать();\n#КонецВставки\n\tЗафиксироватьТранзакцию();\nКонецПроцедуры\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ПереносМод", "methodName": "П", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/transferred-orphan-comment.json b/tests/skills/cases/cfe-patch-method/transferred-orphan-comment.json index d47b0d4c..79a5a0ed 100644 --- a/tests/skills/cases/cfe-patch-method/transferred-orphan-comment.json +++ b/tests/skills/cases/cfe-patch-method/transferred-orphan-comment.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПрозрМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПрозрМод" } }, { "writeFile": { - "path": "ext/CommonModules/ПрозрМод/Ext/Module.bsl", + "path": "cfe/CommonModules/ПрозрМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"П\")\nПроцедура Тест_П()\n\tПодготовитьДанные();\n#Вставка\n\t// ВАЖНО: обходим баг\n\tОбойтиБаг();\n#КонецВставки\n\tСохранить();\nКонецПроцедуры\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ПрозрМод", "methodName": "П", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-patch-method/transferred-partial.json b/tests/skills/cases/cfe-patch-method/transferred-partial.json index 8f2b5403..3023b841 100644 --- a/tests/skills/cases/cfe-patch-method/transferred-partial.json +++ b/tests/skills/cases/cfe-patch-method/transferred-partial.json @@ -14,21 +14,21 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПереносМод" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "CommonModule.ПереносМод" } }, { "writeFile": { - "path": "ext/CommonModules/ПереносМод/Ext/Module.bsl", + "path": "cfe/CommonModules/ПереносМод/Ext/Module.bsl", "content": "#Область ПрограммныйИнтерфейс\n&ИзменениеИКонтроль(\"П\")\nПроцедура Тест_П(Спр)\n\tНачатьТранзакцию();\n#Вставка\n\tСпр.Записать();\n#КонецВставки\n\tЗафиксироватьТранзакцию();\n\tСообщить(\"готово\");\n#Вставка\n\tЗаписатьВЖурнал();\n#КонецВставки\nКонецПроцедуры\n#КонецОбласти\n" } } ], "params": { - "extensionPath": "ext", + "extensionPath": "cfe", "modulePath": "CommonModule.ПереносМод", "methodName": "П", "interceptorType": "ModificationAndControl" diff --git a/tests/skills/cases/cfe-validate/additional-columns-missing-ts.json b/tests/skills/cases/cfe-validate/additional-columns-missing-ts.json index 2b8c8c8c..3482e48a 100644 --- a/tests/skills/cases/cfe-validate/additional-columns-missing-ts.json +++ b/tests/skills/cases/cfe-validate/additional-columns-missing-ts.json @@ -35,14 +35,14 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Document.ЗаказКлиента.Form.ФормаДокумента", "-BorrowMainAttribute": "Form" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Document.ЗаказКлиента.Form.ФормаДокумента", "-BorrowMainAttribute": "Form" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "expectError": true, "expect": { "stdoutContains": "TabularSection.Оплата" } } diff --git a/tests/skills/cases/cfe-validate/list-form-no-false-paths.json b/tests/skills/cases/cfe-validate/list-form-no-false-paths.json index 0d40a369..3d1bcf47 100644 --- a/tests/skills/cases/cfe-validate/list-form-no-false-paths.json +++ b/tests/skills/cases/cfe-validate/list-form-no-false-paths.json @@ -18,14 +18,14 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Document.Расход.Form.ФормаСписка", "-BorrowMainAttribute": "Form" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Document.Расход.Form.ФормаСписка", "-BorrowMainAttribute": "Form" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "args_extra": ["-ConfigPath", "{workDir}"], "expect": { "stdoutNotContains": ["Список.DefaultPicture", "Список.ПредставлениеСостояния"] diff --git a/tests/skills/cases/cfe-validate/object-paths-vs-config.json b/tests/skills/cases/cfe-validate/object-paths-vs-config.json index f96e6793..a46c7479 100644 --- a/tests/skills/cases/cfe-validate/object-paths-vs-config.json +++ b/tests/skills/cases/cfe-validate/object-paths-vs-config.json @@ -29,14 +29,14 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Document.ЗаказКлиента.Form.ФормаДокумента", "-BorrowMainAttribute": "Form" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Document.ЗаказКлиента.Form.ФормаДокумента", "-BorrowMainAttribute": "Form" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "args_extra": ["-ConfigPath", "{workDir}"], "expectError": true, "expect": { "stdoutContains": "Объект.Товары.Артикул" } diff --git a/tests/skills/cases/cfe-validate/patch-extension.json b/tests/skills/cases/cfe-validate/patch-extension.json index 6ad586a6..3dc78c0b 100644 --- a/tests/skills/cases/cfe-validate/patch-extension.json +++ b/tests/skills/cases/cfe-validate/patch-extension.json @@ -3,8 +3,8 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Исправление", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Purpose": "Patch" } + "args": { "-Name": "Исправление", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Purpose": "Patch" } } ], - "params": { "extensionPath": "ext" } + "params": { "extensionPath": "cfe" } } diff --git a/tests/skills/cases/cfe-validate/register-record-paths.json b/tests/skills/cases/cfe-validate/register-record-paths.json index 6465ddd1..0dac5853 100644 --- a/tests/skills/cases/cfe-validate/register-record-paths.json +++ b/tests/skills/cases/cfe-validate/register-record-paths.json @@ -22,14 +22,14 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "InformationRegister.Настройка.Form.ФормаЗаписи", "-BorrowMainAttribute": "Form" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "InformationRegister.Настройка.Form.ФормаЗаписи", "-BorrowMainAttribute": "Form" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "args_extra": ["-ConfigPath", "{workDir}"], "expect": { "stdoutNotContains": ["Запись.Организация", "Запись.Лимит"] diff --git a/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Configuration.xml b/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Configuration.xml rename to tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход.xml b/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход.xml rename to tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход/Forms/ФормаСписка.xml b/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход/Forms/ФормаСписка.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход/Forms/ФормаСписка.xml rename to tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход/Forms/ФормаСписка.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml b/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml rename to tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl b/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Documents/Расход/Forms/ФормаСписка/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-validate/snapshots/list-form-no-false-paths/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-validate/snapshots/patch-extension/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-validate/snapshots/patch-extension/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/Configuration.xml b/tests/skills/cases/cfe-validate/snapshots/patch-extension/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/Configuration.xml rename to tests/skills/cases/cfe-validate/snapshots/patch-extension/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/Languages/Русский.xml b/tests/skills/cases/cfe-validate/snapshots/patch-extension/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-validate/snapshots/patch-extension/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/Roles/Исправление_ОсновнаяРоль.xml b/tests/skills/cases/cfe-validate/snapshots/patch-extension/cfe/Roles/Исправление_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/patch-extension/ext/Roles/Исправление_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-validate/snapshots/patch-extension/cfe/Roles/Исправление_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/Configuration.xml b/tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/Configuration.xml rename to tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка.xml b/tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка.xml rename to tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml b/tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml rename to tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml b/tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml rename to tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl b/tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl rename to tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/InformationRegisters/Настройка/Forms/ФормаЗаписи/Ext/Form/Module.bsl diff --git a/tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/Languages/Русский.xml b/tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/Languages/Русский.xml rename to tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/register-record-paths/Ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-validate/snapshots/register-record-paths/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/valid/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-validate/snapshots/valid/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/valid/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-validate/snapshots/valid/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/valid/ext/Configuration.xml b/tests/skills/cases/cfe-validate/snapshots/valid/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/valid/ext/Configuration.xml rename to tests/skills/cases/cfe-validate/snapshots/valid/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/valid/ext/Languages/Русский.xml b/tests/skills/cases/cfe-validate/snapshots/valid/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/valid/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-validate/snapshots/valid/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/valid/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-validate/snapshots/valid/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/valid/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-validate/snapshots/valid/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/ClientApplicationInterface.xml b/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/Ext/ClientApplicationInterface.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/ClientApplicationInterface.xml rename to tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/Ext/ClientApplicationInterface.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Catalogs/Товары.xml b/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Catalogs/Товары.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Catalogs/Товары.xml rename to tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Catalogs/Товары.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Configuration.xml b/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Configuration.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Configuration.xml rename to tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Configuration.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Languages/Русский.xml b/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Languages/Русский.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Languages/Русский.xml rename to tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Languages/Русский.xml diff --git a/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Roles/Тест_ОсновнаяРоль.xml b/tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Roles/Тест_ОсновнаяРоль.xml similarity index 100% rename from tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/ext/Roles/Тест_ОсновнаяРоль.xml rename to tests/skills/cases/cfe-validate/snapshots/with-borrowed-object/cfe/Roles/Тест_ОсновнаяРоль.xml diff --git a/tests/skills/cases/cfe-validate/valid.json b/tests/skills/cases/cfe-validate/valid.json index e91c5ecb..5c613a01 100644 --- a/tests/skills/cases/cfe-validate/valid.json +++ b/tests/skills/cases/cfe-validate/valid.json @@ -3,9 +3,9 @@ "preRun": [ { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "expect": { "stdoutContains": "=== Validation OK: Extension.Тест" } } diff --git a/tests/skills/cases/cfe-validate/with-borrowed-object.json b/tests/skills/cases/cfe-validate/with-borrowed-object.json index 96dae553..29061c0a 100644 --- a/tests/skills/cases/cfe-validate/with-borrowed-object.json +++ b/tests/skills/cases/cfe-validate/with-borrowed-object.json @@ -8,13 +8,13 @@ }, { "script": "cfe-init/scripts/cfe-init", - "args": { "-Name": "Тест", "-OutputDir": "{workDir}/ext", "-ConfigPath": "{workDir}" } + "args": { "-Name": "Тест", "-OutputDir": "{workDir}/cfe", "-ConfigPath": "{workDir}" } }, { "script": "cfe-borrow/scripts/cfe-borrow", - "args": { "-ExtensionPath": "{workDir}/ext", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } + "args": { "-ExtensionPath": "{workDir}/cfe", "-ConfigPath": "{workDir}", "-Object": "Catalog.Товары" } } ], - "params": { "extensionPath": "ext" }, + "params": { "extensionPath": "cfe" }, "expect": { "stdoutContains": "=== Validation OK: Extension.Тест" } } diff --git a/tests/skills/runner.mjs b/tests/skills/runner.mjs index 8b9b3c71..c097a82e 100644 --- a/tests/skills/runner.mjs +++ b/tests/skills/runner.mjs @@ -736,6 +736,21 @@ async function runCaseAsync(testCase, opts) { workDir = workspace.path; copyCaseFiles(caseData, workDir, skillCasesDir); + // Каталог расширения не должен совпадать по имени — БЕЗ УЧЁТА РЕГИСТРА — с тем, что фикстура + // уже положила в корень конфигурации. На регистронезависимой ФС (Windows, APFS) такие каталоги + // сливаются в один: кейсы cfe-* просили `ext`, а cf-init создаёт платформенный `Ext/`, и эталон + // годами фиксировал слипшееся дерево, верное только на этих ФС (issue #74). + const extRel = caseData.params?.extensionPath || caseData.params?.outputDir; + if (typeof extRel === 'string' && extRel && extRel !== '.' && !extRel.includes('/') && !extRel.includes('\\')) { + const clash = readdirSync(workDir).find(e => e.toLowerCase() === extRel.toLowerCase()); + if (clash) { + throw new Error( + `Каталог расширения "${extRel}" совпадает с "${clash}" из фикстуры конфигурации.\n` + + ` На регистронезависимой ФС это один каталог — эталон зафиксирует слипшееся дерево.\n` + + ` Назовите каталог иначе (в кейсах cfe-* принято "cfe").`); + } + } + // Pre-run steps if (caseData.preRun) { for (const step of caseData.preRun) { diff --git a/tests/skills/verify-snapshots.mjs b/tests/skills/verify-snapshots.mjs index 2b88d482..e60b1c6c 100644 --- a/tests/skills/verify-snapshots.mjs +++ b/tests/skills/verify-snapshots.mjs @@ -692,6 +692,37 @@ const EPF_SKILLS = new Map([ // route is auto-detected after the main script runs. const EPF_OR_CONFIG_SKILLS = new Set(['template-add', 'help-add']); +// Режим совместимости конфигурации против версии платформы: "Version8_3_27" на 8.3.24 не +// загрузится. Возвращает причину пропуска либо null, если платформа подходит. +function compatibilityGap(configDir, v8path) { + const cfgFile = join(configDir, 'Configuration.xml'); + if (!existsSync(cfgFile)) return null; + const m = /Version(\d+)_(\d+)_(\d+)<\/CompatibilityMode>/.exec(readFileSync(cfgFile, 'utf8')); + if (!m) return null; + const need = [+m[1], +m[2], +m[3]]; + const p = /(\d+)\.(\d+)\.(\d+)/.exec(v8path || ''); + if (!p) return null; + const have = [+p[1], +p[2], +p[3]]; + for (let i = 0; i < 3; i++) { + if (have[i] > need[i]) return null; + if (have[i] < need[i]) { + return `режим совместимости ${need.join('.')} выше платформы ${have.join('.')} — запустите с --v8path`; + } + } + return null; +} + +// Аргументы cf-init для вариантов пустой конфигурации. Копия таблицы EMPTY_CONFIGS из +// runner.mjs — держать одинаковыми: разойдутся, и верификация пойдёт не на том формате, +// на котором прогонялся кейс. +const EMPTY_CONFIG_ARGS = { + 'empty-config': [], + 'empty-config-218': ['-FormatVersion', '2.18', '-CompatibilityMode', 'Version8_3_24'], + 'empty-config-220': ['-FormatVersion', '2.20', '-CompatibilityMode', 'Version8_3_27'], + 'empty-config-220-compat24': ['-FormatVersion', '2.20', '-CompatibilityMode', 'Version8_3_24'], + 'empty-config-221': ['-FormatVersion', '2.21', '-CompatibilityMode', 'Version8_3_27'], +}; + // CFE skills — two-stage load: base config → extension const CFE_SKILLS = new Set([ 'cfe-init', 'cfe-borrow', 'cfe-patch-method', @@ -737,8 +768,12 @@ async function verifyCase(skillName, caseName, skillConfig, caseData, opts) { } }; - // Determine config dir - const setupType = skillConfig.setup || 'empty-config'; + // Determine config dir. + // setup кейса перекрывает setup навыка — как в runner.mjs. Без этого кейсы с гейтом по версии + // формата (empty-config-218/220/221) проверялись на конфигурации 2.17, то есть платформа не + // видела ровно того поведения, ради которого кейс написан. + const caseSetup = typeof caseData.setup === 'string' ? caseData.setup : null; + const setupType = (caseSetup && caseSetup.startsWith('empty-config')) ? caseSetup : (skillConfig.setup || 'empty-config'); const isStandalone = STANDALONE_SKILLS.has(skillName); let epfExt = EPF_SKILLS.get(skillName); let isEpf = !!epfExt; @@ -746,7 +781,7 @@ async function verifyCase(skillName, caseName, skillConfig, caseData, opts) { // For 'empty-config': workDir is the config (setup creates it) // For cf-init: workDir becomes the config after the script runs // For 'none' + non-special: no config (standalone/EPF) - let configDir = (setupType === 'empty-config' || isCfInit) ? workDir : null; + let configDir = (setupType.startsWith('empty-config') || isCfInit) ? workDir : null; try { // ── Step 0: Case-level fixture/external setup (runner.mjs compatibility) ── @@ -783,10 +818,11 @@ async function verifyCase(skillName, caseName, skillConfig, caseData, opts) { const caseProvidedConfig = typeof caseData.setup === 'string' && (caseData.setup.startsWith('external:') || caseData.setup.startsWith('fixture:')); // Skip setup for cf-init skill — the test itself creates the config - if (configDir && setupType === 'empty-config' && !CONFIG_INIT_SKILLS.has(skillName) && !caseProvidedConfig) { + if (configDir && setupType.startsWith('empty-config') && !CONFIG_INIT_SKILLS.has(skillName) && !caseProvidedConfig) { try { - execSkill(opts.runtime, 'cf-init/scripts/cf-init', ['-Name', 'VerifyTest', '-OutputDir', workDir]); - log('cf-init', true); + const initArgs = ['-Name', 'VerifyTest', '-OutputDir', workDir, ...(EMPTY_CONFIG_ARGS[setupType] || [])]; + execSkill(opts.runtime, 'cf-init/scripts/cf-init', initArgs); + log('cf-init', true, (EMPTY_CONFIG_ARGS[setupType] || []).join(' ')); } catch (e) { log('cf-init', false, e.stderr || e.message); result.errors.push(`cf-init failed: ${(e.stderr || e.message).substring(0, 500)}`); @@ -928,6 +964,19 @@ async function verifyCase(skillName, caseName, skillConfig, caseData, opts) { } if (inputFile && existsSync(inputFile)) rmSync(inputFile); + // Режим совместимости конфигурации выше платформы — она такую не загрузит. Это свойство + // стенда, а не дефект кейса, поэтому пропускаем с причиной: иначе на машине без нужной + // платформы кейсы с гейтом по версии формата давали бы ложное падение. + if (opts.v8ctx && configDir) { + const compatSkip = compatibilityGap(configDir, opts.v8ctx.v8path); + if (compatSkip) { + result.skipped = true; + result.skipReason = compatSkip; + log('platform-load', true, `skipped (${compatSkip})`); + return result; + } + } + // ── Step 5: Determine verification strategy ── if (SKD_PLATFORM_VERIFY.has(skillName)) { // Wrap produced Template.xml in an external report (ERF) and try to build — @@ -1085,8 +1134,16 @@ async function verifyCase(skillName, caseName, skillConfig, caseData, opts) { } if (CFE_SKILLS.has(skillName)) { - // CFE: two-stage load — base config first, then extension - const extDir = join(workDir, 'ext'); + // CFE: two-stage load — base config first, then extension. + // Каталог расширения берём из кейса, а не хардкодим: при жёстком 'ext' кейс, назвавший + // каталог иначе, молча терял вторую половину проверки — блок ниже обходился по existsSync, + // и в отчёте это выглядело как успех. + const extRel = caseData.params?.extensionPath || caseData.params?.outputDir; + if (!extRel || extRel === '.') { + result.errors.push('CFE verify требует params.extensionPath (или params.outputDir) с каталогом расширения'); + return result; + } + const extDir = join(workDir, extRel); const baseConfigDir = workDir; // preRun puts base config directly in workDir const dbDir = join(workDir, 'testdb'); @@ -1124,6 +1181,16 @@ async function verifyCase(skillName, caseName, skillConfig, caseData, opts) { log('db-load-xml (config)', true); } catch (e) { const detail = (e.stderr || e.stdout || e.message).trim(); + // Формат выгрузки новее платформы — свойство стенда, а не дефект кейса. Платформа + // говорит об этом прямо, поэтому лестницу «платформа → версия формата» здесь + // дублировать не нужно: читаем её ответ. + const fmt = /Неизвестная версия формата ([\d.]+)/.exec(detail); + if (fmt) { + result.skipped = true; + result.skipReason = `формат выгрузки ${fmt[1]} новее платформы — запустите с --v8path`; + log('db-load-xml (config)', true, `skipped (${result.skipReason})`); + return result; + } log('db-load-xml (config)', false, detail); result.errors.push(`LoadConfig failed: ${detail.substring(0, 1000)}`); return result;