From e960e3141d9796a934af0e266d308407e8ff2a98 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Fri, 6 Sep 2019 09:04:15 -0700 Subject: [PATCH 1/6] NOJIRA Attempt at fixing the eval(true); textbox. Jenkins was having trouble passing the test with the supposed END_KEY being sent. Removed the need for the END_KEY. --- backend/src/integration/resources/SHIBUI-1392.side | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side index 7069c809a..15edbf6fb 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -374,14 +374,14 @@ "command": "editContent", "target": "id=/nameIdFormatFilterTarget.target", "targets": [], - "value": "eval(true)" + "value": "(true);" }, { "id": "05870356-d3db-4540-bb3f-db34b1cf65f1", "comment": "", "command": "sendKeys", "target": "id=/nameIdFormatFilterTarget.target", "targets": [], - "value": "${KEY_END};" + "value": "eval" }, { "id": "d7721254-68c9-4140-af2a-1757cce99da7", "comment": "", From f17ba67cddb57d9628ab1d979e989fbe2358b737 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Tue, 10 Sep 2019 10:31:54 -0700 Subject: [PATCH 2/6] SHIBUI-1461 Added some waits around the advanced menu dropdowns for the test in 1361 in the hopes that the dropdowns behave. --- .../integration/resources/SHIBUI-1361.side | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side index ae87cd2b7..c891cb6b3 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -858,6 +858,13 @@ ["xpath=//label/span", "xpath:position"] ], "value": "" + }, { + "id": "cf14941d-698f-42ed-8731-51e6f7b90c63", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "d00ecf98-7425-467c-acbb-3b39918e3462", "comment": "", @@ -892,6 +899,13 @@ ["xpath=//li[contains(.,'PT30S')]", "xpath:innerText"] ], "value": "" + }, { + "id": "cce01c00-7d94-48ae-9de8-ead8624e2cf3", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "d7406190-0bb0-4df8-9c0b-7e393952b6a2", "comment": "", @@ -924,6 +938,13 @@ ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/ul/li[3]", "xpath:position"] ], "value": "" + }, { + "id": "d585dc51-41b2-4be8-8d84-cb21b4dc92b6", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "19182110-0f86-4601-ae12-0b90967ef68a", "comment": "", From 27338ac980b499bc7636856d7ffd3393fa6b7062 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Tue, 10 Sep 2019 14:51:45 -0700 Subject: [PATCH 3/6] SHIBUI-1461 Another attempt at stabilizing some of the intermittently failing tests. Also, added another parameter so that the tests can be run headless from a development environment easily. Simply add `-Dwebdriver.headless=true` to the execution command. --- .../admin/ui/SeleniumSIDETest.groovy | 3 +++ .../integration/resources/SHIBUI-1334-1.side | 15 ++++++++---- .../integration/resources/SHIBUI-1335-2.side | 23 ++++++++++++++++++- .../integration/resources/SHIBUI-1392.side | 23 ++++++++++++++++++- 4 files changed, 58 insertions(+), 6 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..d3dc9e3c7 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 @@ -69,6 +69,9 @@ class SeleniumSIDETest extends Specification { } else { it.baseurl = "http://localhost:${this.randomPort}" } + if (System.properties.getProperty('webdriver.headless')) { + it.addCliArgs('--headless') + } it } def runner = new Runner() diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index 0dd5e38c2..0b2bcdfbe 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -2198,10 +2198,10 @@ }, { "id": "e23ad673-a84c-4c28-a927-8baf21fe1f12", "comment": "", - "command": "waitForElementEditable", - "target": "id=/mdui/displayName", + "command": "pause", + "target": "5000", "targets": [], - "value": "10000" + "value": "" }, { "id": "6f422a9d-6c2f-4200-bdd3-411ed44773a3", "comment": "", @@ -2215,6 +2215,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Display Name v3" + }, { + "id": "77bfef92-d0e6-41eb-9cd1-c2ede0cb9144", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "c2d29077-30c4-45cf-81c9-b5790294e11e", "comment": "", @@ -2310,4 +2317,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side index 274619c86..63b48ff43 100644 --- a/backend/src/integration/resources/SHIBUI-1335-2.side +++ b/backend/src/integration/resources/SHIBUI-1335-2.side @@ -372,6 +372,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Entity Attributes" + }, { + "id": "36dac228-9203-4f2e-a623-db41ef8c019f", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "f2c07797-07f6-4325-8c5f-57a676dc982c", "comment": "", @@ -385,6 +392,13 @@ ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1c424cfa-8201-40df-b8ed-ddec065dfd66", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "bca61e15-7c13-4007-8c90-1a667bbef67d", "comment": "", @@ -399,6 +413,13 @@ ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"] ], "value": "" + }, { + "id": "98f6eea0-36ff-449c-b042-98b87f0d3a70", + "comment": "", + "command": "pause", + "target": "5000", + "targets": [], + "value": "" }, { "id": "e0c65de5-d74a-4d87-aca0-9e9f4b37fb36", "comment": "", @@ -746,4 +767,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side index 15edbf6fb..20cb9c8ee 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -322,6 +322,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Filter with Script" + }, { + "id": "493b9b4a-3e87-4cc5-be70-1a93d6d0d8b7", + "comment": "", + "command": "pause", + "target": "3000", + "targets": [], + "value": "" }, { "id": "c92e936c-d516-472f-9f28-36de89117e14", "comment": "", @@ -335,6 +342,13 @@ ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"] ], "value": "" + }, { + "id": "cf3440dc-09b5-4b14-91e6-b7f038b07a97", + "comment": "", + "command": "pause", + "target": "3000", + "targets": [], + "value": "" }, { "id": "5699a5a2-d3df-4f99-b95d-f340f9156ffe", "comment": "", @@ -349,6 +363,13 @@ ["xpath=//a[contains(.,'Script')]", "xpath:innerText"] ], "value": "" + }, { + "id": "4de0d8ce-74d5-4413-a9e8-73237a906bbd", + "comment": "", + "command": "pause", + "target": "3000", + "targets": [], + "value": "" }, { "id": "786cd3cb-46b2-4361-b449-8f679ff97135", "comment": "", @@ -476,4 +497,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file From 3455baff29879e2d9ab310a39e4266d95e67e234 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Tue, 10 Sep 2019 15:49:04 -0700 Subject: [PATCH 4/6] SHIBUI-1461 More attempts at test stabilization. --- .../integration/resources/SHIBUI-1335-1.side | 44 ++++++++++++++++++- .../integration/resources/SHIBUI-1335-3.side | 21 +++++++++ .../integration/resources/SHIBUI-1335-4.side | 23 +++++++++- .../integration/resources/SHIBUI-1361.side | 12 ++--- 4 files changed, 89 insertions(+), 11 deletions(-) diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index 22eb0252d..888f1498e 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -585,6 +585,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Entity Attributes Filter" + }, { + "id": "9ac14c43-206b-4a60-8e58-c4ce64efa2c8", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "a10a6faf-90cd-4713-8ea3-60c768ed935e", "comment": "", @@ -598,6 +605,13 @@ ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"] ], "value": "" + }, { + "id": "1f54a508-0b40-4dc0-b6e0-706971fb19bf", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "1f2b93b8-23ae-4a9c-b015-96ca890ae150", "comment": "", @@ -612,6 +626,13 @@ ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"] ], "value": "" + }, { + "id": "b2a41370-db61-4bae-a5f7-a8c5e852e15e", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "5c2ed93d-3630-408c-bb89-0b2baffb73c0", "comment": "", @@ -1108,6 +1129,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Name ID Format Filter" + }, { + "id": "563c9606-0174-4432-877a-ad769eb3206a", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "abfa17d5-ebfe-4bb2-b64a-ef5f127bac86", "comment": "", @@ -1121,6 +1149,13 @@ ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"] ], "value": "" + }, { + "id": "43878e34-28cc-424f-9044-87b8cb61db03", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "6040112e-86c4-4e98-b258-79d7e61dfb6d", "comment": "", @@ -1135,6 +1170,13 @@ ["xpath=//a[contains(.,'Entity ID')]", "xpath:innerText"] ], "value": "" + }, { + "id": "70eba7e8-d84f-4b65-b5e8-d1523514dd29", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "bba23377-23a1-46d5-b044-15047a08ee53", "comment": "", @@ -1442,4 +1484,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side index 0d4337f72..748ed9fed 100644 --- a/backend/src/integration/resources/SHIBUI-1335-3.side +++ b/backend/src/integration/resources/SHIBUI-1335-3.side @@ -687,6 +687,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Name ID Format Filter" + }, { + "id": "03d1d74e-efa5-4d0e-a780-900449bb4ac5", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "9b9d7604-7025-4ccb-bb95-862f57f696f1", "comment": "", @@ -700,6 +707,13 @@ ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"] ], "value": "" + }, { + "id": "5cda2bf9-f169-4e37-8071-a6f8d1d1407d", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "9e84c57f-c33d-48f8-85ac-ed50751eb37b", "comment": "", @@ -714,6 +728,13 @@ ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"] ], "value": "" + }, { + "id": "82336d07-df2f-416e-b5c3-59eaf64a82d4", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "f3bc22e2-0e3a-4d58-b992-31d687148c57", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side index 0a8b13124..a41683edf 100644 --- a/backend/src/integration/resources/SHIBUI-1335-4.side +++ b/backend/src/integration/resources/SHIBUI-1335-4.side @@ -864,6 +864,13 @@ ["xpath=//input", "xpath:position"] ], "value": "Name ID Format Filter" + }, { + "id": "dbae3f45-d828-4a82-bc01-a1e48381fa2e", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "81373637-8e36-4736-9b2a-7b8d477dc2c1", "comment": "", @@ -877,6 +884,13 @@ ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"] ], "value": "" + }, { + "id": "7cf83d2f-841e-48f3-997e-3dfedfb47dec", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "f562c710-39fc-490d-80c9-d3525722397c", "comment": "", @@ -891,6 +905,13 @@ ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"] ], "value": "" + }, { + "id": "0f4f0257-b63c-4724-b308-f54acf2afc2b", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "c5dc3e04-eb5a-4885-92ed-3425da3026e6", "comment": "", @@ -996,4 +1017,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 c891cb6b3..038b8c149 100644 --- a/backend/src/integration/resources/SHIBUI-1361.side +++ b/backend/src/integration/resources/SHIBUI-1361.side @@ -837,15 +837,9 @@ }, { "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a", "comment": "", - "command": "click", - "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", - "targets": [ - ["css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", "css:finder"], - ["xpath=(//button[@type='button'])[2]", "xpath:attributes"], - ["xpath=//div[@id='/httpMetadataResolverAttributes/connectionRequestTimeout-container']/div/div/button", "xpath:idRelative"], - ["xpath=//auto-complete/div/div/div/button", "xpath:position"], - ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"] - ], + "command": "pause", + "target": "1000", + "targets": [], "value": "" }, { "id": "1cde012c-d521-4fd5-a7d5-7a680bba0e7b", From e91d7b9a0803a1aa26ba3f6e9df46f01c9be25da Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Wed, 11 Sep 2019 11:32:15 -0700 Subject: [PATCH 5/6] SHIBUI-1461 Another small update to help the test for 1311 run more smoothly. In theory. --- .../integration/resources/SHIBUI-1311.side | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side index d283a15be..84a1ac553 100644 --- a/backend/src/integration/resources/SHIBUI-1311.side +++ b/backend/src/integration/resources/SHIBUI-1311.side @@ -775,6 +775,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "0b928b41-6638-4dc7-8e05-88b2c20ec90d", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "bcbc4aaf-e8f6-4369-b6aa-e33c0d9dddf1", "comment": "", @@ -785,6 +792,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "aa2fbf24-a083-493c-aa82-ac8ac44b807c", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "a97290c3-88ce-41d7-9619-f111ecbeb778", "comment": "", @@ -806,6 +820,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "2c9b0634-d28a-4623-adde-9e0be2549ac4", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "1237c623-a944-4525-9aea-b93fdd007f78", "comment": "", @@ -903,4 +924,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file From 7059013e15e0744f521495d261448174e2530335 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Wed, 11 Sep 2019 15:06:02 -0700 Subject: [PATCH 6/6] SHIBUI-1461 Added a couple more pauses to try and help intermittent failures. --- backend/src/integration/resources/SHIBUI-1311.side | 7 +++++++ .../src/integration/resources/SHIBUI-1335-1.side | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/backend/src/integration/resources/SHIBUI-1311.side b/backend/src/integration/resources/SHIBUI-1311.side index 84a1ac553..b7812abbc 100644 --- a/backend/src/integration/resources/SHIBUI-1311.side +++ b/backend/src/integration/resources/SHIBUI-1311.side @@ -765,6 +765,13 @@ ["xpath=//li[contains(.,'PT1M')]", "xpath:innerText"] ], "value": "" + }, { + "id": "a618d41d-77d2-43ef-9237-6f4f638a282d", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "9136f894-3cd3-4404-a1a8-9c09ee02f60d", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index 888f1498e..c66642bf0 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -233,6 +233,13 @@ ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/boolean-radio/div/div/label/input", "xpath:position"] ], "value": "" + }, { + "id": "d0af8425-5f4c-4037-a549-52553b828179", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "9fe532ee-4ce6-4ff8-ab6c-ea92eb527ded", "comment": "", @@ -243,6 +250,13 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "44e705a1-f284-4303-a0b6-c4bc9896c78d", + "comment": "", + "command": "pause", + "target": "1000", + "targets": [], + "value": "" }, { "id": "824b4515-ae14-436e-a56f-d631ea9e1edc", "comment": "",