Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/shibui-2393' into featur…
Browse files Browse the repository at this point in the history 
…e/shibui-2393
  • Loading branch information
@chasegawa
chasegawa committed Dec 1, 2022
2 parents 4e26435 + 99b2ae1 commit e9950f7
Show file tree
Hide file tree
Showing 14 changed files with 373 additions and 214 deletions.
108 changes: 54 additions & 54 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 @@ -107,60 +107,60 @@ class SeleniumSIDETest extends Specification {

where:
name | file
'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side'
'SHIBUI-1364: Compare FSMP' | '/SHIBUI-1364-2.side'
'SHIBUI-1364: Compare LDMP' | '/SHIBUI-1364-3.side'
'SHIBUI-1364: Compare DHTTPMP with filters' | '/SHIBUI-1364-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' | '/SHIBUI-1335-2.side'
'SHIBUI-1335: Verify Local Dynamic Metadata Provider' | '/SHIBUI-1335-3.side'
'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side'
'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' // Note that this script WILL NOT PASS in the Selenium IDE due to it thinking there is a syntax error where there is none.
'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side'
'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.side'
'SHIBUI-1391: Regex Validation' | '/SHIBUI-1391.side'
'SHIBUI-1407: Metadata source comparison highlights' | '/SHIBUI-1407-1.side'
'SHIBUI-1407: Metadata provider comparison highlights' | '/SHIBUI-1407-2.side'
'SHIBUI-1503: Non-admin can create metadata source' | '/SHIBUI-1503-1.side'
'SHIBUI-1503: User can be deleted' | '/SHIBUI-1503-2.side'
'SHIBUI-1503: User can be enabled' | '/SHIBUI-1503-3.side'
'SHIBUI-1732: Create, use, and delete CEA String' | '/SHIBUI-1732-1.side'
'SHIBUI-1732: Create, use, and delete CEA Boolean' | '/SHIBUI-1732-2.side'
'SHIBUI-1732: Create, use, and delete CEA List' | '/SHIBUI-1732-3.side'
'SHIBUI-1732: Create, use, and delete CEA Long' | '/SHIBUI-1732-4.side'
'SHIBUI-1732: Create, use, and delete CEA Double' | '/SHIBUI-1732-5.side'
'SHIBUI-1732: Create, use, and delete CEA Duration' | '/SHIBUI-1732-6.side'
'SHIBUI-1732: Create, use, and delete CEA Spring Bean' | '/SHIBUI-1732-7.side'
'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side'
'SHIBUI-1740: Group can be created, edited, deleted' | '/SHIBUI-1740-1.side'
'SHIBUI-1740: Verify dev profile group membership' | '/SHIBUI-1740-2.side'
'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side'
'SHIBUI-1740: Verify nonadmin-owned resource visibility' | '/SHIBUI-1740-4.side'
'SHIBUI-1742: Verify enabler role allows enabling' | '/SHIBUI-1742-1.side'
'SHIBUI-1742: Verify role CRUD operations' | '/SHIBUI-1742-2.side'
'SHIBUI-1743: Verify group regex CRUD operations' | '/SHIBUI-1743-1.side'
'SHIBUI-1743: Verify nonadmin group regex validation' | '/SHIBUI-1743-2.side'
'SHIBUI-1744: Verify attribute bundle CRUD operations' | '/SHIBUI-1744-1.side'
'SHIBUI-1744: Verify attribute bundles in metadata sources' | '/SHIBUI-1744-2.side'
// 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side'
// 'SHIBUI-1364: Compare FSMP' | '/SHIBUI-1364-2.side'
// 'SHIBUI-1364: Compare LDMP' | '/SHIBUI-1364-3.side'
// 'SHIBUI-1364: Compare DHTTPMP with filters' | '/SHIBUI-1364-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' | '/SHIBUI-1335-2.side'
// 'SHIBUI-1335: Verify Local Dynamic Metadata Provider' | '/SHIBUI-1335-3.side'
// 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side'
// 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side' // Note that this script WILL NOT PASS in the Selenium IDE due to it thinking there is a syntax error where there is none.
// 'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side'
// 'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.side'
// 'SHIBUI-1391: Regex Validation' | '/SHIBUI-1391.side'
// 'SHIBUI-1407: Metadata source comparison highlights' | '/SHIBUI-1407-1.side'
// 'SHIBUI-1407: Metadata provider comparison highlights' | '/SHIBUI-1407-2.side'
// 'SHIBUI-1503: Non-admin can create metadata source' | '/SHIBUI-1503-1.side'
// 'SHIBUI-1503: User can be deleted' | '/SHIBUI-1503-2.side'
// 'SHIBUI-1503: User can be enabled' | '/SHIBUI-1503-3.side'
// 'SHIBUI-1732: Create, use, and delete CEA String' | '/SHIBUI-1732-1.side'
// 'SHIBUI-1732: Create, use, and delete CEA Boolean' | '/SHIBUI-1732-2.side'
// 'SHIBUI-1732: Create, use, and delete CEA List' | '/SHIBUI-1732-3.side'
// 'SHIBUI-1732: Create, use, and delete CEA Long' | '/SHIBUI-1732-4.side'
// 'SHIBUI-1732: Create, use, and delete CEA Double' | '/SHIBUI-1732-5.side'
// 'SHIBUI-1732: Create, use, and delete CEA Duration' | '/SHIBUI-1732-6.side'
// 'SHIBUI-1732: Create, use, and delete CEA Spring Bean' | '/SHIBUI-1732-7.side'
// 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side'
// 'SHIBUI-1740: Group can be created, edited, deleted' | '/SHIBUI-1740-1.side'
// 'SHIBUI-1740: Verify dev profile group membership' | '/SHIBUI-1740-2.side'
// 'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side'
// 'SHIBUI-1740: Verify nonadmin-owned resource visibility' | '/SHIBUI-1740-4.side'
// 'SHIBUI-1742: Verify enabler role allows enabling' | '/SHIBUI-1742-1.side'
// 'SHIBUI-1742: Verify role CRUD operations' | '/SHIBUI-1742-2.side'
// 'SHIBUI-1743: Verify group regex CRUD operations' | '/SHIBUI-1743-1.side'
// 'SHIBUI-1743: Verify nonadmin group regex validation' | '/SHIBUI-1743-2.side'
// 'SHIBUI-1744: Verify attribute bundle CRUD operations' | '/SHIBUI-1744-1.side'
// 'SHIBUI-1744: Verify attribute bundles in metadata sources' | '/SHIBUI-1744-2.side'
'SHIBUI-1744: Verify attribute bundles in entity attribute filters' | '/SHIBUI-1744-3.side'
'SHIBUI-2052: Logged in user & role appear on dashboard' | '/SHIBUI-2052.side'
'SHIBUI-2116: Verify entity attribute bundle highlights' | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
'SHIBUI-2267: Verify new RPO CRUD' | '/SHIBUI-2267.side'
'SHIBUI-2380: OIDC metadata source CRUD' | '/SHIBUI-2380.side'
'SHIBUI-1674: Verify metadata source tooltips' | '/SHIBUI-1674-1.side'
'SHIBUI-1674: Verify metadata provider tooltips' | '/SHIBUI-1674-2.side'
'SHIBUI-1674: Verify advanced menu tooltips' | '/SHIBUI-1674-3.side'
'SHIBUI-2270: Verify property set CRUD' | '/SHIBUI-2270-1.side'
'SHIBUI-2270: Verify full property set' | '/SHIBUI-2270-2.side'
'SHIBUI-2268: Verify Algorithm Filter' | '/SHIBUI-2268.side'
'SHIBUI-2269: Verify XML generation of external filters' | '/SHIBUI-2269.side'
// 'SHIBUI-2052: Logged in user & role appear on dashboard' | '/SHIBUI-2052.side'
// 'SHIBUI-2116: Verify entity attribute bundle highlights' | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
// 'SHIBUI-2267: Verify new RPO CRUD' | '/SHIBUI-2267.side'
// 'SHIBUI-2380: OIDC metadata source CRUD' | '/SHIBUI-2380.side'
// 'SHIBUI-1674: Verify metadata source tooltips' | '/SHIBUI-1674-1.side'
// 'SHIBUI-1674: Verify metadata provider tooltips' | '/SHIBUI-1674-2.side'
// 'SHIBUI-1674: Verify advanced menu tooltips' | '/SHIBUI-1674-3.side'
// 'SHIBUI-2270: Verify property set CRUD' | '/SHIBUI-2270-1.side'
// 'SHIBUI-2270: Verify full property set' | '/SHIBUI-2270-2.side'
// 'SHIBUI-2268: Verify Algorithm Filter' | '/SHIBUI-2268.side'
// 'SHIBUI-2269: Verify XML generation of external filters' | '/SHIBUI-2269.side'
}
}
39 changes: 23 additions & 16 deletions backend/src/integration/resources/SHIBUI-1333.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1306,6 +1306,19 @@
["xpath=//li[3]/button", "xpath:position"]
],
"value": ""
}, {
"id": "065023a8-0f23-42e0-89fc-29ee1c93b7e5",
"comment": "",
"command": "click",
"target": "id=root_relyingPartyOverrides_forceAuthn",
"targets": [
["id=root_relyingPartyOverrides_forceAuthn", "id"],
["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"],
["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"],
["xpath=//div[@id='root_relyingPartyOverrides_forceAuthn-group']/div/div/div/input", "xpath:idRelative"],
["xpath=//div[11]/div/div/div/div/div/input", "xpath:position"]
],
"value": ""
}, {
"id": "134bf1f3-1e86-49e7-91de-185e513b02be",
"comment": "",
Expand Down Expand Up @@ -1984,15 +1997,9 @@
}, {
"id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5",
"comment": "",
"command": "click",
"command": "assertChecked",
"target": "id=root_relyingPartyOverrides_forceAuthn",
"targets": [
["id=root_relyingPartyOverrides_forceAuthn", "id"],
["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"],
["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"],
["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"]
],
"targets": [],
"value": ""
}, {
"id": "204ea80c-4aac-497f-8956-6370967ba73e",
Expand Down Expand Up @@ -2381,23 +2388,23 @@
"id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
"comment": "",
"command": "assertText",
"target": "css=div:nth-child(8) .text-truncate",
"target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
"targets": [
["css=div:nth-child(8) .text-truncate", "css:finder"],
["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
["xpath=//div[8]/div/span[2]", "xpath:position"],
["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
],
"value": "responder-id-123"
}, {
"id": "e8b794fc-20e2-4317-8bdd-73eee8e94951",
"comment": "",
"command": "assertText",
"target": "css=.d-flex:nth-child(3) > .py-2 > span",
"target": "css=div:nth-child(10) .text-truncate",
"targets": [
["css=.d-flex:nth-child(3) > .py-2 > span", "css:finder"],
["xpath=//metadata-configuration[@id='configuration']/div/section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:idRelative"],
["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
["css=div:nth-child(10) .text-truncate", "css:finder"],
["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"],
["xpath=//div[10]/div/span[2]", "xpath:position"]
],
"value": "true"
}, {
Expand Down
Loading

0 comments on commit e9950f7

Please sign in to comment.