Skip to content

Commit

Permalink
Merged in bugfix/SHIBUI-2251 (pull request #564)
Browse files Browse the repository at this point in the history 
Bugfix/SHIBUI-2251

Approved-by: Bill Smith
Approved-by: Jonathan Johnson
  • Loading branch information
@rmathis
rmathis authored and Jonathan Johnson committed Nov 4, 2021
2 parents 0bfaa29 + cc2fdc3 commit d2220fe
Show file tree
Hide file tree
Showing 33 changed files with 1,025 additions and 985 deletions.
12 changes: 6 additions & 6 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 @@ -97,13 +97,13 @@ class SeleniumSIDETest extends Specification {
assert result.level.exitCode == 0

cleanup:
runner.getWrappedDriver().quit()
runner?.getWrappedDriver()?.quit()

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 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'
Expand All @@ -114,10 +114,10 @@ class SeleniumSIDETest extends Specification {
'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' // adding filters to this resolver type was removed in the react update
'SHIBUI-1335: Verify Local Dynamic Metadata Provider Filters' | '/SHIBUI-1335-3.side' // adding filters to this resolver type was removed in the react update
'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. There is a bug in the IDE where it thinks there is a missing ')'.
'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'
Expand Down
150 changes: 84 additions & 66 deletions backend/src/integration/resources/SHIBUI-1281.side
View file

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions backend/src/integration/resources/SHIBUI-1311.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,13 @@
"id": "5fc6a348-0533-4d94-bb76-ebb891a0db8f",
"comment": "",
"command": "click",
"target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-1",
"target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1",
"targets": [
["id=option-selector-root_backupFileInitNextRefreshDelay-item-1", "id"],
["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "id"],
["linkText=PT30S", "linkText"],
["css=#option-selector-root_backupFileInitNextRefreshDelay-item-1", "css:finder"],
["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"],
["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"],
["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-1", "css:finder"],
["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-1']", "xpath:attributes"],
["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[2]", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"],
["xpath=//div[2]/a[2]", "xpath:position"],
["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"]
Expand Down Expand Up @@ -377,13 +377,13 @@
"id": "a159e056-c870-4e02-a7e9-4b3a60d83718",
"comment": "",
"command": "click",
"target": "id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1",
"target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1",
"targets": [
["id=option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"],
["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "id"],
["linkText=PT30S", "linkText"],
["css=#option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"],
["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"],
["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"],
["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1", "css:finder"],
["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-1']", "xpath:attributes"],
["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a[2]", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"],
["xpath=//div[2]/a[2]", "xpath:position"],
["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"]
Expand Down Expand Up @@ -419,13 +419,13 @@
"id": "820397f5-aabb-46f5-a65a-56747ce29091",
"comment": "",
"command": "click",
"target": "id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3",
"target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3",
"targets": [
["id=option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"],
["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "id"],
["linkText=PT10M", "linkText"],
["css=#option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"],
["xpath=//a[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"],
["xpath=//div[@id='option-selector-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"],
["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3", "css:finder"],
["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-3']", "xpath:attributes"],
["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[4]", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"],
["xpath=//a[4]", "xpath:position"],
["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"]
Expand Down Expand Up @@ -485,13 +485,13 @@
"id": "b8d999f1-0c59-4a9a-9991-91d222f52b8e",
"comment": "",
"command": "click",
"target": "id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1",
"target": "id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1",
"targets": [
["id=option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "id"],
["id=option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "id"],
["linkText=PT30S", "linkText"],
["css=#option-selector-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"],
["xpath=//a[@id='option-selector-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"],
["xpath=//div[@id='option-selector-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"],
["css=#option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1", "css:finder"],
["xpath=//a[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval-item-1']", "xpath:attributes"],
["xpath=//div[@id='option-selector-items-root_metadataFilters_0_maxValidityInterval']/a[2]", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"],
["xpath=//div[2]/a[2]", "xpath:position"],
["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"]
Expand Down Expand Up @@ -883,13 +883,13 @@
"id": "38816b0f-9f4d-46d2-b900-937503ef93a0",
"comment": "",
"command": "click",
"target": "id=option-selector-root_backupFileInitNextRefreshDelay-item-2",
"target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2",
"targets": [
["id=option-selector-root_backupFileInitNextRefreshDelay-item-2", "id"],
["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "id"],
["linkText=PT1M", "linkText"],
["css=#option-selector-root_backupFileInitNextRefreshDelay-item-2", "css:finder"],
["xpath=//a[@id='option-selector-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"],
["xpath=//div[@id='option-selector-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"],
["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "css:finder"],
["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"],
["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"],
["xpath=//a[3]", "xpath:position"],
["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"]
Expand Down
Loading

0 comments on commit d2220fe

Please sign in to comment.