diff --git a/backend/src/integration/resources/SHIBUI-1062.side b/backend/src/integration/resources/SHIBUI-1062.side deleted file mode 100644 index da2a66cbd..000000000 --- a/backend/src/integration/resources/SHIBUI-1062.side +++ /dev/null @@ -1,293 +0,0 @@ -{ - "id": "6653e19b-f0fa-4ad4-87ac-16d71bb6e7f0", - "version": "2.0", - "name": "Admin Login", - "url": "http://localhost:10101", - "tests": [{ - "id": "81a4cee1-5eb2-424d-bce0-48ff68f40f9b", - "name": "Admin Login", - "commands": [{ - "id": "e9d3ff8f-91c3-4257-ba3f-32486b915635", - "comment": "", - "command": "open", - "target": "/login", - "targets": [], - "value": "" - }, { - "id": "4f642cbc-26e4-4562-805b-5dde812f3c55", - "comment": "", - "command": "setWindowSize", - "target": "1200x983", - "targets": [], - "value": "" - }, { - "id": "66de25cf-18cb-4ea4-8008-847001eda1e2", - "comment": "Use Admin Login", - "command": "type", - "target": "name=username", - "targets": [ - ["name=username", "name"], - ["css=tr:nth-child(1) input", "css:finder"], - ["xpath=//input[@name='username']", "xpath:attributes"], - ["xpath=//input", "xpath:position"] - ], - "value": "" - }, { - "id": "403895d9-204e-4f15-b9e7-476799c96675", - "comment": "Use Admin Password", - "command": "type", - "target": "name=password", - "targets": [ - ["name=password", "name"], - ["css=tr:nth-child(2) input", "css:finder"], - ["xpath=//input[@name='password']", "xpath:attributes"], - ["xpath=//tr[2]/td[2]/input", "xpath:position"] - ], - "value": "" - }, { - "id": "b87ee258-968f-46cf-946b-0073e1e94fa8", - "comment": "", - "command": "click", - "target": "name=submit", - "targets": [ - ["name=submit", "name"], - ["css=td:nth-child(1) > input", "css:finder"], - ["xpath=//input[@name='submit']", "xpath:attributes"], - ["xpath=//tr[3]/td/input", "xpath:position"] - ], - "value": "" - }, { - "id": "748d9455-6be6-4e89-aab7-e33a0fff4b2d", - "comment": "", - "command": "click", - "target": "css=.nav-link > translate-i18n:nth-child(1)", - "targets": [ - ["css=.nav-link > translate-i18n:nth-child(1)", "css:finder"], - ["xpath=//li[4]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Action Required')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "c587efc2-2879-4ba3-9fe0-16d6b1b37e1b", - "comment": "", - "command": "mouseOver", - "target": "css=.nav-link > translate-i18n:nth-child(1)", - "targets": [ - ["css=.nav-link > translate-i18n:nth-child(1)", "css:finder"], - ["xpath=//li[4]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Action Required')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "586eac94-751b-4dd3-9983-9db38cb62b35", - "comment": "", - "command": "mouseOut", - "target": "css=.nav-link > translate-i18n:nth-child(1)", - "targets": [ - ["css=.nav-link > translate-i18n:nth-child(1)", "css:finder"], - ["xpath=//li[4]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Action Required')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "2ae631cc-8f4c-4201-a3ec-a60e6fdd6ecb", - "comment": "", - "command": "assertText", - "target": "css=.badge", - "targets": [ - ["css=.badge", "css:finder"], - ["xpath=//li[4]/a/span", "xpath:position"], - ["xpath=//span[contains(.,'1')]", "xpath:innerText"] - ], - "value": "1" - }, { - "id": "0fda5a6a-6f3f-472e-83f4-3e8d2cb04961", - "comment": "", - "command": "click", - "target": "id=role-0", - "targets": [ - ["id=role-0", "id"], - ["css=#role-0", "css:finder"], - ["xpath=//select[@id='role-0']", "xpath:attributes"], - ["xpath=//select", "xpath:position"] - ], - "value": "" - }, { - "id": "7317c31e-678d-4410-bd75-fa5bdde37865", - "comment": "", - "command": "select", - "target": "id=role-0", - "targets": [], - "value": "label=ROLE_USER" - }, { - "id": "8825ec78-cf41-404b-beba-dac801ad46af", - "comment": "", - "command": "click", - "target": "linkText=Admin", - "targets": [ - ["linkText=Admin", "linkText"], - ["css=.nav-item:nth-child(3) > .nav-link", "css:finder"], - ["xpath=//a[contains(text(),'Admin')]", "xpath:link"], - ["xpath=//a[contains(@href, '/dashboard/admin/management')]", "xpath:href"], - ["xpath=//dashboard-page/div/ul/li[3]/a", "xpath:position"], - ["xpath=//a[contains(.,'Admin')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "662c0fe6-05ae-48ff-a895-c2d253a8837f", - "comment": "", - "command": "click", - "target": "css=.nav-link > translate-i18n:nth-child(1)", - "targets": [ - ["css=.nav-link > translate-i18n:nth-child(1)", "css:finder"], - ["xpath=//li[4]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Action Required')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "31878c2a-ec9e-47a3-b735-973a61292e4e", - "comment": "", - "command": "click", - "target": "linkText=Admin", - "targets": [ - ["linkText=Admin", "linkText"], - ["css=.nav-item:nth-child(3) > .nav-link", "css:finder"], - ["xpath=//a[contains(text(),'Admin')]", "xpath:link"], - ["xpath=//a[contains(@href, '/dashboard/admin/management')]", "xpath:href"], - ["xpath=//dashboard-page/div/ul/li[3]/a", "xpath:position"], - ["xpath=//a[contains(.,'Admin')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "eb34e37e-3e94-4fdf-a0ff-426c33d7d8b2", - "comment": "", - "command": "click", - "target": "css=li:nth-child(3) > .nav-link > translate-i18n", - "targets": [ - ["css=li:nth-child(3) > .nav-link > translate-i18n", "css:finder"], - ["xpath=//div[@id='navbar']/ul/li[3]/a/translate-i18n", "xpath:idRelative"], - ["xpath=//li[3]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Logout')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "dde86641-e6a1-406f-add3-cbe5abc9b980", - "comment": "Use User Login", - "command": "type", - "target": "name=username", - "targets": [ - ["name=username", "name"], - ["css=tr:nth-child(1) input", "css:finder"], - ["xpath=//input[@name='username']", "xpath:attributes"], - ["xpath=//input", "xpath:position"] - ], - "value": "" - }, { - "id": "8743d4b9-6e74-41ee-b901-d56476fd5c66", - "comment": "Use User Password", - "command": "type", - "target": "name=password", - "targets": [ - ["name=password", "name"], - ["css=tr:nth-child(2) input", "css:finder"], - ["xpath=//input[@name='password']", "xpath:attributes"], - ["xpath=//tr[2]/td[2]/input", "xpath:position"] - ], - "value": "" - }, { - "id": "47a8b4d2-1513-49bf-8931-e7fcacf1c47d", - "comment": "", - "command": "click", - "target": "name=submit", - "targets": [ - ["name=submit", "name"], - ["css=td:nth-child(1) > input", "css:finder"], - ["xpath=//input[@name='submit']", "xpath:attributes"], - ["xpath=//tr[3]/td/input", "xpath:position"] - ], - "value": "" - }, { - "id": "880a6021-1d40-46a4-94d4-ea73613faf6f", - "comment": "", - "command": "click", - "target": "css=.active > translate-i18n", - "targets": [ - ["css=.active > translate-i18n", "css:finder"], - ["xpath=//div[@id='navbar']/ul/li[2]/a/translate-i18n", "xpath:idRelative"], - ["xpath=//li[2]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Dashboard')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "9a44d5fe-7316-4076-bfd6-bfa57b0004f9", - "comment": "", - "command": "click", - "target": "css=#addNewDropdown > translate-i18n", - "targets": [ - ["css=#addNewDropdown > translate-i18n", "css:finder"], - ["xpath=//button[@id='addNewDropdown']/translate-i18n", "xpath:idRelative"], - ["xpath=//translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Add New')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "499015d0-9485-4bae-b103-7c6fe911b18e", - "comment": "", - "command": "click", - "target": "css=li:nth-child(3) > .nav-link > translate-i18n", - "targets": [ - ["css=li:nth-child(3) > .nav-link > translate-i18n", "css:finder"], - ["xpath=//div[@id='navbar']/ul/li[3]/a/translate-i18n", "xpath:idRelative"], - ["xpath=//li[3]/a/translate-i18n", "xpath:position"], - ["xpath=//translate-i18n[contains(.,'Logout')]", "xpath:innerText"] - ], - "value": "" - }, { - "id": "e7244234-e24a-4439-acaf-6e061e14e146", - "comment": "Use Admin Login", - "command": "type", - "target": "name=username", - "targets": [ - ["name=username", "name"], - ["css=tr:nth-child(1) input", "css:finder"], - ["xpath=//input[@name='username']", "xpath:attributes"], - ["xpath=//input", "xpath:position"] - ], - "value": "" - }, { - "id": "f4461f3f-aa73-4f99-9e1e-6ce0676199c4", - "comment": "Use Admin Password", - "command": "type", - "target": "name=password", - "targets": [ - ["name=password", "name"], - ["css=tr:nth-child(2) input", "css:finder"], - ["xpath=//input[@name='password']", "xpath:attributes"], - ["xpath=//tr[2]/td[2]/input", "xpath:position"] - ], - "value": "" - }, { - "id": "5092c7f6-6e7c-4a32-8b4f-0b2e9cb01233", - "comment": "", - "command": "click", - "target": "name=submit", - "targets": [ - ["name=submit", "name"], - ["css=td:nth-child(1) > input", "css:finder"], - ["xpath=//input[@name='submit']", "xpath:attributes"], - ["xpath=//tr[3]/td/input", "xpath:position"] - ], - "value": "" - }] - }], - "suites": [{ - "id": "91a2972f-f7cd-4a9b-9db2-28141211be12", - "name": "Default Suite", - "persistSession": false, - "parallel": false, - "timeout": 300, - "tests": ["81a4cee1-5eb2-424d-bce0-48ff68f40f9b"] - }], - "urls": ["http://localhost:10101/"], - "plugins": [] -} diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side index a2f9781a5..00502648f 100644 --- a/backend/src/integration/resources/SHIBUI-1281.side +++ b/backend/src/integration/resources/SHIBUI-1281.side @@ -520,6 +520,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "8a9bef2c-566b-4911-b05c-a335952d7be6", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a0102f51-f1d8-4c38-9170-482022ea7397", "comment": "", @@ -533,6 +540,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "06668dc1-ec69-4363-8935-f27e80b5fc90", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", @@ -556,6 +570,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "0691340f-95ec-4289-9449-a5e4210e64ce", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c1534880-c4e5-4fbd-b200-c28f9f556ab9", "comment": "", @@ -568,6 +589,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c6b43283-411e-47f0-8f1b-62c7092a137f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", @@ -592,6 +620,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "5e1ca47b-ae4a-4d85-bba6-c78f5b1a69c0", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "97a98737-862d-4567-8b20-c5c991444ed0", "comment": "", @@ -604,6 +639,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "3d47de6e-6cb9-47bc-b95e-33adccd48335", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", @@ -628,6 +670,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "d13c75f8-9843-4732-b3f6-9fe568c3c68a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "e2e8d5d4-8b6a-42d5-9fe7-abb8a84216e3", "comment": "", @@ -640,6 +689,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "ade81589-7fa9-4cfc-9114-bbf843fa7302", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", @@ -1249,6 +1305,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "94cd4815-7417-40ef-a07a-5e1fd4fd697c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2a91666b-5453-4064-8923-c3384835b6fd", "comment": "", @@ -1262,6 +1325,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "6fe62627-3568-48f0-a49c-ddb562b3aba2", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", @@ -1286,6 +1356,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "ae91c905-fb35-4e10-bb74-06595cfb6489", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "fd33610c-dbca-410d-b2a4-117a1b2b6a79", "comment": "", @@ -1298,6 +1375,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "b4002361-ca74-453f-aaf4-16b7f4bde28d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", @@ -1322,6 +1406,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1b71cf52-12f0-4117-9972-418977413b86", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "208b33cf-f983-4a82-9b1b-19cdf2a937fc", "comment": "", @@ -1334,6 +1425,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "3a6d00cb-95bc-4230-9e92-148bc238362f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", @@ -1358,6 +1456,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "4c237050-18f1-44fb-a624-6fdabe5c42c7", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "788a5b63-a75f-4aeb-9a5d-17c41e8f718e", "comment": "", @@ -1370,6 +1475,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "f5f865fd-e9e6-4d8c-8368-06455e3b72f0", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", @@ -1426,6 +1538,13 @@ "target": "css=div:nth-child(9) .btn", "targets": [], "value": "" + }, { + "id": "a264ad94-60d9-4634-b341-49016d821a8c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1438,6 +1557,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "e4a30d5e-2d62-4e7d-9fe6-08d1397184d1", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", @@ -1461,6 +1587,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "bd192c25-e728-4955-93e3-a63e0f09ad38", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874", "comment": "", @@ -1473,6 +1606,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "f7b66d8c-8679-4c97-8dda-c024b97d8b42", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", @@ -1496,6 +1636,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "b1f77f35-fb18-4070-b24b-5bf0fe13c85a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "64e215d9-6e46-422f-882c-13b6fb102622", "comment": "", @@ -1508,6 +1655,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "4e0e4812-b9ee-45bd-b3d1-d8b92186678b", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", @@ -1800,4 +1954,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side index 08df2f3e3..fac8ba2d2 100644 --- a/backend/src/integration/resources/SHIBUI-1311.side +++ b/backend/src/integration/resources/SHIBUI-1311.side @@ -184,6 +184,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"] ], "value": "%{idp.home}/foo.txt" + }, { + "id": "3dcd1f86-11e5-455a-8ea6-38328ed3648c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "203d0d3c-d866-422a-8b48-b50181db00e9", "comment": "", @@ -195,6 +202,13 @@ ["xpath=//div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "b4e1aad4-738b-474a-9b18-498ac3f8b9f8", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", @@ -267,6 +281,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "2a63d747-9a64-42fc-bd2e-8e5faf1adcd3", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a188bc3e-fd98-4d49-ae35-a0b78a17607c", "comment": "", @@ -280,6 +301,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "45a804d3-a7fa-45b6-9ad1-94e960c37706", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", @@ -294,17 +322,31 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "70b0565c-0da8-4906-8add-0e7e3334c191", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "7a72cf6a-c97a-49f6-83d0-cbe42f0fdb7d", "comment": "", "command": "click", - "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", + "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .btn", "targets": [ ["css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", "css:finder"], ["xpath=//div[@id='/reloadableMetadataResolverAttributes/maxRefreshDelay-container']/div/div/button/i", "xpath:idRelative"], ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "4be52e7c-b095-40a1-9f6e-9d62939d7a41", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", @@ -341,6 +383,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "b5203507-0a37-46ad-84d7-08c6711317bd", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "232da257-962f-4a4b-8213-038ef90c96c3", "comment": "", @@ -354,6 +403,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "236d7114-a227-4087-8aa0-2851acfe19ac", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", @@ -372,9 +428,10 @@ "id": "8af1abb5-2c7a-4a4c-a8f7-0eb287100dde", "comment": "", "command": "click", - "target": "css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", + "target": "id=/metadataFilters/SignatureValidation/requireSignedRoot", "targets": [ - ["css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", "css:finder"], + ["css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent > .custom-control-label", "css:finder"], + ["xpath=//div[@id='/metadataFilters/SignatureValidation/requireSignedRoot.parent']/label", "xpath:idRelative"], ["xpath=//div/div/label", "xpath:position"], ["xpath=//label[contains(.,'Require Signed Root')]", "xpath:innerText"] ], @@ -740,6 +797,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"] ], "value": "%{idp.home}/foo.txt" + }, { + "id": "962512c0-2e5a-4d14-ad4f-a94bbbf824c8", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "43dcf85f-0606-4177-aced-a1817aa2bd05", "comment": "", @@ -751,6 +815,13 @@ ["xpath=//div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "94782cd4-48bf-4685-a93d-d4c2086ceafc", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "38816b0f-9f4d-46d2-b900-937503ef93a0", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side index 5e086eddb..78143b150 100644 --- a/backend/src/integration/resources/SHIBUI-1333.side +++ b/backend/src/integration/resources/SHIBUI-1333.side @@ -520,6 +520,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "84552c73-8fe8-4ed7-99aa-68602d94d6cb", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a0102f51-f1d8-4c38-9170-482022ea7397", "comment": "", @@ -533,6 +540,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "60540fb7-0bea-45de-8474-52e8df730200", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", @@ -556,6 +570,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "c3c42436-b8d6-4623-8682-b5156f7ed42c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c1534880-c4e5-4fbd-b200-c28f9f556ab9", "comment": "", @@ -568,6 +589,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c91eb780-2767-4c03-a238-9d6369c84efd", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", @@ -592,6 +620,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "09a5a4b5-2dec-4819-bf12-cf355cc3b330", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "97a98737-862d-4567-8b20-c5c991444ed0", "comment": "", @@ -604,6 +639,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "02b57eb8-a8e2-46fc-9033-4df723095eea", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", @@ -628,6 +670,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "3479e821-fe83-4137-9caf-119b250bbf3d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "e2e8d5d4-8b6a-42d5-9fe7-abb8a84216e3", "comment": "", @@ -640,6 +689,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "14ce7a0c-b460-4dbc-a43b-897f845a3cb2", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", @@ -1249,6 +1305,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "85846785-17ca-43bd-9903-77298de226fb", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2a91666b-5453-4064-8923-c3384835b6fd", "comment": "", @@ -1262,6 +1325,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "3d3975ec-5aeb-4a95-977c-28ab420cc5e2", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", @@ -1286,6 +1356,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "a50c60c7-d7c2-4279-bb78-f90361d3a636", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "fd33610c-dbca-410d-b2a4-117a1b2b6a79", "comment": "", @@ -1298,6 +1375,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "5214e899-9cbf-495e-aa38-2530c73dd0e6", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", @@ -1322,6 +1406,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "a0a67aaa-865d-4a62-8c0d-7bd83ca02485", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "208b33cf-f983-4a82-9b1b-19cdf2a937fc", "comment": "", @@ -1334,6 +1425,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "da6d3d70-ccef-4827-b963-739f59a3290c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", @@ -1358,6 +1456,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "c067cddf-27f3-46fe-b4a4-70848de9d48f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "788a5b63-a75f-4aeb-9a5d-17c41e8f718e", "comment": "", @@ -1370,6 +1475,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "e88adc5c-7244-4b06-8ac4-5ce67b16e87a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", @@ -1426,6 +1538,13 @@ "target": "css=div:nth-child(9) .btn", "targets": [], "value": "" + }, { + "id": "667d1702-7451-4200-ae40-3024717c4506", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1438,6 +1557,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c87d6369-cec8-4d72-8552-6aabf3b8657b", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", @@ -1461,6 +1587,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "26b7eb16-d173-4da2-b5ea-fc56801e05b7", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874", "comment": "", @@ -1473,6 +1606,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "62ba317f-c886-438b-a263-19fff4354a99", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", @@ -1496,6 +1636,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "1f9420b8-2a81-4caa-9177-bff1fa2c2775", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "64e215d9-6e46-422f-882c-13b6fb102622", "comment": "", @@ -1508,6 +1655,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "9c9c1e94-68bd-462e-8520-31a33e10c2fc", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index bffdda8f1..7ffb79675 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -520,6 +520,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "e6f25890-12e4-42fa-8fa3-fedfb207c7b4", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a0102f51-f1d8-4c38-9170-482022ea7397", "comment": "", @@ -533,6 +540,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "19c22570-3d8d-464b-8bf2-0c6231e9226f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", @@ -556,6 +570,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "b74668ef-995b-48af-9d97-50b822255830", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c1534880-c4e5-4fbd-b200-c28f9f556ab9", "comment": "", @@ -568,6 +589,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "dd74eb20-9a3b-4822-952a-4aa01d5a08a0", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", @@ -592,6 +620,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "19759bb5-20a3-4d46-9606-32d405083f92", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "97a98737-862d-4567-8b20-c5c991444ed0", "comment": "", @@ -604,6 +639,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "faac2d44-552f-47e5-8e4b-e457f6587824", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", @@ -628,6 +670,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "bc8b77b0-e20e-4a1e-83ed-fa0bb5199235", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "e2e8d5d4-8b6a-42d5-9fe7-abb8a84216e3", "comment": "", @@ -640,6 +689,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "80814ffe-9589-4f77-864f-a0d61bfb4ef5", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", @@ -1249,6 +1305,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "3fd2e56f-620d-4e46-bf84-694dfbada52a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2a91666b-5453-4064-8923-c3384835b6fd", "comment": "", @@ -1262,6 +1325,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "dfc68247-f5e9-4f8b-a332-116b79348842", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", @@ -1286,6 +1356,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "35c13cf3-ac54-40bd-9611-b95e8a0dfa07", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "fd33610c-dbca-410d-b2a4-117a1b2b6a79", "comment": "", @@ -1298,6 +1375,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "07e71a37-86a0-457c-8798-9f7144bfd19d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", @@ -1322,6 +1406,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "c7c5a622-06a8-4e51-b7a2-da848e7626b6", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "208b33cf-f983-4a82-9b1b-19cdf2a937fc", "comment": "", @@ -1334,6 +1425,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "cc1a74e7-a7af-41cc-9ec7-033d9f19576c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", @@ -1358,6 +1456,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "de209357-8747-4233-9cae-ab3b0fb89a9c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "788a5b63-a75f-4aeb-9a5d-17c41e8f718e", "comment": "", @@ -1370,6 +1475,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "cefd39a6-1f77-4f3d-bd72-a668a5fe17b1", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", @@ -1426,6 +1538,13 @@ "target": "css=div:nth-child(9) .btn", "targets": [], "value": "" + }, { + "id": "be2aeaca-cf62-4ea9-9ee4-c97e8ae13c6e", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1438,6 +1557,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "9ab002d8-395c-4340-aadc-16f189504960", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", @@ -1461,6 +1587,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "a56d9978-3688-4ae0-bbe8-3bf84bb43408", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874", "comment": "", @@ -1473,6 +1606,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "95ca9d94-3a8c-49d5-a578-f09ea1b2dbef", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", @@ -1496,6 +1636,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c110a339-8eea-41aa-9b77-efabaa924bf1", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "64e215d9-6e46-422f-882c-13b6fb102622", "comment": "", @@ -1508,6 +1655,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "ef981751-02d3-416c-be6f-122f14801bd6", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", @@ -2128,9 +2282,9 @@ "id": "138ad58b-f0a2-436b-a8b0-43484f4180e6", "comment": "", "command": "assertText", - "target": "css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(2)", + "target": "css=.bg-diff > .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", "targets": [ - ["css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(2)", "css:finder"], + ["css=.bg-diff > .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", "css:finder"], ["xpath=//div[2]/div/div[2]", "xpath:position"] ], "value": "Test User v2" @@ -2138,10 +2292,10 @@ "id": "17049c95-4724-4521-ac47-6b64bde822aa", "comment": "", "command": "assertText", - "target": "css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", + "target": "css=.py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(4)", "targets": [ - ["css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", "css:finder"], - ["xpath=//div[3]", "xpath:position"] + ["css=.py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(4)", "css:finder"], + ["xpath=//div/div[3]", "xpath:position"] ], "value": "Test User" }, { diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side index 1e451078f..943053225 100644 --- a/backend/src/integration/resources/SHIBUI-1334-2.side +++ b/backend/src/integration/resources/SHIBUI-1334-2.side @@ -177,6 +177,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"] ], "value": "%{idp.home}/foo.txt" + }, { + "id": "8172c545-e0de-4233-bf8f-66d76b6e9684", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "203d0d3c-d866-422a-8b48-b50181db00e9", "comment": "", @@ -188,6 +195,13 @@ ["xpath=//div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "01fa325e-0ab6-4124-b42f-661e190d8307", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", @@ -260,6 +274,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "6ec3d2b5-ca0c-4128-a5f0-3281bbd5d199", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a188bc3e-fd98-4d49-ae35-a0b78a17607c", "comment": "", @@ -273,6 +294,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "246b863d-0ecb-4db6-9774-74da4859419a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", @@ -287,17 +315,32 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "558a1e8e-f67a-45f2-b806-c29cba8c7ac2", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "7a72cf6a-c97a-49f6-83d0-cbe42f0fdb7d", "comment": "", "command": "click", - "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", + "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .btn", "targets": [ - ["css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", "css:finder"], - ["xpath=//div[@id='/reloadableMetadataResolverAttributes/maxRefreshDelay-container']/div/div/button/i", "xpath:idRelative"], - ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] + ["css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .btn", "css:finder"], + ["xpath=(//button[@type='button'])[3]", "xpath:attributes"], + ["xpath=//div[@id='/reloadableMetadataResolverAttributes/maxRefreshDelay-container']/div/div/button", "xpath:idRelative"], + ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c4986f4d-5d38-47d4-a73e-b02e9aedc807", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", @@ -334,6 +377,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "6c47a16c-7398-4ff5-873d-11d236936073", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "232da257-962f-4a4b-8213-038ef90c96c3", "comment": "", @@ -347,6 +397,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "d30605a0-013c-403d-86ab-780f471fe159", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", @@ -365,7 +422,7 @@ "id": "8af1abb5-2c7a-4a4c-a8f7-0eb287100dde", "comment": "", "command": "click", - "target": "css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", + "target": "id=/metadataFilters/SignatureValidation/requireSignedRoot", "targets": [ ["css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", "css:finder"], ["xpath=//div/div/label", "xpath:position"], @@ -815,12 +872,12 @@ ], "value": "" }, { - "id": "863e9f5e-a3d6-47e9-8b65-de639029812a", + "id": "b4f41acc-cb2c-4bb1-92ef-452ae1dc420c", "comment": "", - "command": "waitForElementVisible", - "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a", "comment": "", @@ -835,12 +892,12 @@ ], "value": "" }, { - "id": "8277f894-0bbd-41f7-b3bb-1aba2a0f80be", + "id": "5febc53d-9179-4a5e-81a2-6d00495e0953", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", @@ -855,6 +912,13 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "753d2e1d-54cd-4edd-9718-3f875e617bc1", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d7406190-0bb0-4df8-9c0b-7e393952b6a2", "comment": "", @@ -868,12 +932,12 @@ ], "value": "" }, { - "id": "7014a534-b908-482f-85d2-7f7031741b04", + "id": "0fd359bb-a5d0-47f8-aa99-2cf2f32eae3d", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", @@ -887,6 +951,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[3]", "xpath:position"] ], "value": "" + }, { + "id": "bebea55c-1ac2-4556-ac7f-7e666731e569", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "19182110-0f86-4601-ae12-0b90967ef68a", "comment": "", @@ -900,12 +971,12 @@ ], "value": "" }, { - "id": "c28e3ee6-e536-4eb7-914b-896b2ec2cb9e", + "id": "c38b8d8d-e108-4895-bf2e-4cfc1fc28e5e", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index c66642bf0..68908b777 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -175,6 +175,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"] ], "value": "%{idp.home}/foo.txt" + }, { + "id": "91a96cbd-57f4-4dc2-8f75-eb3e96526ae7", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "0668032d-608b-4a01-9ac8-e4e2ac058294", "comment": "", @@ -189,12 +196,12 @@ ], "value": "" }, { - "id": "5aa1d849-42b9-45e8-ac74-d3df1f9458db", + "id": "19657c78-782d-4046-abce-64093bd17fa7", "comment": "", - "command": "waitForElementVisible", - "target": "id=/backupFileInitNextRefreshDelay__option--1", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "35dfa0f8-c0f2-4356-a6b0-18b5dc35337b", "comment": "", @@ -257,6 +264,13 @@ "target": "1000", "targets": [], "value": "" + }, { + "id": "91c42709-f202-48eb-bd7f-389ec454b86b", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "824b4515-ae14-436e-a56f-d631ea9e1edc", "comment": "", @@ -270,6 +284,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "12ba0481-b236-495c-b2a3-a665c5eec502", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "9ee7065a-823e-4b4a-b212-0582eeaf7a00", "comment": "", @@ -284,6 +305,13 @@ ["xpath=//li[contains(.,'PT0S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1e063a3c-c3c9-4ab6-9e7b-a7fb4d785288", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "618cc5f1-417b-4bc6-9388-3238f2304904", "comment": "", @@ -296,6 +324,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "0b129e41-adb3-47ef-a2b4-34899ca6d8fb", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a89f1b4d-10bd-48f7-9b97-865710cfe01f", "comment": "", @@ -345,6 +380,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "faf43746-1293-437f-a1ce-63145f5d6135", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "363af92e-0327-47b9-918c-1560adab40cc", "comment": "", @@ -358,6 +400,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "a14576bb-2d15-4e51-89c6-b8289311e58a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a4470d6f-04a7-4c4b-8c1e-70cff2f35e8a", "comment": "", @@ -376,7 +425,7 @@ "id": "4530c1b4-8f27-4272-9633-c792a3a54f90", "comment": "", "command": "click", - "target": "css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent > .custom-control-label", + "target": "id=/metadataFilters/SignatureValidation/requireSignedRoot", "targets": [ ["css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent > .custom-control-label", "css:finder"], ["xpath=//div[@id='/metadataFilters/SignatureValidation/requireSignedRoot.parent']/label", "xpath:idRelative"], @@ -774,6 +823,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1bb700ae-08eb-403c-b3ba-0090132b69ff", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "fd1af538-1b5b-4d6a-b56b-d56e7f01bb40", "comment": "", @@ -785,6 +841,13 @@ ["xpath=//auto-complete/div/div/div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "6afaa45d-1beb-4f15-8810-278af7489657", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cc233154-4159-425b-8ac5-761c26a0de15", "comment": "", @@ -808,17 +871,32 @@ ["xpath=//array-component/div/div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "3395ec88-2d19-4785-99f9-3921dddfba28", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "562c7f9f-1e55-432a-8fff-0cae15b23a33", "comment": "", "command": "click", - "target": "css=#\\/relyingPartyOverrides\\/nameIdFormats\\/1-container .fa", + "target": "css=#\\/relyingPartyOverrides\\/nameIdFormats\\/1-container .btn", "targets": [ - ["css=#\\/relyingPartyOverrides\\/nameIdFormats\\/1-container .fa", "css:finder"], - ["xpath=//div[@id='/relyingPartyOverrides/nameIdFormats/1-container']/div/div/button/i", "xpath:idRelative"], - ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] + ["css=#\\/relyingPartyOverrides\\/nameIdFormats\\/1-container .btn", "css:finder"], + ["xpath=(//button[@type='button'])[4]", "xpath:attributes"], + ["xpath=//div[@id='/relyingPartyOverrides/nameIdFormats/1-container']/div/div/button", "xpath:idRelative"], + ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c80afbe5-2c88-4207-b133-6d151fea12a8", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "f5f27af2-b869-4b99-a3d9-3efce014be06", "comment": "", @@ -843,6 +921,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "5e26a17f-98e4-4adc-b851-4e854228ebba", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b717af46-a3c1-40f2-ac1a-2c7f84fbf33f", "comment": "", @@ -855,6 +940,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "d07e6da7-ed28-4460-914a-eb355b3a2de3", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "4655a981-c5d6-4b48-aad2-77295dc37859", "comment": "", @@ -879,6 +971,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "605d3970-c910-4bec-accd-d7c4d0334f91", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "df07e4c7-8e0f-4eed-ab58-42e2b5bcfc93", "comment": "", @@ -891,6 +990,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "0ef4ae64-3b16-4488-b19e-629162a9c84d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cd34bc8a-564b-4d15-90c9-f09e12d7e078", "comment": "", @@ -938,6 +1044,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "1acc3e01-45ae-4c6d-9291-165affb7306f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "fcd7d891-5ea4-45a6-8554-4298ec5804c9", "comment": "", @@ -950,6 +1063,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "faf08fb6-7c62-465c-b198-6da8ef3a1dd5", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "9bb8951c-c932-4236-89d8-9d2c8d49a702", "comment": "", @@ -973,6 +1093,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "926e66e1-3bcb-41bd-a6a8-83ed90ceab59", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "81517bc9-7996-46be-9dfe-9eea57f0e616", "comment": "", @@ -985,6 +1112,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "8343153e-ade7-4713-a9f6-079b0bfbac44", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "8f00493c-94ef-4182-8423-5d23bd01136f", "comment": "", @@ -1008,6 +1142,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "b9b5a336-2b99-4315-8c14-13ee1c5af2ed", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c2f97ae8-fddf-4e48-b961-1d4154ceae9f", "comment": "", @@ -1020,6 +1161,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "39a8ea0f-a57a-49b6-b640-7b608eb29b88", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "3dcbc6b1-2571-4ab8-9014-66b19727fe0a", "comment": "", @@ -1250,17 +1398,33 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1503abb6-b674-495f-922b-f2ba07bb46bd", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "76b5506e-ebd3-416b-9a2d-391d39b8b282", "comment": "", "command": "click", - "target": "css=.fa-caret-down", + "target": "css=.input-group-append > .btn", "targets": [ - ["css=.fa-caret-down", "css:finder"], - ["xpath=//div[@id='/formats/0-container']/div/div/button/i", "xpath:idRelative"], - ["xpath=//auto-complete/div/div/div/button/i", "xpath:position"] + ["css=.input-group-append > .btn", "css:finder"], + ["xpath=(//button[@type='button'])[3]", "xpath:attributes"], + ["xpath=//div[@id='/formats/0-container']/div/div/button", "xpath:idRelative"], + ["xpath=//auto-complete/div/div/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "e71b7c21-86c7-46e1-8451-4005940dbf02", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "ee812306-8d00-4162-9d92-eb598802f4bc", "comment": "", @@ -1284,17 +1448,32 @@ ["xpath=//array-component/div/div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "da1e1b22-55cb-4934-9d0c-8955e5434289", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "1f3cca46-1bf0-469f-9ac5-6481c8447633", "comment": "", "command": "click", - "target": "css=#\\/formats\\/1-container .fa", + "target": "css=#\\/formats\\/1-container .btn", "targets": [ - ["css=#\\/formats\\/1-container .fa", "css:finder"], - ["xpath=//div[@id='/formats/1-container']/div/div/button/i", "xpath:idRelative"], - ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] + ["css=#\\/formats\\/1-container .btn", "css:finder"], + ["xpath=(//button[@type='button'])[4]", "xpath:attributes"], + ["xpath=//div[@id='/formats/1-container']/div/div/button", "xpath:idRelative"], + ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "65b07bc0-3c1d-4eeb-b268-baa2f2a0992c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "aa0cb8e5-a5b5-4956-91dc-d25ea30ff87a", "comment": "", @@ -1319,17 +1498,31 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "43200793-5c4c-47dd-93b7-7bdd138eb6d4", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "f313f186-80e1-42ea-9b19-c59efe66a92d", "comment": "", "command": "click", - "target": "css=#\\/formats\\/2-container .fa", + "target": "css=#\\/formats\\/2-container .btn", "targets": [ ["css=#\\/formats\\/2-container .fa", "css:finder"], ["xpath=//div[@id='/formats/2-container']/div/div/button/i", "xpath:idRelative"], ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "26e1228a-a453-4f79-bd7d-222f50e21b69", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "bf10f8f1-f5b8-43f5-b1d8-6e4e67e92621", "comment": "", @@ -1353,17 +1546,31 @@ ["xpath=//array-component/div/div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "0502f5d7-bc0a-4b4c-b0d0-5cf159dd0492", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "823e4972-3bdd-4286-a22d-8805adef4f2c", "comment": "", "command": "click", - "target": "css=#\\/formats\\/3-container .fa", + "target": "css=#\\/formats\\/3-container .btn", "targets": [ ["css=#\\/formats\\/3-container .fa", "css:finder"], ["xpath=//div[@id='/formats/3-container']/div/div/button/i", "xpath:idRelative"], ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "55751a6d-974e-45cb-83fa-cea50fd6612c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "3cba2ead-22cd-4bc9-b0ca-bb1f5ebb10a2", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side index 63b48ff43..a91a6a6d9 100644 --- a/backend/src/integration/resources/SHIBUI-1335-2.side +++ b/backend/src/integration/resources/SHIBUI-1335-2.side @@ -160,6 +160,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "46a436e6-c122-4e28-b09c-0383ec5eb204", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "8197c49f-a70f-46dd-919e-58fff0e14075", "comment": "", @@ -173,6 +180,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "ed02df07-4c70-4824-b4f8-e642a1b4e0c3", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "0f1a7a34-0955-45bb-bd2a-a5e4f246869b", "comment": "", @@ -188,12 +202,12 @@ ], "value": "" }, { - "id": "62ee33e4-91d9-4c58-9c10-1732f83255bc", + "id": "1887c6e3-9748-42fc-938e-14c5567d2f41", "comment": "", - "command": "waitForElementVisible", - "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .btn", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "64d0912a-0244-4f5e-818f-17000c01477b", "comment": "", @@ -206,6 +220,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "21c54b64-910a-4a9d-b96c-ec9ede9e7f51", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "80a08176-de7d-4938-8d49-1d296a8ba27c", "comment": "", @@ -671,6 +692,13 @@ ["xpath=//array-component/div/div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "f0b7296b-004d-445e-9ebd-6bbd9052b30f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "028122a4-7a5c-4ee9-afb9-5f7d491cc9bd", "comment": "", @@ -684,6 +712,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "e3c2c21f-408c-48f2-a2dd-9241123f0ead", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "e50612f4-b0e4-4749-99ec-5c67e66cd398", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side index 748ed9fed..b45dde65e 100644 --- a/backend/src/integration/resources/SHIBUI-1335-3.side +++ b/backend/src/integration/resources/SHIBUI-1335-3.side @@ -173,6 +173,13 @@ ["xpath=//input", "xpath:position"] ], "value": "0.5" + }, { + "id": "ed3a2cad-339d-4cd6-b724-395057670e51", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "1a8a9dcf-9c6b-4802-8483-981d14131346", "comment": "", @@ -186,6 +193,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "2d40e408-16c8-4eba-ae11-bc836c534c58", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "443a9cfc-17c8-49da-9d87-bfabda8fd0b6", "comment": "", @@ -200,6 +214,13 @@ ["xpath=//li[contains(.,'PT0S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "0b259df7-d713-4d4a-b9c3-ffe0b1c0ecf5", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "84f35d35-ea9c-4a06-aaec-bee1c1922aec", "comment": "", @@ -212,6 +233,13 @@ ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "032f1b9b-640c-4f77-a61a-3bc2127b447e", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c03be15d-ee34-4cd1-bac9-c52e3baa70a3", "comment": "", @@ -226,12 +254,12 @@ ], "value": "" }, { - "id": "c66f68b6-324d-4b74-bccf-5c032729c802", + "id": "508576b2-18ca-4360-ab90-fc0bf4b83cab", "comment": "", - "command": "waitForElementVisible", - "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxIdleEntityData-container .btn", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "f0cdfbcf-46e2-4013-b085-0730b0127842", "comment": "", @@ -245,12 +273,12 @@ ], "value": "" }, { - "id": "56f964c0-7940-4cad-8314-193fe1ef0c1c", + "id": "6ac213ff-c86b-4724-9f80-a50989f00369", "comment": "", - "command": "waitForElementVisible", - "target": "id=/dynamicMetadataResolverAttributes/maxIdleEntityData__option--1", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "dd663319-7eef-4301-a0d4-24d9583eab7f", "comment": "", @@ -276,6 +304,13 @@ ["xpath=//div[2]/label/input", "xpath:position"] ], "value": "" + }, { + "id": "c0be0f29-02f9-46f1-9b65-0f2c9c310246", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "54df6d88-1a85-407f-935a-a016f5952a93", "comment": "", @@ -288,6 +323,13 @@ ["xpath=//div[6]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "9a756ef8-7633-43c2-ac27-48f2bd41ad15", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "e7f2439a-e9a1-4b23-b0b9-d992f5b477d4", "comment": "", @@ -543,6 +585,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "1e7c0ceb-f555-497d-a465-92df7d67b40a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "3e162911-9775-4d01-8802-63f5638c7cba", "comment": "", @@ -556,6 +605,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "a9c5ad9d-05ab-4b47-9e0d-c4e81d28c87e", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "ab2594b3-45a8-43f7-885b-270239a46628", "comment": "", @@ -765,6 +821,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "17f77efb-f64a-4a64-8c48-36830a087dbb", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a7aa04e7-b909-42cf-85ed-adbff0adefce", "comment": "", @@ -778,6 +841,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "d1fa4a9b-80bd-4ad7-989e-1e5b56893bbc", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "8b7b79fd-2405-4ab6-8f91-4906f663cd1e", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side index a41683edf..5a633603f 100644 --- a/backend/src/integration/resources/SHIBUI-1335-4.side +++ b/backend/src/integration/resources/SHIBUI-1335-4.side @@ -243,6 +243,13 @@ ["xpath=//input", "xpath:position"] ], "value": "0.5" + }, { + "id": "45ebbdf0-1a4b-43ef-bba4-2302208653b2", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a51172e3-792f-4881-8083-efcb34c63e56", "comment": "", @@ -256,6 +263,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "07e1ade9-022c-4458-ba65-b7eecb4f8c0b", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b1ec3405-0d75-45d6-8986-51c2f09c4dc4", "comment": "", @@ -271,12 +285,12 @@ ], "value": "" }, { - "id": "203f95b2-a2f8-4d7c-88a9-7934a9ce8c23", + "id": "c64e2180-1b40-4bb9-8910-25a51438f27c", "comment": "", - "command": "waitForElementVisible", - "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "2793bf1b-177b-461f-b06c-0a584ab6eaf0", "comment": "", @@ -289,6 +303,13 @@ ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "dc45395b-a584-4b7d-8c12-b6d0e669031a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "87084a6a-8e89-4c00-a3d9-c104107a3ba2", "comment": "", @@ -302,6 +323,13 @@ ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[4]", "xpath:position"] ], "value": "" + }, { + "id": "239001d8-35ff-41d0-95cf-7e81917a9e19", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "4c017bde-e242-4d2f-838e-a2a026e4292b", "comment": "", @@ -314,6 +342,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "57ea5bd7-1ee0-41d9-b39e-56aeddeec7a0", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d477fd6a-2c15-4fb6-a199-d49aa495ef94", "comment": "", @@ -327,6 +362,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[3]", "xpath:position"] ], "value": "" + }, { + "id": "0783a0de-0a8d-4cc2-adc4-6ed94f277298", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "62f7ce3c-5cff-43c6-8ce6-a0e6bf2b2257", "comment": "", @@ -339,6 +381,13 @@ ["xpath=//div[6]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "a155f0af-2dd4-4906-a783-19a99d23a6a8", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "bf855df4-326e-484e-9022-d2c84e09e6f3", "comment": "", @@ -400,6 +449,13 @@ ["xpath=//li[3]/button/span", "xpath:position"] ], "value": "" + }, { + "id": "bf17ff0c-363f-43d6-91ba-4f8131c35ada", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b777b343-71a0-4056-a85e-d8d548b993b2", "comment": "", @@ -413,6 +469,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "7a7f2f9c-0f95-4a5c-89c3-299a212f2fb9", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "22f7bf37-718c-4126-867b-67a383eefff5", "comment": "", @@ -431,7 +494,7 @@ "id": "5320f384-0881-4e7a-b89f-33a57efb22ba", "comment": "", "command": "click", - "target": "css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent > .custom-control-label", + "target": "id=/metadataFilters/SignatureValidation/requireSignedRoot", "targets": [ ["css=#\\/metadataFilters\\/SignatureValidation\\/requireSignedRoot\\.parent > .custom-control-label", "css:finder"], ["xpath=//div[@id='/metadataFilters/SignatureValidation/requireSignedRoot.parent']/label", "xpath:idRelative"], @@ -500,7 +563,7 @@ "id": "b027e53b-bdf7-40e5-a296-6f25eae50732", "comment": "", "command": "click", - "target": "css=#\\/metadataFilters\\/EntityRoleWhiteList\\/removeRolelessEntityDescriptors\\.parent > .custom-control-label", + "target": "id=/metadataFilters/EntityRoleWhiteList/removeRolelessEntityDescriptors", "targets": [ ["css=#\\/metadataFilters\\/EntityRoleWhiteList\\/removeRolelessEntityDescriptors\\.parent > .custom-control-label", "css:finder"], ["xpath=//div[@id='/metadataFilters/EntityRoleWhiteList/removeRolelessEntityDescriptors.parent']/label", "xpath:idRelative"], @@ -732,6 +795,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1abe39e3-d7f2-447f-aff4-3382cc648e29", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "93505bd6-8a5e-4ef0-8f50-d2dc9bce71d6", "comment": "", @@ -745,6 +815,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "70e68495-a52f-4c3b-aeb4-fac69e8cda96", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b269b8f4-8191-47c1-a84a-5b64df6aadcb", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side index 19fd2093b..bc65110d2 100644 --- a/backend/src/integration/resources/SHIBUI-1352-1.side +++ b/backend/src/integration/resources/SHIBUI-1352-1.side @@ -211,6 +211,13 @@ ["xpath=//input", "xpath:position"] ], "value": "0.5" + }, { + "id": "b0ba61cf-ebb5-41f7-b512-63ca2cd0e478", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "59ca3a2c-b9da-4ac6-9b44-d44271355659", "comment": "", @@ -224,6 +231,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "bf63096b-b796-4a70-bc98-96a18dc0531e", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "8db04a8f-565a-4fa9-b5c0-8ce4b200b11c", "comment": "", @@ -239,17 +253,12 @@ ], "value": "" }, { - "id": "5ac765a9-4850-4a48-b0b4-6ea52003e5a4", + "id": "33586d4c-c18b-4081-add7-43ef4d6d8ef8", "comment": "", - "command": "waitForElementEditable", - "target": "css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn", - "targets": [ - ["css=#\\/dynamicMetadataResolverAttributes\\/maxCacheDuration-container .btn", "css:finder"], - ["xpath=(//button[@type='button'])[3]", "xpath:attributes"], - ["xpath=//div[@id='/dynamicMetadataResolverAttributes/maxCacheDuration-container']/div/div/button", "xpath:idRelative"], - ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] - ], - "value": "10000" + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a5274853-084e-438f-8cea-9a74e55fd0b9", "comment": "", @@ -262,6 +271,13 @@ ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "e5c5f95e-79df-4782-82d1-11c96bec4651", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "bf7f5914-5aad-485a-8af0-aa510605e1dc", "comment": "", @@ -275,6 +291,13 @@ ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[4]", "xpath:position"] ], "value": "" + }, { + "id": "3e4b2db4-f2b8-4d4e-ae6b-17741831dc84", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b2bd8d25-4f3c-47b2-a070-53a364840916", "comment": "", @@ -287,6 +310,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "2f6feb3c-fc51-410b-abe0-97a4c1a5aa6a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "9a411cfc-479d-4951-aab2-e8d09ba64b4e", "comment": "", @@ -312,6 +342,13 @@ ["xpath=//div[2]/label/input", "xpath:position"] ], "value": "" + }, { + "id": "168acb09-d3c8-44a6-af8a-60c2925dd02d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "ae32fb25-67b1-469b-9f23-3cbca895b956", "comment": "", @@ -324,6 +361,13 @@ ["xpath=//div[6]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "b874867f-a32d-43f8-998b-e99488257fe6", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c30bf781-4d5d-46ad-9bbc-4a5165788870", "comment": "", @@ -416,4 +460,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1352-2.side b/backend/src/integration/resources/SHIBUI-1352-2.side index d3b223606..d3cfbd098 100644 --- a/backend/src/integration/resources/SHIBUI-1352-2.side +++ b/backend/src/integration/resources/SHIBUI-1352-2.side @@ -197,6 +197,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "b2d8c292-1fe1-435b-ad87-28e845825e78", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d2e09813-fee8-4744-9ac9-72bdbac92b72", "comment": "", @@ -210,6 +217,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "71cbee46-51ca-42fa-8ab8-0da3f2d9df59", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d449fec4-84f9-4eda-98e5-2dc40d185a63", "comment": "", @@ -224,6 +238,13 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "5e9f1ec1-5309-4c45-a37a-7ec5a9d058be", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "54784d87-c835-4e3f-9467-9c39be596bb8", "comment": "", @@ -236,6 +257,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "d94909d2-9f00-4166-918a-837c78838acb", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "119a39c2-6d86-4d94-a093-6669e89e78e4", "comment": "", @@ -354,4 +382,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side index 038b8c149..a406e46d7 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -184,6 +184,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"] ], "value": "%{idp.home}/foo.txt" + }, { + "id": "bf9467f5-780e-4b7c-8bf6-be062c15f867", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "203d0d3c-d866-422a-8b48-b50181db00e9", "comment": "", @@ -195,6 +202,13 @@ ["xpath=//div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "55da9393-72e3-47d7-87b0-324d8be38660", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", @@ -267,6 +281,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "135984e0-ceb3-4544-a753-24410762eca4", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a188bc3e-fd98-4d49-ae35-a0b78a17607c", "comment": "", @@ -280,6 +301,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "be2bef00-19c8-4f42-adea-e0ad0d664d23", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", @@ -294,17 +322,31 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "bd587f8c-de08-4cd7-b81e-9258c2ed6abe", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "7a72cf6a-c97a-49f6-83d0-cbe42f0fdb7d", "comment": "", "command": "click", - "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", + "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .btn", "targets": [ ["css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", "css:finder"], ["xpath=//div[@id='/reloadableMetadataResolverAttributes/maxRefreshDelay-container']/div/div/button/i", "xpath:idRelative"], ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "5d9a4304-2e48-419b-a98a-3540df439f90", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", @@ -341,6 +383,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "0bc204b3-2adb-4446-899b-0665619aaec1", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "232da257-962f-4a4b-8213-038ef90c96c3", "comment": "", @@ -354,6 +403,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "763ce787-9ee8-4c78-bff0-d4ad94dff963", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", @@ -372,7 +428,7 @@ "id": "8af1abb5-2c7a-4a4c-a8f7-0eb287100dde", "comment": "", "command": "click", - "target": "css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", + "target": "id=/metadataFilters/SignatureValidation/requireSignedRoot", "targets": [ ["css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", "css:finder"], ["xpath=//div/div/label", "xpath:position"], @@ -450,7 +506,7 @@ "id": "5dfac033-ecfd-42e8-aa6f-931d5acd4d89", "comment": "", "command": "click", - "target": "css=div:nth-child(2) > sf-form-element > .has-success > sf-widget-chooser > checkbox-component .custom-control-label", + "target": "id=/metadataFilters/EntityRoleWhiteList/removeRolelessEntityDescriptors", "targets": [ ["css=div:nth-child(2) > sf-form-element > .has-success > sf-widget-chooser > checkbox-component .custom-control-label", "css:finder"], ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"], @@ -461,7 +517,7 @@ "id": "9d5934f0-fe10-4539-9d71-80b454fc8612", "comment": "", "command": "click", - "target": "css=div:nth-child(3) > sf-form-element > .has-success > sf-widget-chooser > checkbox-component .custom-control-label", + "target": "id=/metadataFilters/EntityRoleWhiteList/removeEmptyEntitiesDescriptors", "targets": [ ["css=div:nth-child(3) > sf-form-element > .has-success > sf-widget-chooser > checkbox-component .custom-control-label", "css:finder"], ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/checkbox-component/div/div/div/label", "xpath:position"], @@ -853,10 +909,10 @@ ], "value": "" }, { - "id": "cf14941d-698f-42ed-8731-51e6f7b90c63", + "id": "725d9ec1-3ce1-4a1d-a66a-d54629a9d3b5", "comment": "", "command": "pause", - "target": "1000", + "target": "500", "targets": [], "value": "" }, { @@ -873,12 +929,12 @@ ], "value": "" }, { - "id": "6e01f905-fd32-45a5-9517-9dd12191f7ae", + "id": "7379d277-790e-47ca-b74c-fc73cc2d8a42", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", @@ -894,10 +950,10 @@ ], "value": "" }, { - "id": "cce01c00-7d94-48ae-9de8-ead8624e2cf3", + "id": "8497a440-4e0c-4589-aaf8-f530dbefb3c7", "comment": "", "command": "pause", - "target": "1000", + "target": "500", "targets": [], "value": "" }, { @@ -913,12 +969,12 @@ ], "value": "" }, { - "id": "01d5f751-6964-4fd8-a0de-36fd79d7be99", + "id": "655375ab-b3e4-449e-acfa-577b0ab4957e", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", @@ -933,10 +989,10 @@ ], "value": "" }, { - "id": "d585dc51-41b2-4be8-8d84-cb21b4dc92b6", + "id": "855e85a8-d8c3-4b72-ae8a-763f2d86869a", "comment": "", "command": "pause", - "target": "1000", + "target": "500", "targets": [], "value": "" }, { @@ -952,12 +1008,12 @@ ], "value": "" }, { - "id": "99c7ec5a-ad8c-4970-b97f-27997098c0d6", + "id": "d0befeb0-e5e2-4233-803e-8c417ca570a0", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side index a4c8b5fa5..af7a78773 100644 --- a/backend/src/integration/resources/SHIBUI-1385-1.side +++ b/backend/src/integration/resources/SHIBUI-1385-1.side @@ -74,6 +74,13 @@ ["xpath=//div/a", "xpath:position"] ], "value": "" + }, { + "id": "295789cf-0603-4fd2-9971-c2ed21d2fc81", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "218e51fd-49e6-400b-9d7f-61bcd8e0c074", "comment": "", @@ -520,6 +527,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "7f9c9fb7-602c-4f8e-b262-866c744130ce", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a0102f51-f1d8-4c38-9170-482022ea7397", "comment": "", @@ -533,6 +547,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "209726b4-c0d8-4e9d-8886-88b9151f226c", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "9033e5ad-4255-4aa7-a878-c7beab69ee8e", "comment": "", @@ -556,6 +577,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "466ac624-8139-47cf-8ef2-32d1c3d179a2", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c1534880-c4e5-4fbd-b200-c28f9f556ab9", "comment": "", @@ -568,6 +596,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "a70176f9-e75e-47fc-b76a-42ae941fa64d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d07b2d83-3699-4f48-90e8-6fc883d3a02a", "comment": "", @@ -592,6 +627,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "a98f1890-298a-4167-a4d6-4ab173005068", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "97a98737-862d-4567-8b20-c5c991444ed0", "comment": "", @@ -604,6 +646,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "ff21b982-e428-45d7-af8e-410e67759446", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "686e004c-2b0f-4308-8622-b04bc05a50a9", "comment": "", @@ -628,6 +677,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "ec3d16f9-c239-4e53-8626-11d8dc3dc43d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "e2e8d5d4-8b6a-42d5-9fe7-abb8a84216e3", "comment": "", @@ -640,6 +696,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "6b1d77e3-b6e8-4217-9dc4-fe54b3f880ed", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b6ac5230-772b-44bc-b9d1-6ae8a58e0368", "comment": "", @@ -1249,6 +1312,13 @@ ["xpath=//div/button/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "cbd5d310-00af-4f40-adb8-82d261f3f339", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2a91666b-5453-4064-8923-c3384835b6fd", "comment": "", @@ -1262,6 +1332,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "77a8ca01-ba29-4240-8c85-df12c9729603", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6e8718ef-e053-48d8-91e5-f5128e371f56", "comment": "", @@ -1286,6 +1363,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "2297cceb-4407-498f-a3f2-db15bc3de26f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "fd33610c-dbca-410d-b2a4-117a1b2b6a79", "comment": "", @@ -1298,6 +1382,13 @@ ["xpath=//li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "2922852e-45b5-41b1-b7ae-10f6ef5980c6", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "3cd47415-5e57-4148-a40b-9571e6791f3f", "comment": "", @@ -1322,6 +1413,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "ccc0e141-6b42-4fdb-ac4e-fe741826eec6", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "208b33cf-f983-4a82-9b1b-19cdf2a937fc", "comment": "", @@ -1334,6 +1432,13 @@ ["xpath=//li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "76e5990c-7474-46db-9d8a-08b08fb058b7", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b4beb2b3-8481-4431-9299-a39a4107f17f", "comment": "", @@ -1358,6 +1463,13 @@ ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"] ], "value": "" + }, { + "id": "b1fb7e09-2778-4dd9-a52d-ac183d745486", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "788a5b63-a75f-4aeb-9a5d-17c41e8f718e", "comment": "", @@ -1370,6 +1482,13 @@ ["xpath=//li[4]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c486b622-751b-49f0-bf51-d1919bea0cf4", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "c82d6951-13e2-4d32-9e19-eac52bfdc188", "comment": "", @@ -1426,6 +1545,13 @@ "target": "css=div:nth-child(9) .btn", "targets": [], "value": "" + }, { + "id": "0b950018-bd12-433a-b198-682d4ea55a90", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1438,6 +1564,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "ab11537e-9959-4800-90d8-38946c8b277b", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6c62d514-0143-49d9-97b3-6b7cb443df9d", "comment": "", @@ -1461,6 +1594,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "411ea71f-99b7-4f99-a5ce-7037ff78b8af", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874", "comment": "", @@ -1473,6 +1613,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[2]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "3c59a5d7-9f48-4a5e-b6d1-0913c19adf2a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5a32d59b-1ac3-4cd0-a2d8-0e934f8182fd", "comment": "", @@ -1496,6 +1643,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "64b99135-c3fb-416a-b584-0e1b4b411295", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "64e215d9-6e46-422f-882c-13b6fb102622", "comment": "", @@ -1508,6 +1662,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/ul/li[3]/div/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "426b095e-3b0c-4cc3-ad1e-3956dc7bd256", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "6a7bce1a-34be-4d4c-b732-d2f198e8b8a1", "comment": "", @@ -2006,18 +2167,12 @@ ], "value": "" }, { - "id": "762e5039-7e5b-4a90-9db5-887b4ee8b625", + "id": "62348ea5-d2d9-426d-91ae-5e0f5871ad05", "comment": "", - "command": "waitForElementEditable", - "target": "id=/serviceProviderName", - "targets": [ - ["id=/serviceProviderName", "id"], - ["name=field93", "name"], - ["css=#\\/serviceProviderName", "css:finder"], - ["xpath=//input[@id='/serviceProviderName']", "xpath:attributes"], - ["xpath=//input", "xpath:position"] - ], - "value": "10000" + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "99731068-2016-4a7f-8a38-febfb711d027", "comment": "", @@ -2100,16 +2255,12 @@ ], "value": "" }, { - "id": "90cb59ce-695b-49d0-983b-01e445f3a384", + "id": "978829e9-fa70-4548-9a55-0e2ffa0df9a4", "comment": "", - "command": "waitForElementVisible", - "target": "css=.d-block > primitive-property:nth-child(1) .d-block:nth-child(2)", - "targets": [ - ["css=.d-block > primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"], - ["xpath=//div/span[2]", "xpath:position"], - ["xpath=//span[contains(.,'test-1234')]", "xpath:innerText"] - ], - "value": "10000" + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "1c0b7514-92b7-4e07-b462-467113f4a8cd", "comment": "", @@ -2131,20 +2282,13 @@ ["xpath=//span[contains(.,'Test Provider')]", "xpath:innerText"] ], "value": "Test Provider" - }, { - "id": "d3abb044-064c-4d68-8afa-84cc5f9b987e", - "comment": "", - "command": "runScript", - "target": "window.scrollTo(0,157)", - "targets": [], - "value": "" }, { "id": "138ad58b-f0a2-436b-a8b0-43484f4180e6", "comment": "", "command": "assertText", - "target": "css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(2)", + "target": "css=.bg-diff > .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", "targets": [ - ["css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(2)", "css:finder"], + ["css=.bg-diff > .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", "css:finder"], ["xpath=//div[2]/div/div[2]", "xpath:position"] ], "value": "Test User v2" @@ -2152,10 +2296,10 @@ "id": "17049c95-4724-4521-ac47-6b64bde822aa", "comment": "", "command": "assertText", - "target": "css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", + "target": "css=.py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(4)", "targets": [ - ["css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(3)", "css:finder"], - ["xpath=//div[3]", "xpath:position"] + ["css=.py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(4)", "css:finder"], + ["xpath=//div/div[3]", "xpath:position"] ], "value": "Test User" }, { @@ -2196,12 +2340,12 @@ ], "value": "" }, { - "id": "e23ad673-a84c-4c28-a927-8baf21fe1f12", + "id": "e1748ca6-18b9-4195-8f09-5c18d317fc88", "comment": "", - "command": "waitForElementEditable", - "target": "id=/mdui/displayName", + "command": "pause", + "target": "2000", "targets": [], - "value": "10000" + "value": "" }, { "id": "6f422a9d-6c2f-4200-bdd3-411ed44773a3", "comment": "", @@ -2273,10 +2417,10 @@ }, { "id": "98aafaee-a430-4a2d-9aa5-b4c9ce0c4908", "comment": "", - "command": "waitForElementVisible", - "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", + "command": "pause", + "target": "5000", "targets": [], - "value": "10000" + "value": "" }, { "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea", "comment": "", @@ -2331,6 +2475,13 @@ ["xpath=//button[contains(.,'Restore')]", "xpath:innerText"] ], "value": "" + }, { + "id": "0e3e455b-e44c-41ee-8b6e-b50df56e7946", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "db39c891-73da-4ad9-9360-00dd8b845f60", "comment": "", @@ -2355,24 +2506,6 @@ ["xpath=//button[contains(.,'Save')]", "xpath:innerText"] ], "value": "" - }, { - "id": "e27c07df-1690-411d-99cd-9aca9f497958", - "comment": "", - "command": "pause", - "target": "3000", - "targets": [], - "value": "" - }, { - "id": "5028596f-927a-4ba6-ab87-3018bd8a578c", - "comment": "", - "command": "assertText", - "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(2)", - "targets": [ - ["css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(2)", "css:finder"], - ["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/span[2]", "xpath:idRelative"], - ["xpath=//primitive-property[2]/div/span[2]", "xpath:position"] - ], - "value": "Service Provider - Restored" }, { "id": "d829b597-552a-4b7d-93c7-389b3495f393", "comment": "", @@ -2420,12 +2553,12 @@ ], "value": "" }, { - "id": "305867cb-3514-49b8-870b-0a7fa9482c79", + "id": "92879253-4fee-4329-987c-781df80ad50a", "comment": "", - "command": "waitForElementVisible", - "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(2)", + "command": "pause", + "target": "5000", "targets": [], - "value": "10000" + "value": "" }, { "id": "18918b08-9ae1-4bc3-836c-73feb1812cde", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side index 3a64ad327..58b330239 100644 --- a/backend/src/integration/resources/SHIBUI-1385-2.side +++ b/backend/src/integration/resources/SHIBUI-1385-2.side @@ -177,6 +177,13 @@ ["xpath=//div[4]/sf-form-element/div/sf-widget-chooser/custom-string/div/input", "xpath:position"] ], "value": "%{idp.home}/foo.txt" + }, { + "id": "e9924807-d5e2-4d54-94ba-d74d19f7d96a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "203d0d3c-d866-422a-8b48-b50181db00e9", "comment": "", @@ -188,6 +195,13 @@ ["xpath=//div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "8d3c5584-8a55-48cd-85d9-2022d9fde676", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f", "comment": "", @@ -260,6 +274,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "d2d7487c-e0d0-4777-bbcb-b78f14e1c70a", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a188bc3e-fd98-4d49-ae35-a0b78a17607c", "comment": "", @@ -273,6 +294,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "c5ca7be2-6985-4e96-b0dc-6e00e3b42978", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "a159e056-c870-4e02-a7e9-4b3a60d83718", "comment": "", @@ -287,17 +315,31 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "166847ab-46ab-4555-a61a-f3a06a4cef4e", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "7a72cf6a-c97a-49f6-83d0-cbe42f0fdb7d", "comment": "", "command": "click", - "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", + "target": "css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .btn", "targets": [ ["css=#\\/reloadableMetadataResolverAttributes\\/maxRefreshDelay-container .fa", "css:finder"], ["xpath=//div[@id='/reloadableMetadataResolverAttributes/maxRefreshDelay-container']/div/div/button/i", "xpath:idRelative"], ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button/i", "xpath:position"] ], "value": "" + }, { + "id": "4c3da8ca-719a-4ce6-bb61-c1ee1e09358f", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "820397f5-aabb-46f5-a65a-56747ce29091", "comment": "", @@ -334,6 +376,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "05de8997-f3d9-4503-b4fb-058b72cad03e", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "232da257-962f-4a4b-8213-038ef90c96c3", "comment": "", @@ -347,6 +396,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "293cf806-cec0-4b31-a7be-c77e938ac435", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e", "comment": "", @@ -365,7 +421,7 @@ "id": "8af1abb5-2c7a-4a4c-a8f7-0eb287100dde", "comment": "", "command": "click", - "target": "css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", + "target": "id=/metadataFilters/SignatureValidation/requireSignedRoot", "targets": [ ["css=div:nth-child(1) > sf-form-element > .has-success .custom-control-label", "css:finder"], ["xpath=//div/div/label", "xpath:position"], @@ -815,12 +871,12 @@ ], "value": "" }, { - "id": "863e9f5e-a3d6-47e9-8b65-de639029812a", + "id": "a91c64f1-c45f-471e-8786-eb55817bc282", "comment": "", - "command": "waitForElementVisible", - "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a", "comment": "", @@ -835,12 +891,12 @@ ], "value": "" }, { - "id": "8277f894-0bbd-41f7-b3bb-1aba2a0f80be", + "id": "aa3ed5b0-cd6e-4e8d-9c35-57524db80ca7", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", @@ -855,6 +911,13 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "31d15a76-ef02-42ed-87a0-56543de45b0d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "d7406190-0bb0-4df8-9c0b-7e393952b6a2", "comment": "", @@ -868,12 +931,12 @@ ], "value": "" }, { - "id": "7014a534-b908-482f-85d2-7f7031741b04", + "id": "bf37da0d-3a16-4944-b7ae-f116c898040b", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", @@ -887,6 +950,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[3]", "xpath:position"] ], "value": "" + }, { + "id": "603e9774-e7cb-4c31-9e53-43c4262ba58d", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "19182110-0f86-4601-ae12-0b90967ef68a", "comment": "", @@ -900,12 +970,12 @@ ], "value": "" }, { - "id": "c28e3ee6-e536-4eb7-914b-896b2ec2cb9e", + "id": "70ca5b38-22a6-4c61-b645-9b67b2e88178", "comment": "", - "command": "waitForElementVisible", - "target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3", + "command": "pause", + "target": "500", "targets": [], - "value": "10000" + "value": "" }, { "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 5640fd5de..ff6eb36d2 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -56,6 +56,7 @@ action.manage=Manage action.close=Close action.back-to-top=Back to Top action.restore=Restore +action.view-only-changes=View Only Changes value.enabled=Enabled value.disabled=Disabled diff --git a/ui/src/app/metadata/configuration/action/compare.action.ts b/ui/src/app/metadata/configuration/action/compare.action.ts index 410a8dcab..be687d142 100644 --- a/ui/src/app/metadata/configuration/action/compare.action.ts +++ b/ui/src/app/metadata/configuration/action/compare.action.ts @@ -8,7 +8,8 @@ export enum CompareActionTypes { COMPARE_METADATA_SUCCESS = '[Compare Version] Compare Version Success', COMPARE_METADATA_ERROR = '[Compare Version] Compare Version Error', SET_VERSIONS = '[Compare Version] Set Versions', - CLEAR_VERSIONS = '[Compare Version] Clear Versions' + CLEAR_VERSIONS = '[Compare Version] Clear Versions', + SET_VIEW_CHANGED = '[Compare Version] View Changed Only' } export class CompareVersionRequest implements Action { @@ -35,6 +36,11 @@ export class SetMetadataVersions implements Action { constructor(public payload: Metadata[]) { } } +export class ViewChanged implements Action { + readonly type = CompareActionTypes.SET_VIEW_CHANGED; + constructor(public payload: boolean) { } +} + export class ClearVersions implements Action { readonly type = CompareActionTypes.CLEAR_VERSIONS; } @@ -44,4 +50,5 @@ export type CompareActionsUnion = | CompareVersionSuccess | CompareVersionError | SetMetadataVersions - | ClearVersions; + | ClearVersions + | ViewChanged; diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html index f4826cfe6..e0685e743 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html @@ -18,20 +18,26 @@

-
- Option - - Value - {{ date | date:DATE_FORMAT }} - -
- - + +
+ Option + + Value + {{ date | date:DATE_FORMAT }} + +
+ + + + +
+ No Changes +
+
diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.scss b/ui/src/app/metadata/configuration/component/metadata-configuration.component.scss new file mode 100644 index 000000000..82e7a5f37 --- /dev/null +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.scss @@ -0,0 +1,20 @@ +@import '../../../../theme/_palette'; + +:host /deep/ { + .bg-diff { + background: #FEE8E9; + position: relative; + border-color: #CCC !important; + &::before { + $size: 24px; + content: "\f06a"; + font-family: 'FontAwesome'; + text-align: center; + width: $size; + height: $size; + position: absolute; + left: -$size; + top: 0.5rem; + } + } +} diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts index 280c362a6..1b04ba636 100644 --- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts +++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.ts @@ -8,7 +8,7 @@ import { CONFIG_DATE_FORMAT } from '../configuration.values'; selector: 'metadata-configuration', changeDetection: ChangeDetectionStrategy.OnPush, templateUrl: './metadata-configuration.component.html', - styleUrls: [] + styleUrls: ['./metadata-configuration.component.scss'] }) export class MetadataConfigurationComponent { @Input() configuration: MetadataConfiguration; diff --git a/ui/src/app/metadata/configuration/component/property/array-property.component.html b/ui/src/app/metadata/configuration/component/property/array-property.component.html index e16eb8e65..bfda5c422 100644 --- a/ui/src/app/metadata/configuration/component/property/array-property.component.html +++ b/ui/src/app/metadata/configuration/component/property/array-property.component.html @@ -1,58 +1,64 @@ -
- -
{{ property.name }}
-
-
-
- {{ property.items.properties[prop].title }} -
- -
- {{ version[i][prop] }} -
-
- - -
- +
+
{{ property.name }}
+
+
+ Changed: +
+ {{ property.items.properties[prop].title }}
+ +
+ {{ version[i][prop] }} +
+
+ - +
+
+
+
+ + + - - - - - + + + + +
- - -
- -
-
-
- {{ attr.label }} -
- - true - - - false - -
+
+
+
+ Changed: + {{ item.label }} +
+ + true + + + false +
- +
-
+ -
- {{ property.name }} +
+ Changed: + {{ property.name }}

-

    { describe('attributeList$ getter', () => { it('should return an empty list when no data or dataUrl is set', () => { - app.attributeList$.subscribe((list) => { - expect(list).toEqual([]); - }); + expect(app.dataList).toBeUndefined(); }); it('should return a list of data items from the schema', () => { const datalist = [ @@ -87,29 +85,7 @@ describe('Array Property Component', () => { } }); fixture.detectChanges(); - app.attributeList$.subscribe(list => { - expect(list).toEqual(datalist); - }); - }); - - it('should call the attribute service with a provided dataUrl', () => { - const datalist = [ - { key: 'foo', label: 'foo' }, - { key: 'bar', label: 'bar' }, - { key: 'baz', label: 'baz' }, - ]; - spyOn(service, 'query').and.returnValue(of(datalist)); - instance.setProperty({ - ...instance.property, - widget: { - id: 'datalist', - dataUrl: '/foo' - } - }); - fixture.detectChanges(); - app.attributeList$.subscribe(list => { - expect(list).toEqual(datalist); - }); + expect(app.dataList).toEqual(datalist); }); }); }); diff --git a/ui/src/app/metadata/configuration/component/property/array-property.component.ts b/ui/src/app/metadata/configuration/component/property/array-property.component.ts index 2c4de49bd..4d09d9a8f 100644 --- a/ui/src/app/metadata/configuration/component/property/array-property.component.ts +++ b/ui/src/app/metadata/configuration/component/property/array-property.component.ts @@ -33,14 +33,8 @@ export class ArrayPropertyComponent extends ConfigurationPropertyComponent imple return UriValidator.isUri(str); } - get attributeList$(): Observable<{ key: string, label: string }[]> { - if (this.property.widget && this.property.widget.hasOwnProperty('data')) { - return of(this.property.widget.data); - } - if (this.property.widget && this.property.widget.hasOwnProperty('dataUrl')) { - return this.attrService.query(this.property.widget.dataUrl); - } - return of([]); + get dataList(): { key: string, label: string, differences?: boolean }[] { + return this.property.widget.data; } } diff --git a/ui/src/app/metadata/configuration/component/property/primitive-property.component.html b/ui/src/app/metadata/configuration/component/property/primitive-property.component.html index 4d93c07cc..5e582350d 100644 --- a/ui/src/app/metadata/configuration/component/property/primitive-property.component.html +++ b/ui/src/app/metadata/configuration/component/property/primitive-property.component.html @@ -1,4 +1,8 @@ -
    +
    +Changed: +
    {{ v ? v : (v === false) ? v : '-' }} +
    \ No newline at end of file diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html index 8e652d1c2..5c93f5ec7 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html @@ -8,13 +8,23 @@

    'container-fluid': (numVersions$ | async) > 2, 'container': (numVersions$ | async) <= 2 }"> -
    +
      Version History +
    - +
    diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts index 1b1834fa1..06f821633 100644 --- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts @@ -1,10 +1,10 @@ import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Observable, BehaviorSubject, Subscription, combineLatest } from 'rxjs'; import { Store } from '@ngrx/store'; import { ActivatedRoute } from '@angular/router'; -import { map } from 'rxjs/operators'; -import { ConfigurationState, getComparisonConfigurations, getComparisonConfigurationCount } from '../reducer'; -import { CompareVersionRequest, ClearVersions } from '../action/compare.action'; +import { map, withLatestFrom } from 'rxjs/operators'; +import { ConfigurationState, getComparisonConfigurationCount } from '../reducer'; +import { CompareVersionRequest, ClearVersions, ViewChanged } from '../action/compare.action'; import { MetadataConfiguration } from '../model/metadata-configuration'; import * as fromReducer from '../reducer'; @@ -16,10 +16,14 @@ import * as fromReducer from '../reducer'; }) export class MetadataComparisonComponent implements OnDestroy { + limiter: BehaviorSubject = new BehaviorSubject(false); + versions$: Observable; numVersions$: Observable; type$: Observable; loading$: Observable = this.store.select(fromReducer.getComparisonLoading); + limited$: Observable = this.store.select(fromReducer.getViewChangedOnly); + sub: Subscription; constructor( private store: Store, @@ -31,12 +35,20 @@ export class MetadataComparisonComponent implements OnDestroy { map(versions => new CompareVersionRequest(versions)) ).subscribe(this.store); - this.versions$ = this.store.select(getComparisonConfigurations); + this.versions$ = this.store.select(fromReducer.getLimitedComparisonConfigurations); this.numVersions$ = this.store.select(getComparisonConfigurationCount); this.type$ = this.store.select(fromReducer.getConfigurationModelType); + + this.versions$.subscribe(console.log); + + this.sub = this.limiter.pipe( + withLatestFrom(this.limited$), + map(([compare, limit]) => new ViewChanged(!limit)) + ).subscribe(this.store); } ngOnDestroy(): void { + this.sub.unsubscribe(); this.store.dispatch(new ClearVersions()); } } diff --git a/ui/src/app/metadata/configuration/model/section.ts b/ui/src/app/metadata/configuration/model/section.ts index fd7f9b00f..50c6a5492 100644 --- a/ui/src/app/metadata/configuration/model/section.ts +++ b/ui/src/app/metadata/configuration/model/section.ts @@ -4,14 +4,18 @@ export interface Section { label: string; pageNumber: number; properties: SectionProperty[]; + differences?: boolean; } export interface SectionProperty { label: string; type: string; value: any[]; + differences?: boolean; + properties?: SectionProperty[]; widget?: { id: string; + data?: any[]; [propertyName: string]: any; }; } diff --git a/ui/src/app/metadata/configuration/reducer/compare.reducer.ts b/ui/src/app/metadata/configuration/reducer/compare.reducer.ts index d2d346ca3..84eec1558 100644 --- a/ui/src/app/metadata/configuration/reducer/compare.reducer.ts +++ b/ui/src/app/metadata/configuration/reducer/compare.reducer.ts @@ -5,16 +5,23 @@ export interface State { models: Metadata[]; loaded: boolean; loading: boolean; + compareChangedOnly: boolean; } export const initialState: State = { models: [], loaded: false, - loading: false + loading: false, + compareChangedOnly: false }; export function reducer(state = initialState, action: CompareActionsUnion): State { switch (action.type) { + case CompareActionTypes.SET_VIEW_CHANGED: + return { + ...state, + compareChangedOnly: action.payload + }; case CompareActionTypes.COMPARE_METADATA_REQUEST: return { ...state, @@ -45,3 +52,4 @@ export function reducer(state = initialState, action: CompareActionsUnion): Stat export const getVersionModels = (state: State) => state.models; export const getVersionModelsLoaded = (state: State) => state.loaded; export const getComparisonLoading = (state: State) => state.loading; +export const getViewChangedOnly = (state: State) => state.compareChangedOnly; diff --git a/ui/src/app/metadata/configuration/reducer/index.spec.ts b/ui/src/app/metadata/configuration/reducer/index.spec.ts index eba8409be..8a1aa3cb7 100644 --- a/ui/src/app/metadata/configuration/reducer/index.spec.ts +++ b/ui/src/app/metadata/configuration/reducer/index.spec.ts @@ -1,19 +1,89 @@ import { getConfigurationSectionsFn, getConfigurationModelNameFn, - getConfigurationModelEnabledFn + getConfigurationModelEnabledFn, + assignValueToProperties, + getLimitedPropertiesFn, + getConfigurationModelTypeFn, + getSelectedVersionNumberFn, + getSelectedIsCurrentFn } from './index'; import { SCHEMA as schema } from '../../../../testing/form-schema.stub'; -import { MetadataSourceEditor } from '../../domain/model/wizards/metadata-source-editor'; import { Metadata } from '../../domain/domain.type'; +import { MockMetadataWizard } from '../../../../testing/mockMetadataWizard'; describe('Configuration Reducer', () => { const model = { name: 'foo', - '@type': 'MetadataResolver' + serviceEnabled: true, + foo: { + bar: 'bar', + baz: 'baz' + }, + list: [ + 'super', + 'cool' + ] }; - const definition = new MetadataSourceEditor(); + const props = [ + { + id: 'name', + items: null, + name: 'label.metadata-provider-name-dashboard-display-only', + properties: [], + type: 'string', + value: null, + widget: { id: 'string', help: 'message.must-be-unique' } + }, + { + id: 'serviceEnabled', + items: null, + name: 'serviceEnabled', + properties: [], + type: 'string', + value: null, + widget: { id: 'select', disabled: true } + }, + { + id: 'foo', + items: null, + name: 'foo', + type: 'object', + properties: [ + { + id: 'bar', + name: 'bar', + type: 'string', + properties: [] + }, + { + id: 'baz', + name: 'baz', + type: 'string', + properties: [] + } + ] + }, + { + id: 'list', + name: 'list', + type: 'array', + items: { + type: 'string' + }, + widget: { + id: 'datalist', + data: [ + { key: 'super', label: 'super' }, + { key: 'cool', label: 'cool' }, + { key: 'notcool', label: 'notcool' } + ] + } + } + ]; + + const definition = MockMetadataWizard; describe('getConfigurationSectionsFn', () => { it('should parse the schema, definition, and model into a MetadataConfiguration', () => { @@ -37,4 +107,62 @@ describe('Configuration Reducer', () => { expect(getConfigurationModelEnabledFn(null)).toBe(false); }); }); + + describe('assignValueToProperties function', () => { + it('should assign appropriate values to the given schema properties', () => { + const assigned = assignValueToProperties([model], props, definition); + expect(assigned[0].value).toEqual(['foo']); + expect(assigned[1].value).toEqual([true]); + }); + + it('should assign differences when passed multiple models', () => { + const assigned = assignValueToProperties([model, { + ...model, + name: 'bar', + list: [ + 'super', + 'notcool' + ] + }], props, definition); + expect(assigned[0].differences).toBe(true); + }); + }); + + describe('getLimitedPropertiesFn function', () => { + it('should filter properties without differences', () => { + const assigned = assignValueToProperties([model, { + ...model, + name: 'bar' + }], props, definition); + expect(getLimitedPropertiesFn(assigned).length).toBe(1); + }); + }); + + describe('getConfigurationModelTypeFn function ', () => { + it('should return provider type if the object has an @type property', () => { + const md = { '@type': 'FilebackedHttpMetadataResolver' } as Metadata; + expect(getConfigurationModelTypeFn(md)).toBe('FilebackedHttpMetadataResolver'); + }); + it('should return resolver if no type is detected', () => { + const md = { serviceEnabled: true } as Metadata; + expect(getConfigurationModelTypeFn(md)).toBe('resolver'); + }); + }); + + describe('getSelectedVersionNumberFn function ', () => { + it('should return the selected version by id', () => { + const versions = [ { id: 'foo' }, { id: 'bar' } ]; + const id = 'foo'; + expect(getSelectedVersionNumberFn(versions, id)).toBe(1); + }); + }); + + describe('getSelectedIsCurrentFn function ', () => { + it('should return a boolean of whether the selected version is the most current version', () => { + const versions = [{ id: 'foo' }, { id: 'bar' }]; + const id = 'foo'; + expect(getSelectedIsCurrentFn(versions[0], versions)).toBe(true); + expect(getSelectedIsCurrentFn(versions[1], versions)).toBe(false); + }); + }); }); diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index 62ecb8404..38087a034 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -16,6 +16,7 @@ import { Metadata } from '../../domain/domain.type'; import * as fromResolver from '../../resolver/reducer'; import * as fromProvider from '../../provider/reducer'; +import { SectionProperty } from '../model/section'; export interface ConfigurationState { configuration: fromConfiguration.State; @@ -55,10 +56,31 @@ export const getConfigurationXml = createSelector(getConfigurationState, fromCon export const assignValueToProperties = (models, properties, definition: any): any[] => { return properties.map(prop => { + const differences = models.some((model, index, array) => { + if (!array) { + return false; + } + return JSON.stringify(model[prop.id]) !== JSON.stringify(array[0][prop.id]); + }); + + const widget = prop.type === 'array' && prop.widget && prop.widget.data ? ({ + ...prop.widget, + data: prop.widget.data.map(item => ({ + ...item, + differences: models + .map((model) => { + const value = model[prop.id]; + return value ? value.indexOf(item.key) > -1 : false; + }) + .reduce((current, val) => current !== val ? true : false, false) + })) + }) : null; + switch (prop.type) { case 'object': return { ...prop, + differences, properties: assignValueToProperties( models.map(model => definition.formatter(model)[prop.id] || {}), prop.properties, @@ -68,9 +90,11 @@ export const assignValueToProperties = (models, properties, definition: any): an default: return { ...prop, + differences, value: models.map(model => { return model[prop.id]; - }) + }), + widget }; } }); @@ -103,6 +127,10 @@ export const getConfigurationSectionsFn = (models, definition, schema): Metadata properties: assignValueToProperties(models, section.properties, definition) }; }) + .map((section: any) => ({ + ...section, + differences: section.properties.some(prop => prop.differences) + })) }); }; @@ -127,18 +155,21 @@ export const getSelectedVersionId = createSelector(getHistoryState, fromHistory. export const getVersionIds = createSelector(getHistoryState, fromHistory.selectVersionIds); export const getVersionCollection = createSelector(getHistoryState, getVersionIds, fromHistory.selectAllVersions); export const getSelectedVersion = createSelector(getVersionEntities, getSelectedVersionId, getInCollectionFn); +export const getSelectedVersionNumberFn = (versions, selectedId) => versions.indexOf(versions.find(v => v.id === selectedId)) + 1; export const getSelectedVersionNumber = createSelector( getVersionCollection, getSelectedVersionId, - (versions, selectedId) => versions.indexOf(versions.find(v => v.id === selectedId)) + 1 + getSelectedVersionNumberFn ); +export const getSelectedIsCurrentFn = (selected, collection) => { + return selected ? collection[0].id === selected.id : false; +}; + export const getSelectedIsCurrent = createSelector( getSelectedVersion, getVersionCollection, - (selected, collection) => { - return selected ? collection[0].id === selected.id : null; - } + getSelectedIsCurrentFn ); // Version Comparison @@ -156,6 +187,43 @@ export const getComparisonConfigurations = createSelector( export const getComparisonConfigurationCount = createSelector(getComparisonConfigurations, (config) => config ? config.dates.length : 0); +export const getViewChangedOnly = createSelector(getCompareState, fromCompare.getViewChangedOnly); + +export const getLimitedPropertiesFn = (properties: SectionProperty[]) => { + return ([ + ...properties + .filter(p => p.differences) + .map(p => { + const parsed = { ...p }; + if (p.widget && p.widget.data) { + parsed.widget = { + ...p.widget, + data: p.widget.data.filter(item => item.differences) + }; + } + if (p.properties) { + parsed.properties = getLimitedPropertiesFn(p.properties); + } + return parsed; + }) + ]); +}; + +export const getLimitedConfigurationsFn = (configurations, limited) => configurations ? ({ + ...configurations, + sections: limited ? configurations.sections : + configurations.sections.map(s => ({ + ...s, + properties: getLimitedPropertiesFn(s.properties), + })) +}) : configurations; + +export const getLimitedComparisonConfigurations = createSelector( + getComparisonConfigurations, + getViewChangedOnly, + getLimitedConfigurationsFn +); + // Version Restoration export const getRestoreState = createSelector(getState, getRestoreStateFn); diff --git a/ui/src/app/metadata/domain/model/property.ts b/ui/src/app/metadata/domain/model/property.ts index 4768de9e4..51a4bf06e 100644 --- a/ui/src/app/metadata/domain/model/property.ts +++ b/ui/src/app/metadata/domain/model/property.ts @@ -5,10 +5,12 @@ export interface Property { value: any[]; items: Property; properties: Property[]; + differences?: boolean; widget?: { id: string; data?: {key: string, label: string}[]; dataUrl?: string; + differences?: string; [propertyName: string]: any; }; } diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html index fcbd80ab8..f1e04538a 100644 --- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html +++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html @@ -78,7 +78,7 @@ Required for Regex   - + , {{ error.message }} diff --git a/ui/src/app/shared/validation/regex.validator.spec.ts b/ui/src/app/shared/validation/regex.validator.spec.ts index ce8af17ee..4835efd94 100644 --- a/ui/src/app/shared/validation/regex.validator.spec.ts +++ b/ui/src/app/shared/validation/regex.validator.spec.ts @@ -11,8 +11,8 @@ describe('RegexValidator', () => { expect(RegexValidator.isValidRegex(')')).toBe(false); }); - it('should return false if the regex doesnt begin and end with slashes', () => { - expect(RegexValidator.isValidRegex('abc')).toBe(false); + it('should return true even if the regex doesnt begin and end with slashes', () => { + expect(RegexValidator.isValidRegex('abc')).toBe(true); }); }); }); diff --git a/ui/src/app/shared/validation/regex.validator.ts b/ui/src/app/shared/validation/regex.validator.ts index be567a0f4..f05fadf8d 100644 --- a/ui/src/app/shared/validation/regex.validator.ts +++ b/ui/src/app/shared/validation/regex.validator.ts @@ -1,9 +1,7 @@ -const regexChecker = new RegExp('^\/|\/$', 'g'); - export class RegexValidator { static isValidRegex(pattern: string): boolean { if (!pattern) { - return true; + return false; } let regex; try { @@ -11,7 +9,7 @@ export class RegexValidator { } catch (err) { return false; } - return regexChecker.test(pattern); + return true; } } diff --git a/ui/src/testing/mockMetadataWizard.ts b/ui/src/testing/mockMetadataWizard.ts new file mode 100644 index 000000000..6c0135e29 --- /dev/null +++ b/ui/src/testing/mockMetadataWizard.ts @@ -0,0 +1,78 @@ +import { Wizard } from '../app/wizard/model/wizard'; + +export interface MockMetadata { + name: string; + serviceEnabled: boolean; + foo: { + bar: string; + baz: string; + }; +} + +export const MockMetadataWizard: Wizard = { + label: 'Metadata Source', + type: '@MetadataProvider', + validatorParams: [], + bindings: {}, + parser(changes: Partial, schema?: any): any { + return changes; + }, + formatter(changes: Partial, schema?: any): any { + return changes; + }, + getValidators(): { [key: string]: any } { + return {}; + }, + schema: '/api/ui/MetadataSources', + steps: [ + { + index: 1, + id: 'common', + label: 'label.sp-org-info', + fields: [ + 'name', + 'serviceEnabled' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'serviceProviderName', + 'entityId', + 'serviceEnabled', + 'organization' + ] + }, + { + type: 'group', + fields: [ + 'contacts' + ] + } + ] + }, + { + index: 2, + id: 'next', + label: 'something', + fields: [ + 'foo', + 'list' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'foo' + ] + }, + { + type: 'group', + fields: [ + 'list' + ] + } + ] + } + ] +}; diff --git a/ui/src/testing/sample-fbhttp-provider.json b/ui/src/testing/sample-fbhttp-provider.json new file mode 100644 index 000000000..c5d344120 --- /dev/null +++ b/ui/src/testing/sample-fbhttp-provider.json @@ -0,0 +1,94 @@ +{ + "createdDate": "2019-09-12T10:40:41.941", + "modifiedDate": "2019-09-12T10:41:31.787", + "createdBy": "root", + "modifiedBy": "root", + "current": true, + "name": "Update Provider Name", + "resourceId": "e34f39a7-9934-43bf-80c1-3a4e76e6dee8", + "xmlId": "updateid", + "enabled": true, + "requireValidMetadata": true, + "failFastInitialization": true, + "useDefaultPredicateRegistry": true, + "satisfyAnyPredicates": false, + "doInitialization": true, + "metadataFilters": [ + { + "createdDate": "2019-09-12T10:40:41.945", + "modifiedDate": "2019-09-12T10:40:41.945", + "createdBy": "root", + "modifiedBy": "root", + "current": false, + "resourceId": "315bca8c-cc61-4425-af1a-72e0b913102f", + "filterEnabled": false, + "requireSignedRoot": false, + "audId": 10, + "@type": "SignatureValidation", + "version": -230919157 + }, + { + "createdDate": "2019-09-12T10:40:41.946", + "modifiedDate": "2019-09-12T10:40:41.946", + "createdBy": "root", + "modifiedBy": "root", + "current": false, + "resourceId": "0d46d4a9-b65e-440e-99c4-07203fe50921", + "filterEnabled": false, + "removeRolelessEntityDescriptors": true, + "removeEmptyEntitiesDescriptors": true, + "retainedRoles": [], + "audId": 11, + "@type": "EntityRoleWhiteList", + "version": 198629661 + }, + { + "createdDate": "2019-09-12T10:42:38.904", + "modifiedDate": "2019-09-12T10:42:38.904", + "createdBy": "root", + "modifiedBy": "root", + "current": false, + "resourceId": "860bf7f3-3b3c-4dc7-b19b-111c9043d446", + "filterEnabled": false, + "requireSignedRoot": false, + "audId": 15, + "@type": "SignatureValidation", + "version": -747367480 + }, + { + "createdDate": "2019-09-12T10:42:38.905", + "modifiedDate": "2019-09-12T10:42:38.905", + "createdBy": "root", + "modifiedBy": "root", + "current": false, + "resourceId": "7f24ff1d-cb52-422f-8594-682dec40b3b7", + "filterEnabled": false, + "removeRolelessEntityDescriptors": true, + "removeEmptyEntitiesDescriptors": true, + "retainedRoles": [ + "md:SPSSODescriptor" + ], + "audId": 16, + "@type": "EntityRoleWhiteList", + "version": -280104078 + } + ], + "metadataURL": "https://idp.unicon.net/idp/shibboleth", + "backingFile": "test", + "initializeFromBackupFile": false, + "backupFileInitNextRefreshDelay": "PT1H", + "reloadableMetadataResolverAttributes": { + "minRefreshDelay": "PT30S", + "maxRefreshDelay": "PT10M", + "refreshDelayFactor": 0.5 + }, + "httpMetadataResolverAttributes": { + "connectionRequestTimeout": "PT10M", + "connectionTimeout": "PT30M", + "socketTimeout": "PT12H", + "disregardTLSCertificate": false + }, + "audId": 9, + "@type": "FileBackedHttpMetadataResolver", + "version": -1622542052 +} \ No newline at end of file