From 534e13bd121d783dd546e1954333748f2598f341 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Tue, 20 Aug 2019 14:03:21 -0700 Subject: [PATCH 01/10] SHIBUI-1382 Fixed SHIBUI-950 test. test was producing an error stating that `attachFile` should be used to set the filename for a file upload element. This seems to work for the commandline runner, but there is no such command in the IDE. --- backend/src/integration/resources/SHIBUI-950.side | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/backend/src/integration/resources/SHIBUI-950.side b/backend/src/integration/resources/SHIBUI-950.side index 0410a5155..3d33b2ded 100644 --- a/backend/src/integration/resources/SHIBUI-950.side +++ b/backend/src/integration/resources/SHIBUI-950.side @@ -113,15 +113,9 @@ }, { "id": "e5d771f5-57e2-4f11-af50-124c2121d36b", "comment": "", - "command": "type", + "command": "attachFile", "target": "id=fileInput", - "targets": [ - ["id=fileInput", "id"], - ["name=file", "name"], - ["css=#fileInput", "css:finder"], - ["xpath=//input[@id='fileInput']", "xpath:attributes"], - ["xpath=//div[2]/div/input", "xpath:position"] - ], + "targets": [], "value": "${SHIBUI950}" }, { "id": "67ad4a51-7c15-41e1-bc34-62a9f3e83b46", From 80462e877f2ebb12cc39da8d6818d1c9375b727c Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Wed, 21 Aug 2019 14:30:56 -0700 Subject: [PATCH 02/10] SHIBUI-1461 First pass at replacing "verify" with "assert". Remaining test failures should be fixable once a loading indicator has been added to the UI. --- .../admin/ui/SeleniumSIDETest.groovy | 24 ++++----- .../integration/resources/SHIBUI-1062.side | 2 +- .../integration/resources/SHIBUI-1281.side | 20 +++---- .../integration/resources/SHIBUI-1311.side | 20 +++---- .../integration/resources/SHIBUI-1333.side | 40 +++++++------- .../integration/resources/SHIBUI-1334-1.side | 52 +++++++++---------- .../integration/resources/SHIBUI-1334-2.side | 28 +++++----- .../integration/resources/SHIBUI-1335-1.side | 8 +-- .../integration/resources/SHIBUI-1335-2.side | 8 +-- .../integration/resources/SHIBUI-1335-3.side | 29 +++++++---- .../integration/resources/SHIBUI-1335-4.side | 10 ++-- .../integration/resources/SHIBUI-1352-1.side | 6 +-- .../integration/resources/SHIBUI-1352-2.side | 6 +-- .../integration/resources/SHIBUI-1392.side | 6 +-- .../src/integration/resources/SHIBUI-950.side | 6 +-- 15 files changed, 136 insertions(+), 129 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 e61c9dc26..9db1c4f68 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,18 +106,18 @@ 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-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-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' } } diff --git a/backend/src/integration/resources/SHIBUI-1062.side b/backend/src/integration/resources/SHIBUI-1062.side index b85710e5d..da2a66cbd 100644 --- a/backend/src/integration/resources/SHIBUI-1062.side +++ b/backend/src/integration/resources/SHIBUI-1062.side @@ -290,4 +290,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side index d10036ae0..a2f9781a5 100644 --- a/backend/src/integration/resources/SHIBUI-1281.side +++ b/backend/src/integration/resources/SHIBUI-1281.side @@ -1613,7 +1613,7 @@ }, { "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "targets": [ ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], @@ -1624,7 +1624,7 @@ }, { "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "targets": [ ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"], @@ -1635,7 +1635,7 @@ }, { "id": "e53030b6-f344-4361-981d-b8303a721c5d", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "targets": [ ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"], @@ -1646,7 +1646,7 @@ }, { "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)", "targets": [ ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], @@ -1677,7 +1677,7 @@ }, { "id": "ba9fb8e8-d332-45bd-accd-703284744136", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(1)", "targets": [ ["linkText=Test Provider", "linkText"], @@ -1691,7 +1691,7 @@ }, { "id": "eff4c9fe-7daf-4082-a162-4a9dff323293", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(2)", "targets": [ ["css=td:nth-child(2)", "css:finder"], @@ -1702,7 +1702,7 @@ }, { "id": "b2d9f789-fb94-459f-9947-5364cebc43d1", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -1749,7 +1749,7 @@ }, { "id": "a69f4347-8e82-483d-8a8a-e78a894e7aaa", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(2)", "targets": [ ["css=td:nth-child(2)", "css:finder"], @@ -1784,7 +1784,7 @@ }, { "id": "6de4b65a-266e-4974-9729-cf70502bb8fd", "comment": "", - "command": "verifyElementNotPresent", + "command": "assertElementNotPresent", "target": "css=td:nth-child(2)", "targets": [], "value": "" @@ -1800,4 +1800,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 748be7cd3..d283a15be 100644 --- a/backend/src/integration/resources/SHIBUI-1311.side +++ b/backend/src/integration/resources/SHIBUI-1311.side @@ -488,7 +488,7 @@ }, { "id": "52f5680c-c63d-411e-8332-52901f12ea3b", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "targets": [ ["css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], @@ -499,7 +499,7 @@ }, { "id": "67ff44aa-1efd-4b13-a0e9-3648a09911dd", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "targets": [ ["css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], @@ -530,7 +530,7 @@ }, { "id": "f48dd1b5-607a-485b-b1d5-03301f99b9ce", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "linkText=Test Metadata Provider", "targets": [ ["linkText=Test Metadata Provider", "linkText"], @@ -544,7 +544,7 @@ }, { "id": "5eccd4e9-a451-4ec8-a9e1-1e1f8e771677", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -555,7 +555,7 @@ }, { "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(4)", "targets": [ ["css=td:nth-child(4)", "css:finder"], @@ -826,7 +826,7 @@ }, { "id": "b437068f-d3ed-43b5-9975-fb54decaf7ab", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "linkText=Test Metadata Provider", "targets": [ ["linkText=Test Metadata Provider", "linkText"], @@ -840,7 +840,7 @@ }, { "id": "abf5ec9e-eeb3-480f-8919-1efecbae20d0", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "linkText=Test Provider 2", "targets": [ ["linkText=Test Provider 2", "linkText"], @@ -864,7 +864,7 @@ }, { "id": "72123a28-c3be-478c-8f30-555e346837e2", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.badge-success > span", "targets": [ ["css=.badge-success > span", "css:finder"], @@ -884,7 +884,7 @@ }, { "id": "ad8842de-2a4c-42a4-b919-dd7524a679c6", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.badge-danger > span", "targets": [ ["css=.badge-danger > span", "css:finder"], @@ -903,4 +903,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side index 3e4267ecb..9b66bde58 100644 --- a/backend/src/integration/resources/SHIBUI-1333.side +++ b/backend/src/integration/resources/SHIBUI-1333.side @@ -1613,7 +1613,7 @@ }, { "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "targets": [ ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], @@ -1624,7 +1624,7 @@ }, { "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "targets": [ ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"], @@ -1635,7 +1635,7 @@ }, { "id": "e53030b6-f344-4361-981d-b8303a721c5d", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "targets": [ ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"], @@ -1646,7 +1646,7 @@ }, { "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)", "targets": [ ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], @@ -1677,7 +1677,7 @@ }, { "id": "ba9fb8e8-d332-45bd-accd-703284744136", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(1)", "targets": [ ["linkText=Test Provider", "linkText"], @@ -1691,7 +1691,7 @@ }, { "id": "eff4c9fe-7daf-4082-a162-4a9dff323293", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(2)", "targets": [ ["css=td:nth-child(2)", "css:finder"], @@ -1702,7 +1702,7 @@ }, { "id": "b2d9f789-fb94-459f-9947-5364cebc43d1", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -1749,7 +1749,7 @@ }, { "id": "a69f4347-8e82-483d-8a8a-e78a894e7aaa", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(2)", "targets": [ ["css=td:nth-child(2)", "css:finder"], @@ -1784,7 +1784,7 @@ }, { "id": "6de4b65a-266e-4974-9729-cf70502bb8fd", "comment": "", - "command": "verifyElementNotPresent", + "command": "assertElementNotPresent", "target": "css=td:nth-child(2)", "targets": [], "value": "" @@ -1824,7 +1824,7 @@ }, { "id": "c9ea2708-7c12-43ce-b827-f0f34d2f2831", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.author", "targets": [ ["css=.author", "css:finder"], @@ -1836,7 +1836,7 @@ }, { "id": "16271513-203c-4528-870f-dcf73f4d81cb", "comment": "", - "command": "verifyText", + "command": "assertText", "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"], @@ -1848,7 +1848,7 @@ }, { "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(3) > .text-truncate", "targets": [ ["css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(3) > .text-truncate", "css:finder"], @@ -1859,7 +1859,7 @@ }, { "id": "467409c7-1007-4c45-80d2-0b4eea5199a0", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(2) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(2) primitive-property:nth-child(2) .d-block:nth-child(2)", "css:finder"], @@ -1871,7 +1871,7 @@ }, { "id": "eaaf9d59-1466-4736-924c-56c9b3f7522f", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=array-property:nth-child(2) .text-truncate:nth-child(2)", "targets": [ ["css=array-property:nth-child(2) .text-truncate:nth-child(2)", "css:finder"], @@ -1883,7 +1883,7 @@ }, { "id": "2a23096f-d5cd-4727-af1b-130388117aa0", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(4) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "targets": [ ["css=.mb-4:nth-child(4) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], @@ -1901,7 +1901,7 @@ }, { "id": "fe47ffd2-d2a0-4264-90fe-31b998f81ac2", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(5) primitive-property:nth-child(3) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(5) primitive-property:nth-child(3) .d-block:nth-child(2)", "css:finder"], @@ -1912,7 +1912,7 @@ }, { "id": "7300785c-b83e-49b8-97a6-d66516f6c133", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(6) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate", "targets": [ ["css=.mb-4:nth-child(6) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], @@ -1923,7 +1923,7 @@ }, { "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(7) primitive-property:nth-child(7) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(7) primitive-property:nth-child(7) .d-block:nth-child(2)", "css:finder"], @@ -1935,7 +1935,7 @@ }, { "id": "e8b794fc-20e2-4317-8bdd-73eee8e94951", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.d-flex:nth-child(3) > .py-2 > span", "targets": [ ["css=.d-flex:nth-child(3) > .py-2 > span", "css:finder"], @@ -1967,4 +1967,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index d19bef702..79c98c30a 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -1613,7 +1613,7 @@ }, { "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "targets": [ ["css=.px-3 > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], @@ -1624,7 +1624,7 @@ }, { "id": "0d355ff0-0449-49a7-ae75-14d7c405b97c", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "targets": [ ["css=.px-3:nth-child(2) > summary-property:nth-child(2) tr:nth-child(2) > td:nth-child(1)", "css:finder"], @@ -1635,7 +1635,7 @@ }, { "id": "e53030b6-f344-4361-981d-b8303a721c5d", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "targets": [ ["css=summary-property:nth-child(2) > .mb-3 > .list-unstyled > li:nth-child(5)", "css:finder"], @@ -1646,7 +1646,7 @@ }, { "id": "18636780-2feb-458f-97be-cf4a625b22e1", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=summary-property:nth-child(10) .d-block:nth-child(2)", "targets": [ ["css=summary-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], @@ -1677,7 +1677,7 @@ }, { "id": "ba9fb8e8-d332-45bd-accd-703284744136", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(1)", "targets": [ ["linkText=Test Provider", "linkText"], @@ -1691,7 +1691,7 @@ }, { "id": "eff4c9fe-7daf-4082-a162-4a9dff323293", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(2)", "targets": [ ["css=td:nth-child(2)", "css:finder"], @@ -1702,7 +1702,7 @@ }, { "id": "b2d9f789-fb94-459f-9947-5364cebc43d1", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -1749,7 +1749,7 @@ }, { "id": "a69f4347-8e82-483d-8a8a-e78a894e7aaa", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(2)", "targets": [ ["css=td:nth-child(2)", "css:finder"], @@ -1784,7 +1784,7 @@ }, { "id": "6de4b65a-266e-4974-9729-cf70502bb8fd", "comment": "", - "command": "verifyElementNotPresent", + "command": "assertElementNotPresent", "target": "css=td:nth-child(2)", "targets": [], "value": "" @@ -1824,7 +1824,7 @@ }, { "id": "c9ea2708-7c12-43ce-b827-f0f34d2f2831", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.author", "targets": [ ["css=.author", "css:finder"], @@ -1836,7 +1836,7 @@ }, { "id": "16271513-203c-4528-870f-dcf73f4d81cb", "comment": "", - "command": "verifyText", + "command": "assertText", "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"], @@ -1848,7 +1848,7 @@ }, { "id": "3f2c3eab-ecbf-45f3-bcdc-a5cad766b27c", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(3) > .text-truncate", "targets": [ ["css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(3) > .text-truncate", "css:finder"], @@ -1859,7 +1859,7 @@ }, { "id": "467409c7-1007-4c45-80d2-0b4eea5199a0", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(2) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(2) primitive-property:nth-child(2) .d-block:nth-child(2)", "css:finder"], @@ -1871,7 +1871,7 @@ }, { "id": "eaaf9d59-1466-4736-924c-56c9b3f7522f", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=array-property:nth-child(2) .text-truncate:nth-child(2)", "targets": [ ["css=array-property:nth-child(2) .text-truncate:nth-child(2)", "css:finder"], @@ -1883,7 +1883,7 @@ }, { "id": "2a23096f-d5cd-4727-af1b-130388117aa0", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(4) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "targets": [ ["css=.mb-4:nth-child(4) .py-2:nth-child(3) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], @@ -1901,7 +1901,7 @@ }, { "id": "fe47ffd2-d2a0-4264-90fe-31b998f81ac2", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(5) primitive-property:nth-child(3) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(5) primitive-property:nth-child(3) .d-block:nth-child(2)", "css:finder"], @@ -1912,7 +1912,7 @@ }, { "id": "7300785c-b83e-49b8-97a6-d66516f6c133", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(6) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate", "targets": [ ["css=.mb-4:nth-child(6) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate", "css:finder"], @@ -1923,7 +1923,7 @@ }, { "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(7) primitive-property:nth-child(7) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(7) primitive-property:nth-child(7) .d-block:nth-child(2)", "css:finder"], @@ -1935,7 +1935,7 @@ }, { "id": "e8b794fc-20e2-4317-8bdd-73eee8e94951", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.d-flex:nth-child(3) > .py-2 > span", "targets": [ ["css=.d-flex:nth-child(3) > .py-2 > span", "css:finder"], @@ -2113,7 +2113,7 @@ }, { "id": "1c0b7514-92b7-4e07-b462-467113f4a8cd", "comment": "", - "command": "verifyText", + "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"], @@ -2123,7 +2123,7 @@ }, { "id": "fc7c4e1e-03c7-4108-9a8d-f469e7679ae4", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(3)", "targets": [ ["css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(3)", "css:finder"], @@ -2141,7 +2141,7 @@ }, { "id": "138ad58b-f0a2-436b-a8b0-43484f4180e6", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(2)", "targets": [ ["css=array-property:nth-child(5) .py-2:nth-child(2) > .d-flex:nth-child(1) > .text-truncate:nth-child(2)", "css:finder"], @@ -2151,7 +2151,7 @@ }, { "id": "17049c95-4724-4521-ac47-6b64bde822aa", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=array-property:nth-child(5) .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(3)", "css:finder"], @@ -2273,7 +2273,7 @@ }, { "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"], @@ -2284,7 +2284,7 @@ }, { "id": "72328587-fe8d-4dc8-bc3d-a163f91a1ad6", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(3)", "targets": [ ["css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(3)", "css:finder"], @@ -2303,4 +2303,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side index db9a5f632..6679cf490 100644 --- a/backend/src/integration/resources/SHIBUI-1334-2.side +++ b/backend/src/integration/resources/SHIBUI-1334-2.side @@ -474,7 +474,7 @@ }, { "id": "52f5680c-c63d-411e-8332-52901f12ea3b", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "targets": [ ["css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], @@ -485,7 +485,7 @@ }, { "id": "67ff44aa-1efd-4b13-a0e9-3648a09911dd", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "targets": [ ["css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"], @@ -516,7 +516,7 @@ }, { "id": "f48dd1b5-607a-485b-b1d5-03301f99b9ce", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "linkText=Test Metadata Provider", "targets": [ ["linkText=Test Metadata Provider", "linkText"], @@ -530,7 +530,7 @@ }, { "id": "5eccd4e9-a451-4ec8-a9e1-1e1f8e771677", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -541,7 +541,7 @@ }, { "id": "c768c2c1-09d4-46fe-8007-42fb4b3f4aaa", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(4)", "targets": [ ["css=td:nth-child(4)", "css:finder"], @@ -692,7 +692,7 @@ }, { "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", - "command": "verifyText", + "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"], @@ -703,7 +703,7 @@ }, { "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(3)", "targets": [ ["css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(3)", "css:finder"], @@ -713,7 +713,7 @@ }, { "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(2)", "targets": [ ["css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(2)", "css:finder"], @@ -723,7 +723,7 @@ }, { "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(3)", "targets": [ ["css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(3)", "css:finder"], @@ -961,7 +961,7 @@ }, { "id": "8a2c6435-d77b-4c87-8e0e-e1ae6d4629b9", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(4) primitive-property:nth-child(2) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(4) primitive-property:nth-child(2) .d-block:nth-child(2)", "css:finder"], @@ -971,7 +971,7 @@ }, { "id": "0687fe3f-c1af-4a5a-9708-09b7b92734bc", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.mb-4:nth-child(4) primitive-property:nth-child(3) .d-block:nth-child(2)", "targets": [ ["css=.mb-4:nth-child(4) primitive-property:nth-child(3) .d-block:nth-child(2)", "css:finder"], @@ -982,7 +982,7 @@ }, { "id": "a007794f-ab91-47b8-b470-e4294e47a2a7", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=object-property:nth-child(1) > primitive-property:nth-child(4) .d-block:nth-child(2)", "targets": [ ["css=object-property:nth-child(1) > primitive-property:nth-child(4) .d-block:nth-child(2)", "css:finder"], @@ -992,7 +992,7 @@ }, { "id": "5279bf64-46c1-4376-a527-e19e217b42fa", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=object-property:nth-child(1) > primitive-property:nth-child(5) .d-block:nth-child(2)", "targets": [ ["css=object-property:nth-child(1) > primitive-property:nth-child(5) .d-block:nth-child(2)", "css:finder"], @@ -1011,4 +1011,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side index f38eac2ce..22eb0252d 100644 --- a/backend/src/integration/resources/SHIBUI-1335-1.side +++ b/backend/src/integration/resources/SHIBUI-1335-1.side @@ -1366,7 +1366,7 @@ }, { "id": "100902ee-6d6e-4148-a69b-b37746a4ad6e", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], @@ -1394,7 +1394,7 @@ }, { "id": "c9d498da-9f59-40ae-b5d4-cae397a13766", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], @@ -1422,7 +1422,7 @@ }, { "id": "441608df-24a3-4a60-bfce-50a90ff0ee16", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(3)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"], @@ -1442,4 +1442,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 88ef75013..274619c86 100644 --- a/backend/src/integration/resources/SHIBUI-1335-2.side +++ b/backend/src/integration/resources/SHIBUI-1335-2.side @@ -287,7 +287,7 @@ }, { "id": "20f7b832-ec52-450a-8224-399f0d4de0a0", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -698,7 +698,7 @@ }, { "id": "d722902b-5c10-45dc-99df-d96f46e78313", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], @@ -726,7 +726,7 @@ }, { "id": "d7909094-96ce-4532-98b4-446cc013c9c8", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], @@ -746,4 +746,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 865b8aa0e..0d4337f72 100644 --- a/backend/src/integration/resources/SHIBUI-1335-3.side +++ b/backend/src/integration/resources/SHIBUI-1335-3.side @@ -343,7 +343,7 @@ }, { "id": "7d059a57-60f7-4729-95af-b36619b98694", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -602,7 +602,7 @@ }, { "id": "2b9c0a43-fd7a-4ffa-bfef-a7fc41746e16", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.td-lg:nth-child(4)", "targets": [ ["css=.td-lg:nth-child(4)", "css:finder"], @@ -799,10 +799,17 @@ ["xpath=//button[2]/i", "xpath:position"] ], "value": "" + }, { + "id": "afb97ce0-665f-4469-9aad-d17349c491cd", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "4a73b268-7d33-4e8c-8fa4-cb059be9768f", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], @@ -810,13 +817,6 @@ ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"] ], "value": "NameIDFormat" - }, { - "id": "81970d9d-2892-4b42-ba56-ba1a14f453d2", - "comment": "", - "command": "pause", - "target": "2000", - "targets": [], - "value": "" }, { "id": "63ac7307-0538-4c0d-8e98-2f05c767baaf", "comment": "", @@ -827,10 +827,17 @@ ["xpath=//button[2]/i", "xpath:position"] ], "value": "" + }, { + "id": "5037edea-9d8f-496d-aedc-70b8763d5de2", + "comment": "", + "command": "pause", + "target": "2000", + "targets": [], + "value": "" }, { "id": "ed8e07ff-0dce-47d6-8310-f1920bfe1367", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side index e20483cf2..0a8b13124 100644 --- a/backend/src/integration/resources/SHIBUI-1335-4.side +++ b/backend/src/integration/resources/SHIBUI-1335-4.side @@ -550,7 +550,7 @@ }, { "id": "8c52471a-70f5-43aa-b670-6f8d22e18668", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -813,7 +813,7 @@ }, { "id": "e9f4ddf4-db8a-4bda-88cc-66173717986c", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.td-lg:nth-child(4)", "targets": [ ["css=.td-lg:nth-child(4)", "css:finder"], @@ -948,7 +948,7 @@ }, { "id": "be805934-2692-4a1c-a28f-afb3cc4eb5f4", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], @@ -976,7 +976,7 @@ }, { "id": "8f2da627-e8ad-473a-a71a-bec5dd1f0999", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)", "targets": [ ["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"], @@ -996,4 +996,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-1352-1.side b/backend/src/integration/resources/SHIBUI-1352-1.side index d5a659fa7..19fd2093b 100644 --- a/backend/src/integration/resources/SHIBUI-1352-1.side +++ b/backend/src/integration/resources/SHIBUI-1352-1.side @@ -382,7 +382,7 @@ }, { "id": "f0232386-eb88-4f6c-98fa-b9065ed422b7", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "linkText=Test Local Dynamic Provider", "targets": [ ["linkText=Test Local Dynamic Provider", "linkText"], @@ -396,7 +396,7 @@ }, { "id": "5e8993ae-47ee-4e65-b667-b291d7c934ec", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -416,4 +416,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 56acfae26..d3b223606 100644 --- a/backend/src/integration/resources/SHIBUI-1352-2.side +++ b/backend/src/integration/resources/SHIBUI-1352-2.side @@ -320,7 +320,7 @@ }, { "id": "44749988-e30f-4328-9f78-dc9eaafa891a", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "linkText=Test File System Provider", "targets": [ ["linkText=Test File System Provider", "linkText"], @@ -334,7 +334,7 @@ }, { "id": "6ddcb09b-9d3b-4a13-bb95-1b79028ba2af", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(3)", "targets": [ ["css=td:nth-child(3)", "css:finder"], @@ -354,4 +354,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 a0a5b5b55..7069c809a 100644 --- a/backend/src/integration/resources/SHIBUI-1392.side +++ b/backend/src/integration/resources/SHIBUI-1392.side @@ -426,7 +426,7 @@ }, { "id": "83f6f403-40b0-4f12-82e2-a14e301dd7ff", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=.td-lg:nth-child(4)", "targets": [ ["css=.td-lg:nth-child(4)", "css:finder"], @@ -454,7 +454,7 @@ }, { "id": "6762fdb2-6744-4238-a2df-d529ab3b6102", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "id=/nameIdFormatFilterTarget.target", "targets": [ ["id=/nameIdFormatFilterTarget.target", "id"], @@ -476,4 +476,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/SHIBUI-950.side b/backend/src/integration/resources/SHIBUI-950.side index 3d33b2ded..f37692052 100644 --- a/backend/src/integration/resources/SHIBUI-950.side +++ b/backend/src/integration/resources/SHIBUI-950.side @@ -141,7 +141,7 @@ }, { "id": "185696df-a872-419e-81aa-7c9cfa1e2b90", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "linkText=File Upload Test", "targets": [ ["linkText=File Upload Test", "linkText"], @@ -155,7 +155,7 @@ }, { "id": "25b4b805-3585-4f83-b9ba-a3e8b9ee1050", "comment": "", - "command": "verifyText", + "command": "assertText", "target": "css=td:nth-child(2)", "targets": [ ["css=td:nth-child(2)", "css:finder"], @@ -175,4 +175,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} From 8354e9c4dfef3e3add035769f668448a01afad7e Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 5 Sep 2019 10:35:02 -0700 Subject: [PATCH 03/10] SHIBUI-1461 Fixes based on latest UI changes. --- .../admin/ui/SeleniumSIDETest.groovy | 24 +++++++++---------- .../integration/resources/SHIBUI-1334-2.side | 12 +++++----- 2 files changed, 18 insertions(+), 18 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 1de0ffc72..a579a0543 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,18 +106,18 @@ 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-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-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' } diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side index 646217428..1e451078f 100644 --- a/backend/src/integration/resources/SHIBUI-1334-2.side +++ b/backend/src/integration/resources/SHIBUI-1334-2.side @@ -708,18 +708,18 @@ "id": "68103f0e-e3f1-419b-903d-5d8c30bc6700", "comment": "", "command": "assertText", - "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(2)", + "target": "css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(2)", "targets": [ ["css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(2)", "css:finder"], ["xpath=//primitive-property[4]/div/span[2]", "xpath:position"], - ["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"] + ["xpath=//span[contains(.,'123 version 2')]", "xpath:innerText"] ], "value": "123 version 2" }, { "id": "a13198b9-7827-47e2-ade3-143b981d34ee", "comment": "", "command": "assertText", - "target": "css=.d-block > primitive-property:nth-child(2) .d-block:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(3)", "targets": [ ["css=.d-block > primitive-property:nth-child(4) .d-block:nth-child(3)", "css:finder"], ["xpath=//primitive-property[4]/div/span[3]", "xpath:position"] @@ -729,7 +729,7 @@ "id": "3d83741c-299e-4fcb-9ce6-4b7291c423a4", "comment": "", "command": "assertText", - "target": "css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(2)", + "target": "css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(2)", "targets": [ ["css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(2)", "css:finder"], ["xpath=//primitive-property[12]/div/span[2]", "xpath:position"] @@ -739,7 +739,7 @@ "id": "190cc157-d427-4046-aff2-180392395ad3", "comment": "", "command": "assertText", - "target": "css=.d-block > primitive-property:nth-child(10) .d-block:nth-child(3)", + "target": "css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(3)", "targets": [ ["css=.d-block > primitive-property:nth-child(12) .d-block:nth-child(3)", "css:finder"], ["xpath=//primitive-property[12]/div/span[3]", "xpath:position"] @@ -1055,4 +1055,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file From e960e3141d9796a934af0e266d308407e8ff2a98 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Fri, 6 Sep 2019 09:04:15 -0700 Subject: [PATCH 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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": "", From 246fa6363e015ccab589cbeb66b8eb028dec7525 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Wed, 11 Sep 2019 18:18:19 -0700 Subject: [PATCH 10/10] SHIBUI-1461 Removed some unnecessary scrollTo's. --- backend/src/integration/resources/SHIBUI-1333.side | 9 +-------- .../src/integration/resources/SHIBUI-1334-1.side | 14 -------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side index 9b66bde58..5e086eddb 100644 --- a/backend/src/integration/resources/SHIBUI-1333.side +++ b/backend/src/integration/resources/SHIBUI-1333.side @@ -1891,13 +1891,6 @@ ["xpath=//section[4]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"] ], "value": "http://test.org/logout2" - }, { - "id": "e1cba732-dd34-4c73-9d4c-89c440975dd8", - "comment": "", - "command": "runScript", - "target": "window.scrollTo(0,2060)", - "targets": [], - "value": "" }, { "id": "fe47ffd2-d2a0-4264-90fe-31b998f81ac2", "comment": "", @@ -1967,4 +1960,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side index 0b2bcdfbe..bffdda8f1 100644 --- a/backend/src/integration/resources/SHIBUI-1334-1.side +++ b/backend/src/integration/resources/SHIBUI-1334-1.side @@ -1891,13 +1891,6 @@ ["xpath=//section[4]/div/div[2]/object-property/array-property/div/div[3]/div/div[2]", "xpath:position"] ], "value": "http://test.org/logout2" - }, { - "id": "e1cba732-dd34-4c73-9d4c-89c440975dd8", - "comment": "", - "command": "runScript", - "target": "window.scrollTo(0,2060)", - "targets": [], - "value": "" }, { "id": "fe47ffd2-d2a0-4264-90fe-31b998f81ac2", "comment": "", @@ -2131,13 +2124,6 @@ ["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": "",