Skip to content

Commit

Permalink
SHIBUI-1437
Browse files Browse the repository at this point in the history 
Fixes based on latest changes in master.
  • Loading branch information
Bill Smith committed Oct 15, 2019
1 parent 331ec96 commit cc899cf
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 210 deletions.
26 changes: 13 additions & 13 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-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-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'
}
}

12 changes: 0 additions & 12 deletions backend/src/integration/resources/SHIBUI-1333.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2092,18 +2092,6 @@
["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
],
"value": "True"
}, {
"id": "cf6660cb-2086-452f-a5e5-ad64db784d92",
"comment": "",
"command": "click",
"target": "css=.btn:nth-child(4) > translate-i18n",
"targets": [
["css=.btn:nth-child(4) > translate-i18n", "css:finder"],
["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"],
["xpath=//div/button/translate-i18n", "xpath:position"],
["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "8872eadd-b15a-48d3-8334-a54a3fa14e6d",
"comment": "",
Expand Down
50 changes: 0 additions & 50 deletions backend/src/integration/resources/SHIBUI-1334-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2092,56 +2092,6 @@
["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
],
"value": "True"
}, {
"id": "cf6660cb-2086-452f-a5e5-ad64db784d92",
"comment": "",
"command": "click",
"target": "css=.btn:nth-child(4) > translate-i18n",
"targets": [
["css=.btn:nth-child(4) > translate-i18n", "css:finder"],
["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"],
["xpath=//div/button/translate-i18n", "xpath:position"],
["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "6a183f25-1a9c-4774-a2cc-975a641ecef7",
"comment": "",
"command": "click",
"target": "css=.btn-link:nth-child(1) > translate-i18n",
"targets": [
["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"],
["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],
["xpath=//div/a/translate-i18n", "xpath:position"],
["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "c0c0f9e1-af95-47b0-8aa8-ed141735d83b",
"comment": "",
"command": "click",
"target": "css=.breadcrumb-item > a",
"targets": [
["css=.breadcrumb-item > a", "css:finder"],
["xpath=//a[contains(text(),'Dashboard')]", "xpath:link"],
["xpath=(//a[contains(@href, '/dashboard')])[2]", "xpath:href"],
["xpath=//ol/li/a", "xpath:position"]
],
"value": ""
}, {
"id": "2536386b-315e-4b39-b9a7-badcfd0dfbb1",
"comment": "",
"command": "click",
"target": "linkText=Test Provider",
"targets": [
["linkText=Test Provider", "linkText"],
["css=td > a", "css:finder"],
["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"],
["xpath=//a[contains(@href, '/metadata/resolver/5916c370-370b-4fae-94c2-a9a9675ae95b/configuration/options')]", "xpath:href"],
["xpath=//td/a", "xpath:position"],
["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9",
"comment": "",
Expand Down
57 changes: 0 additions & 57 deletions backend/src/integration/resources/SHIBUI-1385-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2054,13 +2054,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": "",
Expand Down Expand Up @@ -2106,56 +2099,6 @@
["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
],
"value": "True"
}, {
"id": "cf6660cb-2086-452f-a5e5-ad64db784d92",
"comment": "",
"command": "click",
"target": "css=.btn:nth-child(4) > translate-i18n",
"targets": [
["css=.btn:nth-child(4) > translate-i18n", "css:finder"],
["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"],
["xpath=//div/button/translate-i18n", "xpath:position"],
["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "6a183f25-1a9c-4774-a2cc-975a641ecef7",
"comment": "",
"command": "click",
"target": "css=.btn-link:nth-child(1) > translate-i18n",
"targets": [
["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"],
["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],
["xpath=//div/a/translate-i18n", "xpath:position"],
["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "c0c0f9e1-af95-47b0-8aa8-ed141735d83b",
"comment": "",
"command": "click",
"target": "css=.breadcrumb-item > a",
"targets": [
["css=.breadcrumb-item > a", "css:finder"],
["xpath=//a[contains(text(),'Dashboard')]", "xpath:link"],
["xpath=(//a[contains(@href, '/dashboard')])[2]", "xpath:href"],
["xpath=//ol/li/a", "xpath:position"]
],
"value": ""
}, {
"id": "2536386b-315e-4b39-b9a7-badcfd0dfbb1",
"comment": "",
"command": "click",
"target": "linkText=Test Provider",
"targets": [
["linkText=Test Provider", "linkText"],
["css=td > a", "css:finder"],
["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"],
["xpath=//a[contains(@href, '/metadata/resolver/5916c370-370b-4fae-94c2-a9a9675ae95b/configuration/options')]", "xpath:href"],
["xpath=//td/a", "xpath:position"],
["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9",
"comment": "",
Expand Down
14 changes: 0 additions & 14 deletions backend/src/integration/resources/SHIBUI-1391.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,20 +580,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
64 changes: 0 additions & 64 deletions backend/src/integration/resources/SHIBUI-1407-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2094,70 +2094,6 @@
["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
],
"value": "True"
}, {
"id": "cf6660cb-2086-452f-a5e5-ad64db784d92",
"comment": "",
"command": "click",
"target": "css=.btn:nth-child(4) > translate-i18n",
"targets": [
["css=.btn:nth-child(4) > translate-i18n", "css:finder"],
["xpath=//div[@id='header']/button/translate-i18n", "xpath:idRelative"],
["xpath=//div/button/translate-i18n", "xpath:position"],
["xpath=//translate-i18n[contains(.,'Back to Top')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "6a183f25-1a9c-4774-a2cc-975a641ecef7",
"comment": "",
"command": "click",
"target": "css=.btn-link:nth-child(1) > translate-i18n",
"targets": [
["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"],
["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],
["xpath=//div/a/translate-i18n", "xpath:position"],
["xpath=//translate-i18n[contains(.,'Version History')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "c0c0f9e1-af95-47b0-8aa8-ed141735d83b",
"comment": "",
"command": "click",
"target": "css=.breadcrumb-item > a",
"targets": [
["css=.breadcrumb-item > a", "css:finder"],
["xpath=//a[contains(text(),'Dashboard')]", "xpath:link"],
["xpath=(//a[contains(@href, '/dashboard')])[2]", "xpath:href"],
["xpath=//ol/li/a", "xpath:position"]
],
"value": ""
}, {
"id": "1a194216-9305-4151-a8d8-42a586ae8e47",
"comment": "",
"command": "pause",
"target": "3000",
"targets": [],
"value": ""
}, {
"id": "2536386b-315e-4b39-b9a7-badcfd0dfbb1",
"comment": "",
"command": "click",
"target": "linkText=Test Provider",
"targets": [
["linkText=Test Provider", "linkText"],
["css=td > a", "css:finder"],
["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"],
["xpath=//a[contains(@href, '/metadata/resolver/5916c370-370b-4fae-94c2-a9a9675ae95b/configuration/options')]", "xpath:href"],
["xpath=//td/a", "xpath:position"],
["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "b5140c25-a360-42d2-b2c4-b90143b0d8b5",
"comment": "",
"command": "pause",
"target": "3000",
"targets": [],
"value": ""
}, {
"id": "2c46cdcd-d5a5-47fe-aa7b-0120fd2fcfc9",
"comment": "",
Expand Down

0 comments on commit cc899cf

Please sign in to comment.