Skip to content

Commit b20f32d

Browse files
committed
Merge branch 'feature/pull-407' into develop
2 parents 8e287e6 + 3d6b6ad commit b20f32d

9 files changed

Lines changed: 1738 additions & 1576 deletions

File tree

src/xddTestRunner/Form/УправляемаяФорма/Форма.txt

Lines changed: 602 additions & 552 deletions
Large diffs are not rendered by default.

src/xddTestRunner/Form/Форма/form

Lines changed: 150 additions & 150 deletions
Large diffs are not rendered by default.

src/xddTestRunner/Form/ФормаВыбораПодсистемы/form

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ A0Qbgk0z0YbgC3miYgVfyBMVK/hCfqTFCqEQJxgjhEKcYIwQCnGKYwQXAACvVTho
559559
{0}
560560
}
561561
}
562-
},400,292,1,0,1,4,4,169},
562+
},400,292,1,0,1,4,4,177},
563563
{
564564
{-1},7,
565565
{3,

src/xddTestRunner/ObjectModule.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Перем мСоответствиеСтатусовДляTeamCity;
2222

2323
Функция Версия() Экспорт
24-
Возврат "2.7.0.15";
24+
Возврат "2.7.0.16";
2525
КонецФункции
2626

2727
Функция ЗаголовокФормы() Экспорт

src/xddTestRunner/und/11ad5c96-c434-4088-bf66-ddff06c57ed8.1

Lines changed: 312 additions & 312 deletions
Large diffs are not rendered by default.

src/xddTestRunner/und/7e542ac7-435a-4390-85c5-964b3a399bee.0

Lines changed: 641 additions & 557 deletions
Large diffs are not rendered by default.

src/xddTestRunner/und/copyinfo

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{4,
2-
{4,
2+
{8,
3+
{07f739b4-709b-41bf-8096-032bddefd0f9,07f739b4-709b-41bf-8096-032bddefd0f9,1,
4+
{ec6bb5e5-b7a8-4d75-bec9-658107a699cf,"РегистрацияПрохожденияТестовВЖР"}
5+
},
6+
{092b3fc1-7ced-4d20-8a28-79b535f8a9c4,092b3fc1-7ced-4d20-8a28-79b535f8a9c4,1,
7+
{ec6bb5e5-b7a8-4d75-bec9-658107a699cf,"СлучайныйПорядокВыполнения"}
8+
},
39
{11ad5c96-c434-4088-bf66-ddff06c57ed8,11ad5c96-c434-4088-bf66-ddff06c57ed8,1,
410
{c3831ec8-d8d5-4f93-8a22-f9bfae07327f,"xddTestRunner"}
511
},
@@ -11,17 +17,39 @@
1117
},
1218
{a1ce7ef7-f372-4589-b899-7fbf88efa7bf,a1ce7ef7-f372-4589-b899-7fbf88efa7bf,1,
1319
{d5b0e5ed-256d-401c-9c36-f630cafd8a62,"Форма"}
20+
},
21+
{a2724854-2f5c-4048-b7b2-02cbb9cb7fa3,a2724854-2f5c-4048-b7b2-02cbb9cb7fa3,1,
22+
{ec6bb5e5-b7a8-4d75-bec9-658107a699cf,"РежимОтладки"}
23+
},
24+
{e46a4b91-3cc7-4188-b6f0-96c31aa42e19,e46a4b91-3cc7-4188-b6f0-96c31aa42e19,1,
25+
{ec6bb5e5-b7a8-4d75-bec9-658107a699cf,"РегистрацияОшибокТестовВЖР"}
1426
}
1527
},
1628
{1,
1729
{9176d5a2-441b-4c0a-b8b7-bf86d41bf1d9,11ad5c96-c434-4088-bf66-ddff06c57ed8,0}
1830
},
19-
{18,
31+
{22,
32+
{
33+
{0,07f739b4-709b-41bf-8096-032bddefd0f9},9176d5a2-441b-4c0a-b8b7-bf86d41bf1d9,
34+
{-1}
35+
},
36+
{
37+
{0,092b3fc1-7ced-4d20-8a28-79b535f8a9c4},9176d5a2-441b-4c0a-b8b7-bf86d41bf1d9,
38+
{-1}
39+
},
2040
{
2141
{0,74ab8988-f52c-40cb-9b09-66a817b93074},9176d5a2-441b-4c0a-b8b7-bf86d41bf1d9,
2242
{-1}
2343
},
2444
{
45+
{0,a2724854-2f5c-4048-b7b2-02cbb9cb7fa3},9176d5a2-441b-4c0a-b8b7-bf86d41bf1d9,
46+
{-1}
47+
},
48+
{
49+
{0,e46a4b91-3cc7-4188-b6f0-96c31aa42e19},9176d5a2-441b-4c0a-b8b7-bf86d41bf1d9,
50+
{-1}
51+
},
52+
{
2553
{1},e603c0f2-92fb-4d47-8f38-a44a381cf235,
2654
{1}
2755
},

src/xddTestRunner/und/versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{1,20,"",5c4731c1-538e-4268-9924-77290390be5c,"versions",9a90a997-6470-4d72-91cc-844e972d8622,"fbabda67-719d-4191-9d89-748c2d43b001.0",cbf19118-b609-488e-8e54-7c30d71c5924,"5070e3c3-f74b-4ecd-9756-1136a230eca2",e9520ee4-4f03-400e-9e28-d37bc55b2b1d,"df7f0865-1068-416d-89b2-1bab8b502a1a.0",f3854a08-3203-48e6-a08d-ce7e14b72bdc,"root",8f9ca138-033f-4787-8c16-df65b05ba33a,"7e542ac7-435a-4390-85c5-964b3a399bee.0",e5710acd-877b-4c06-b2f2-e04072cbd4af,"d96a737c-e997-4182-9c28-c8dfa763aa8f.0",acf6557d-1da9-4f37-a796-d0d46d932702,"fbabda67-719d-4191-9d89-748c2d43b001",5bb1bdd5-2ed5-413e-a959-953a7e62ca93,"11ad5c96-c434-4088-bf66-ddff06c57ed8.0",6dfcd70d-78c1-4b66-97a4-bd9169ed84d3,"11ad5c96-c434-4088-bf66-ddff06c57ed8.1",79990cbe-f74f-4a3f-98a3-f2c90caea985,"7e542ac7-435a-4390-85c5-964b3a399bee",b7961e9a-3ac6-4990-bb48-8a5af7fd1c60,"a1ce7ef7-f372-4589-b899-7fbf88efa7bf",323a1edd-6d63-4e3b-af49-db1b4f28a842,"version",f799deaa-f096-4864-9a8b-2a2de66bc4ba,"df7f0865-1068-416d-89b2-1bab8b502a1a",e3ca6866-3a97-4e99-97e5-ebb3019916f5,"bffaa180-64bd-40f2-bf0a-2915b892a8d5",67b7b5c1-a3b0-4f20-9938-3af11f12817e,"bffaa180-64bd-40f2-bf0a-2915b892a8d5.0",758e75ee-ffe8-4cc2-8ebc-53062be98cb9,"a1ce7ef7-f372-4589-b899-7fbf88efa7bf.0",ed84e4cc-c17b-483b-9387-2a99e541ce2a,"copyinfo",17682ff0-8754-4eb9-a79d-c1ad3c7533ed,"d96a737c-e997-4182-9c28-c8dfa763aa8f",f96f7b58-1386-46eb-96ba-1460e22b1e43}
1+
{1,20,"",7902e87f-bd74-469b-be84-1fc054d57353,"versions",c618cbaf-2249-42b9-a66e-22b6865fc183,"fbabda67-719d-4191-9d89-748c2d43b001.0",881e7596-edf6-4b71-a22e-726a4eb826a7,"5070e3c3-f74b-4ecd-9756-1136a230eca2",1a889b57-79bd-405b-86ab-885e9e6868c4,"df7f0865-1068-416d-89b2-1bab8b502a1a.0",79794e94-2a76-4447-985e-ff988a98fef4,"root",c9dc5bb0-ea78-4d74-bebf-c9f67d51e239,"7e542ac7-435a-4390-85c5-964b3a399bee.0",139f7ded-4b7f-46f5-9326-af1862c9dd5e,"d96a737c-e997-4182-9c28-c8dfa763aa8f.0",e73d63ae-a458-484a-abff-aac0e358d775,"fbabda67-719d-4191-9d89-748c2d43b001",b98b01f6-8398-4aad-92fa-e3739fefa539,"11ad5c96-c434-4088-bf66-ddff06c57ed8.0",efa543bd-9587-4d12-9901-88bdaa831932,"11ad5c96-c434-4088-bf66-ddff06c57ed8.1",d38d08e4-1782-43a5-9289-7b3175df0ad5,"7e542ac7-435a-4390-85c5-964b3a399bee",04aa13b4-c333-48a8-94d7-e07923d142d0,"version",54e9088b-2f51-4e9b-b97b-27c809336422,"a1ce7ef7-f372-4589-b899-7fbf88efa7bf",a4973081-6b46-400d-ac63-12edff29ee09,"df7f0865-1068-416d-89b2-1bab8b502a1a",b0d316a8-0bbd-4309-a7ca-a496da293e04,"bffaa180-64bd-40f2-bf0a-2915b892a8d5",67b7b5c1-a3b0-4f20-9938-3af11f12817e,"bffaa180-64bd-40f2-bf0a-2915b892a8d5.0",758e75ee-ffe8-4cc2-8ebc-53062be98cb9,"a1ce7ef7-f372-4589-b899-7fbf88efa7bf.0",ce68f711-9035-42b3-bf06-f50fcfbd2c5a,"copyinfo",07d98d70-42b7-43dd-9e7f-0e16d30bb8dd,"d96a737c-e997-4182-9c28-c8dfa763aa8f",1b8e3e4a-0d25-4e55-a1b6-d3fcc59f9d90}

xddTestRunner.epf

305 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)