Skip to content

Commit

Permalink
SHIBUI-1440
Browse files Browse the repository at this point in the history 
Updates to all scripts containing references to resolver/provider
configurations.
  • Loading branch information
Bill Smith committed Oct 15, 2019
1 parent 4612858 commit d5bdb9a
Show file tree
Hide file tree
Showing 15 changed files with 275 additions and 594 deletions.
30 changes: 15 additions & 15 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 @@ -88,29 +88,29 @@ class SeleniumSIDETest extends Specification {
// TODO: Uncomment the below commented tests once they've been updated to use the new configuration screen
where:
name | file
// 'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side'
// 'SHIBUI-1364: Compare FSMP with filters' | '/SHIBUI-1364-2.side'
// 'SHIBUI-1364: Compare LDMP with filters' | '/SHIBUI-1364-3.side'
// 'SHIBUI-1364: Compare DHTTPMP with filters' | '/SHIBUI-1364-4.side'
'SHIBUI-1364: Compare FBHTTPMP with filters' | '/SHIBUI-1364-1.side'
'SHIBUI-1364: Compare FSMP with filters' | '/SHIBUI-1364-2.side'
'SHIBUI-1364: Compare LDMP with filters' | '/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-1352: Create LocalDynamic provider' | '/SHIBUI-1352-1.side'
'SHIBUI-1352: Create FileSystem provider' | '/SHIBUI-1352-2.side'
'SHIBUI-1333: Verify metadata source configuration' | '/SHIBUI-1333.side'
'SHIBUI-1334: Verify metadata source versioning' | '/SHIBUI-1334-1.side'
// 'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side'
// 'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side'
// 'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side'
// 'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side'
// 'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side'
// 'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side'
// 'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side'
'SHIBUI-1334: Verify metadata provider versioning' | '/SHIBUI-1334-2.side'
'SHIBUI-1335: Verify File Backed HTTP Metadata Provider Filters' | '/SHIBUI-1335-1.side'
'SHIBUI-1335: Verify Filesystem Metadata Provider Filters' | '/SHIBUI-1335-2.side'
'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side'
'SHIBUI-1335: Verify Dynamic HTTP Metadata Provider Filters' | '/SHIBUI-1335-4.side'
'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side'
'SHIBUI-1361: Verify dates display in proper format' | '/SHIBUI-1361.side'
'SHIBUI-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side'
// 'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.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-1407: Metadata provider comparison highlights' | '/SHIBUI-1407-2.side'
}
}

36 changes: 12 additions & 24 deletions backend/src/integration/resources/SHIBUI-1335-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,20 +571,6 @@
["xpath=//li[3]/button", "xpath:position"]
],
"value": ""
}, {
"id": "12673aa7-fc4e-4877-9842-a9d88dbc2d97",
"comment": "",
"command": "click",
"target": "linkText=File Backed HTTP Metadata Provider",
"targets": [
["linkText=File Backed HTTP Metadata Provider", "linkText"],
["css=td > a", "css:finder"],
["xpath=//a[contains(text(),'File Backed HTTP Metadata Provider')]", "xpath:link"],
["xpath=//a[contains(@href, '/metadata/provider/da22a0b7-40d7-418c-bbe9-7ba4c37d3905/configuration/options')]", "xpath:href"],
["xpath=//td[2]/a", "xpath:position"],
["xpath=//a[contains(.,'File Backed HTTP Metadata Provider')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "daa2d46a-d238-4a48-aca7-0f34c9b93d5f",
"comment": "",
Expand Down Expand Up @@ -1630,21 +1616,23 @@
"id": "100902ee-6d6e-4148-a69b-b37746a4ad6e",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(3)",
"target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn",
"targets": [
["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"],
["xpath=//td[3]", "xpath:position"],
["xpath=//td[contains(.,'Entity Attributes Filter')]", "xpath:innerText"]
["css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn", "css:finder"],
["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/button", "xpath:idRelative"],
["xpath=//filter-configuration-list-item/div/button", "xpath:position"],
["xpath=//button[contains(.,'Entity Attributes Filter')]", "xpath:innerText"]
],
"value": "Entity Attributes Filter"
}, {
"id": "9cc5dbab-bb39-455d-9338-6bdd054841e0",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(1) .fa-arrow-circle-down",
"target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)",
"targets": [
["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"],
["xpath=//button[2]/i", "xpath:position"]
["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"],
["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"],
["xpath=//button[2]", "xpath:position"]
],
"value": ""
}, {
Expand All @@ -1658,7 +1646,7 @@
"id": "c9d498da-9f59-40ae-b5d4-cae397a13766",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(3)",
"target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn",
"targets": [
["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"],
["xpath=//td[3]", "xpath:position"],
Expand All @@ -1669,7 +1657,7 @@
"id": "1b05bac6-3412-4f4d-b168-0f7fb124e5d0",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(1) .fa-arrow-circle-down",
"target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)",
"targets": [
["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"],
["xpath=//button[2]/i", "xpath:position"]
Expand All @@ -1686,7 +1674,7 @@
"id": "441608df-24a3-4a60-bfce-50a90ff0ee16",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(3)",
"target": "css=.list-group-item:nth-child(1) > filter-configuration-list-item > .d-flex > .btn",
"targets": [
["css=tr:nth-child(1) > .td-lg:nth-child(3)", "css:finder"],
["xpath=//td[3]", "xpath:position"],
Expand Down
43 changes: 16 additions & 27 deletions backend/src/integration/resources/SHIBUI-1335-2.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,34 +302,21 @@
"id": "27c0717e-f477-448b-8091-3bb2f3e6080f",
"comment": "",
"command": "waitForElementVisible",
"target": "css=td:nth-child(3)",
"target": "css=.d-block > primitive-property:nth-child(2) .text-truncate",
"targets": [],
"value": "10000"
}, {
"id": "20f7b832-ec52-450a-8224-399f0d4de0a0",
"comment": "",
"command": "assertText",
"target": "css=td:nth-child(3)",
"target": "css=.d-block > primitive-property:nth-child(2) .text-truncate",
"targets": [
["css=td:nth-child(3)", "css:finder"],
["xpath=//td[3]", "xpath:position"],
["xpath=//td[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"]
["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"],
["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"],
["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"]
],
"value": "FilesystemMetadataResolver"
}, {
"id": "7548f260-d328-4b47-97ed-cf6df394b6bc",
"comment": "",
"command": "click",
"target": "linkText=Filesystem Metadata Provider",
"targets": [
["linkText=Filesystem Metadata Provider", "linkText"],
["css=td > a", "css:finder"],
["xpath=//a[contains(text(),'Filesystem Metadata Provider')]", "xpath:link"],
["xpath=//a[contains(@href, '/metadata/provider/5ddf2624-1a30-4709-8873-35bbba4a372f/configuration/options')]", "xpath:href"],
["xpath=//td[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Filesystem Metadata Provider')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "11d71ffb-3372-41cb-9832-72755ef298b5",
"comment": "",
Expand Down Expand Up @@ -755,21 +742,23 @@
"id": "d722902b-5c10-45dc-99df-d96f46e78313",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
"target": "css=.list-group-item:nth-child(1) span:nth-child(4)",
"targets": [
["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"],
["xpath=//td[4]", "xpath:position"],
["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"]
["css=.list-group-item:nth-child(1) span:nth-child(4)", "css:finder"],
["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"],
["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"]
],
"value": "EntityAttributes"
}, {
"id": "c8d9bc5a-4b7e-4178-8aba-8b8280506c20",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(1) .fa-arrow-circle-down",
"target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)",
"targets": [
["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"],
["xpath=//button[2]/i", "xpath:position"]
["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"],
["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"],
["xpath=//button[2]", "xpath:position"]
],
"value": ""
}, {
Expand All @@ -783,7 +772,7 @@
"id": "d7909094-96ce-4532-98b4-446cc013c9c8",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
"target": "css=.list-group-item:nth-child(1) span:nth-child(4)",
"targets": [
["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"],
["xpath=//td[4]", "xpath:position"],
Expand Down
56 changes: 23 additions & 33 deletions backend/src/integration/resources/SHIBUI-1335-3.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,34 +379,21 @@
"id": "02e53e75-003b-42ce-8522-817d52ad16a3",
"comment": "",
"command": "waitForElementVisible",
"target": "css=td:nth-child(3)",
"target": "css=.d-block > primitive-property:nth-child(2) .text-truncate",
"targets": [],
"value": "10000"
}, {
"id": "7d059a57-60f7-4729-95af-b36619b98694",
"comment": "",
"command": "assertText",
"target": "css=td:nth-child(3)",
"target": "css=.d-block > primitive-property:nth-child(2) .text-truncate",
"targets": [
["css=td:nth-child(3)", "css:finder"],
["xpath=//td[3]", "xpath:position"],
["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"]
["css=.d-block > primitive-property:nth-child(2) .text-truncate", "css:finder"],
["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property[2]/div/div/span[2]", "xpath:idRelative"],
["xpath=//primitive-property[2]/div/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"]
],
"value": "LocalDynamicMetadataResolver"
}, {
"id": "15912a4b-c036-4886-9577-312bf6816943",
"comment": "",
"command": "click",
"target": "linkText=Local Dynamic Metadata Provider",
"targets": [
["linkText=Local Dynamic Metadata Provider", "linkText"],
["css=td > a", "css:finder"],
["xpath=//a[contains(text(),'Local Dynamic Metadata Provider')]", "xpath:link"],
["xpath=//a[contains(@href, '/metadata/provider/dff5232d-66fb-4623-b25e-85c24df5ede4/configuration/options')]", "xpath:href"],
["xpath=//td[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Local Dynamic Metadata Provider')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "feb08e76-e553-4505-bffe-07f3e77206d0",
"comment": "",
Expand Down Expand Up @@ -652,18 +639,19 @@
"id": "af17a3a7-f292-4c22-8f2f-3d3bf1938fc1",
"comment": "",
"command": "waitForElementVisible",
"target": "css=.td-lg:nth-child(4)",
"target": "css=span:nth-child(4)",
"targets": [],
"value": "10000"
}, {
"id": "2b9c0a43-fd7a-4ffa-bfef-a7fc41746e16",
"comment": "",
"command": "assertText",
"target": "css=.td-lg:nth-child(4)",
"target": "css=span:nth-child(4)",
"targets": [
["css=.td-lg:nth-child(4)", "css:finder"],
["xpath=//td[4]", "xpath:position"],
["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"]
["css=span:nth-child(4)", "css:finder"],
["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"],
["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"]
],
"value": "EntityAttributes"
}, {
Expand Down Expand Up @@ -884,10 +872,11 @@
"id": "9f7e95cf-4dd5-415f-8577-a6f1bc54a85d",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(1) .fa-arrow-circle-down",
"target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)",
"targets": [
["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"],
["xpath=//button[2]/i", "xpath:position"]
["css=.list-group-item:nth-child(1) .btn:nth-child(2)", "css:finder"],
["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/div/button[2]", "xpath:idRelative"],
["xpath=//button[2]", "xpath:position"]
],
"value": ""
}, {
Expand All @@ -901,18 +890,19 @@
"id": "4a73b268-7d33-4e8c-8fa4-cb059be9768f",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
"target": "css=.list-group-item:nth-child(1) span:nth-child(4)",
"targets": [
["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"],
["xpath=//td[4]", "xpath:position"],
["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"]
["css=.list-group-item:nth-child(1) span:nth-child(4)", "css:finder"],
["xpath=//div[@id='filters']/filter-configuration-list/ul/li/filter-configuration-list-item/div/span[2]", "xpath:idRelative"],
["xpath=//filter-configuration-list-item/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'EntityAttributes')]", "xpath:innerText"]
],
"value": "NameIDFormat"
}, {
"id": "63ac7307-0538-4c0d-8e98-2f05c767baaf",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(1) .fa-arrow-circle-down",
"target": "css=.list-group-item:nth-child(1) .btn:nth-child(2)",
"targets": [
["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"],
["xpath=//button[2]/i", "xpath:position"]
Expand All @@ -929,7 +919,7 @@
"id": "ed8e07ff-0dce-47d6-8310-f1920bfe1367",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
"target": "css=.list-group-item:nth-child(1) span:nth-child(4)",
"targets": [
["css=tr:nth-child(1) > .td-lg:nth-child(4)", "css:finder"],
["xpath=//td[4]", "xpath:position"],
Expand Down
Loading

0 comments on commit d5bdb9a

Please sign in to comment.