Skip to content

Commit

Permalink
SHIBUI-1461
Browse files Browse the repository at this point in the history 
First pass at replacing "verify" with "assert". Remaining test failures
should be fixable once a loading indicator has been added to the UI.
  • Loading branch information
Bill Smith committed Aug 21, 2019
1 parent 534e13b commit 80462e8
Show file tree
Hide file tree
Showing 15 changed files with 136 additions and 129 deletions.
24 changes: 12 additions & 12 deletions ...end/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion backend/src/integration/resources/SHIBUI-1062.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,4 @@
}],
"urls": ["http://localhost:10101/"],
"plugins": []
}
}
20 changes: 10 additions & 10 deletions backend/src/integration/resources/SHIBUI-1281.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -1784,7 +1784,7 @@
}, {
"id": "6de4b65a-266e-4974-9729-cf70502bb8fd",
"comment": "",
"command": "verifyElementNotPresent",
"command": "assertElementNotPresent",
"target": "css=td:nth-child(2)",
"targets": [],
"value": ""
Expand All @@ -1800,4 +1800,4 @@
}],
"urls": ["http://localhost:10101/"],
"plugins": []
}
}
20 changes: 10 additions & 10 deletions backend/src/integration/resources/SHIBUI-1311.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -903,4 +903,4 @@
}],
"urls": ["http://localhost:10101/"],
"plugins": []
}
}
40 changes: 20 additions & 20 deletions backend/src/integration/resources/SHIBUI-1333.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -1784,7 +1784,7 @@
}, {
"id": "6de4b65a-266e-4974-9729-cf70502bb8fd",
"comment": "",
"command": "verifyElementNotPresent",
"command": "assertElementNotPresent",
"target": "css=td:nth-child(2)",
"targets": [],
"value": ""
Expand Down Expand Up @@ -1824,7 +1824,7 @@
}, {
"id": "c9ea2708-7c12-43ce-b827-f0f34d2f2831",
"comment": "",
"command": "verifyText",
"command": "assertText",
"target": "css=.author",
"targets": [
["css=.author", "css:finder"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down Expand Up @@ -1967,4 +1967,4 @@
}],
"urls": ["http://localhost:10101/"],
"plugins": []
}
}
Loading

0 comments on commit 80462e8

Please sign in to comment.