From 54bceeb4152c561df73b8dced43c5f66d50793c7 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Wed, 4 Sep 2019 12:53:09 -0700 Subject: [PATCH] SHIBUI-1385 Further attempts to get selenium to cooperate. --- .../admin/ui/SeleniumSIDETest.groovy | 26 ++++---- .../integration/resources/SHIBUI-1334-2.side | 61 ++++++++++++++++--- .../integration/resources/SHIBUI-1361.side | 51 +++++++++++++++- 3 files changed, 115 insertions(+), 23 deletions(-) diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy index a579a0543..6826cd06d 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -106,20 +106,20 @@ class SeleniumSIDETest extends Specification { // 'Create and Delete Name ID Format Regex Filter' | '/CreateAndDeleteNameIDFormatRegexFilter.side' // 'Create and Delete Name ID Format Script Filter' | '/CreateAndDeleteNameIDFormatScriptFilter.side' // 'Create and Modify Filter Order' | '/ModifyFilterOrder.side' - 'SHIBUI-1281: Metadata Source Dashboard' | '/SHIBUI-1281.side' - 'SHIBUI-1311: Metadata Provider Dashboard' | '/SHIBUI-1311.side' - 'SHIBUI-950: Metadata Source from XML w/ digest' | '/SHIBUI-950.side' - 'SHIBUI-1352: Create LocalDynamic provider' | '/SHIBUI-1352-1.side' - 'SHIBUI-1352: Create FileSystem provider' | '/SHIBUI-1352-2.side' - 'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side' +// 'SHIBUI-1281: Metadata Source Dashboard' | '/SHIBUI-1281.side' +// 'SHIBUI-1311: Metadata Provider Dashboard' | '/SHIBUI-1311.side' +// 'SHIBUI-950: Metadata Source from XML w/ digest' | '/SHIBUI-950.side' +// 'SHIBUI-1352: Create LocalDynamic provider' | '/SHIBUI-1352-1.side' +// 'SHIBUI-1352: Create FileSystem provider' | '/SHIBUI-1352-2.side' +// 'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side' 'SHIBUI-1334: Verify metadata source versioning' | '/SHIBUI-1334-1.side' - 'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side' - 'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side' - 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side' - 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' - 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' - 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' - 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' +// 'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side' +// 'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side' +// 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side' +// 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' +// 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side' +// 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' +// 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' } } diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side index e20c9ba3d..8451fc9ea 100644 --- a/backend/src/integration/resources/SHIBUI-1334-2.side +++ b/backend/src/integration/resources/SHIBUI-1334-2.side @@ -119,6 +119,13 @@ ["xpath=//li[2]/button", "xpath:position"] ], "value": "" + }, { + "id": "d072327c-78b4-4bdb-8020-b825cd26592d", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/xmlId", + "targets": [], + "value": "10000" }, { "id": "86262eda-4a44-41b0-b7aa-fa46406e2601", "comment": "", @@ -578,16 +585,10 @@ }, { "id": "5636ef67-71fb-4bca-ba58-7ecf926c7bf0", "comment": "", - "command": "click", + "command": "waitForElementEditable", "target": "id=/xmlId", - "targets": [ - ["id=/xmlId", "id"], - ["name=field38", "name"], - ["css=#\\/xmlId", "css:finder"], - ["xpath=//input[@id='/xmlId']", "xpath:attributes"], - ["xpath=//custom-string/div/input", "xpath:position"] - ], - "value": "" + "targets": [], + "value": "10000" }, { "id": "7d641e58-47ce-4d20-908c-e0002ff73cfa", "comment": "", @@ -601,6 +602,13 @@ ["xpath=//custom-string/div/input", "xpath:position"] ], "value": "123 v2" + }, { + "id": "b78c81e9-41ac-41db-837a-0db6bd4f77eb", + "comment": "", + "command": "waitForElementEditable", + "target": "id=/satisfyAnyPredicates.false", + "targets": [], + "value": "10000" }, { "id": "247b04c1-e690-42bc-ae15-dfbedb44d2e9", "comment": "", @@ -624,6 +632,13 @@ ["xpath=//button[contains(.,'Save')]", "xpath:innerText"] ], "value": "" + }, { + "id": "eb08417b-b8f0-46dc-9e32-e8daf3bc205d", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "cf005a45-74ae-4f7a-a53c-ed59d63f7114", "comment": "", @@ -781,6 +796,13 @@ ["xpath=//section[4]/div/div/div/button/span", "xpath:position"] ], "value": "" + }, { + "id": "863e9f5e-a3d6-47e9-8b65-de639029812a", + "comment": "", + "command": "waitForElementVisible", + "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", + "targets": [], + "value": "10000" }, { "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a", "comment": "", @@ -818,6 +840,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "8277f894-0bbd-41f7-b3bb-1aba2a0f80be", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1", + "targets": [], + "value": "10000" }, { "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", @@ -844,6 +873,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "7014a534-b908-482f-85d2-7f7031741b04", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2", + "targets": [], + "value": "10000" }, { "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", @@ -869,6 +905,13 @@ ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "c28e3ee6-e536-4eb7-914b-896b2ec2cb9e", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3", + "targets": [], + "value": "10000" }, { "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side index 8185b484e..ae87cd2b7 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -601,6 +601,13 @@ "target": "id=/xmlId", "targets": [], "value": "10000" + }, { + "id": "0aae114c-3e79-4d57-8f40-e669887a8545", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "7d641e58-47ce-4d20-908c-e0002ff73cfa", "comment": "", @@ -702,6 +709,13 @@ ["xpath=//button[contains(.,'  Restore')]", "xpath:innerText"] ], "value": "10000" + }, { + "id": "271939a6-6196-4c14-aa13-e6c31e0373c2", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "c223e329-733c-41eb-9e85-c6f69a840179", "comment": "", @@ -857,6 +871,13 @@ ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] ], "value": "" + }, { + "id": "6e01f905-fd32-45a5-9517-9dd12191f7ae", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1", + "targets": [], + "value": "10000" }, { "id": "8ba62572-354d-47f4-bb72-f9309c1cb201", "comment": "", @@ -883,6 +904,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "01d5f751-6964-4fd8-a0de-36fd79d7be99", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2", + "targets": [], + "value": "10000" }, { "id": "337ac160-7990-425f-83da-2788d8a0985e", "comment": "", @@ -908,6 +936,13 @@ ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"] ], "value": "" + }, { + "id": "99c7ec5a-ad8c-4970-b97f-27997098c0d6", + "comment": "", + "command": "waitForElementVisible", + "target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3", + "targets": [], + "value": "10000" }, { "id": "34693225-4754-4b27-92ee-3e37304a8cd7", "comment": "", @@ -932,6 +967,13 @@ ["xpath=//button[contains(.,'Save')]", "xpath:innerText"] ], "value": "" + }, { + "id": "4e2831c6-d1ba-409d-a0cc-7a25dad75421", + "comment": "", + "command": "waitForElementVisible", + "target": "linkText=Test Metadata Provider", + "targets": [], + "value": "10000" }, { "id": "8868c054-2e6a-403e-ba2b-499a56730d71", "comment": "", @@ -1050,6 +1092,13 @@ "target": "isDate", "targets": [], "value": "true" + }, { + "id": "48fc4781-3313-4f56-8546-00e8210d9641", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "2cfe222d-a506-4f2b-8840-4b4a76cf2bfb", "comment": "", @@ -1065,7 +1114,7 @@ "id": "a10e3e37-28f1-403f-b572-8b4020de7904", "comment": "", "command": "click", - "target": "css=tr:nth-child(2) .custom-control-label", + "target": "css=tr:nth-child(3) .custom-control-label", "targets": [ ["css=tr:nth-child(2) .custom-control-label", "css:finder"], ["xpath=//tr[2]/td/div/label", "xpath:position"]