Skip to content

Commit

Permalink
2052
Browse files Browse the repository at this point in the history 
The rest of the fixes.
  • Loading branch information
Bill Smith committed Sep 4, 2021
1 parent b848391 commit 99d9b7a
Show file tree
Hide file tree
Showing 20 changed files with 526 additions and 546 deletions.
6 changes: 3 additions & 3 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 @@ -112,11 +112,10 @@ class SeleniumSIDETest extends Specification {
'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 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 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' // 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-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side'
'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.side'
Expand All @@ -131,6 +130,7 @@ class SeleniumSIDETest extends Specification {
'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-1742: Verify role CRUD operations' | '/SHIBUI-1742-2.side'
'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' // Something about this test breaks all the other ones after it
}
}
62 changes: 17 additions & 45 deletions backend/src/integration/resources/SHIBUI-1335-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@
"id": "fdea3214-f0e0-4f13-9d5d-e07ef92d71f1",
"comment": "",
"command": "click",
"target": "xpath=(//button[@id='dropdown-basic'])[2]",
"target": "id=metadata-nav-dropdown-toggle",
"targets": [
["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
["id=metadata-nav-dropdown-toggle", "id"],
["css=#metadata-nav-dropdown-toggle", "css:finder"],
["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
["xpath=//div[2]/button", "xpath:position"],
["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
],
Expand All @@ -86,12 +88,14 @@
"id": "2c40ac99-5e92-4c1c-923a-5a6100cadf43",
"comment": "",
"command": "click",
"target": "linkText=Add a new metadata provider",
"target": "id=metadata-nav-dropdown-provider",
"targets": [
["id=metadata-nav-dropdown-provider", "id"],
["linkText=Add a new metadata provider", "linkText"],
["css=.text-primary:nth-child(2)", "css:finder"],
["css=#metadata-nav-dropdown-provider", "css:finder"],
["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
["xpath=//a[2]", "xpath:position"],
["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
Expand Down Expand Up @@ -123,6 +127,13 @@
["xpath=//input", "xpath:position"]
],
"value": "File Backed HTTP Metadata Provider"
}, {
"id": "24f3e12d-2fe4-4be9-88d2-34a164d5e832",
"comment": "",
"command": "waitForElementEditable",
"target": "name=type",
"targets": [],
"value": "30000"
}, {
"id": "ca36b018-a4df-43d1-9fbd-973d6653d3e0",
"comment": "",
Expand Down Expand Up @@ -570,19 +581,6 @@
["xpath=//li[3]/button", "xpath:position"]
],
"value": ""
}, {
"id": "7cd861ea-d86c-4faa-a07b-c1508811b506",
"comment": "",
"command": "click",
"target": "id=root_enabled",
"targets": [
["id=root_enabled", "id"],
["css=#root_enabled", "css:finder"],
["xpath=//input[@id='root_enabled']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
["xpath=//input", "xpath:position"]
],
"value": ""
}, {
"id": "0c112a41-8feb-42da-a58b-8fc04e9a3bf6",
"comment": "",
Expand Down Expand Up @@ -730,19 +728,6 @@
["xpath=//div[2]/div/div/input", "xpath:position"]
],
"value": "/foo.*/"
}, {
"id": "f4e6e8a5-0040-4aac-a0f9-9b49abbd9568",
"comment": "",
"command": "click",
"target": "id=root_filterEnabled",
"targets": [
["id=root_filterEnabled", "id"],
["css=#root_filterEnabled", "css:finder"],
["xpath=//input[@id='root_filterEnabled']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[5]/div/div/div/div/div/input", "xpath:idRelative"],
["xpath=//div[5]/div/div/div/div/div/input", "xpath:position"]
],
"value": ""
}, {
"id": "86f35854-4979-4f43-97d9-5026d852514c",
"comment": "",
Expand Down Expand Up @@ -1434,19 +1419,6 @@
["xpath=//button[contains(.,'Add Entity ID  ')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "fa75b464-10a7-43da-939e-550e88748eb6",
"comment": "",
"command": "click",
"target": "id=root_filterEnabled",
"targets": [
["id=root_filterEnabled", "id"],
["css=#root_filterEnabled", "css:finder"],
["xpath=//input[@id='root_filterEnabled']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[2]/div/div/div/div/div/input", "xpath:idRelative"],
["xpath=//div[2]/div/div/div/div/div/input", "xpath:position"]
],
"value": ""
}, {
"id": "56f0e9b6-ee8b-46d4-b40d-b1d4e6dab294",
"comment": "",
Expand Down
36 changes: 17 additions & 19 deletions backend/src/integration/resources/SHIBUI-1335-2.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@
"id": "94e01321-ac2d-427f-89a5-7f816cea0f00",
"comment": "",
"command": "click",
"target": "xpath=(//button[@id='dropdown-basic'])[2]",
"target": "id=metadata-nav-dropdown-toggle",
"targets": [
["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
["id=metadata-nav-dropdown-toggle", "id"],
["css=#metadata-nav-dropdown-toggle", "css:finder"],
["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
["xpath=//div[2]/button", "xpath:position"],
["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
],
Expand All @@ -86,12 +88,14 @@
"id": "c65500ae-3b08-4c22-8c88-b4116d6e0c9b",
"comment": "",
"command": "click",
"target": "linkText=Add a new metadata provider",
"target": "id=metadata-nav-dropdown-provider",
"targets": [
["id=metadata-nav-dropdown-provider", "id"],
["linkText=Add a new metadata provider", "linkText"],
["css=.text-primary:nth-child(2)", "css:finder"],
["css=#metadata-nav-dropdown-provider", "css:finder"],
["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
["xpath=//a[2]", "xpath:position"],
["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
Expand Down Expand Up @@ -123,6 +127,13 @@
["xpath=//input", "xpath:position"]
],
"value": "Filesystem Metadata Provider"
}, {
"id": "f1d094a5-3a8b-4336-9d61-2f2d4b852ed4",
"comment": "",
"command": "waitForElementEditable",
"target": "name=type",
"targets": [],
"value": "30000"
}, {
"id": "aac150b1-6140-476b-8bdb-ebb83a14812d",
"comment": "",
Expand Down Expand Up @@ -328,19 +339,6 @@
["xpath=//li[3]/button", "xpath:position"]
],
"value": ""
}, {
"id": "c5fbaf24-139b-4886-a437-ef41a695bbc9",
"comment": "",
"command": "click",
"target": "id=root_enabled",
"targets": [
["id=root_enabled", "id"],
["css=#root_enabled", "css:finder"],
["xpath=//input[@id='root_enabled']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
["xpath=//input", "xpath:position"]
],
"value": ""
}, {
"id": "7fcdaee3-5714-4c5a-93a7-b1b15c6b24e1",
"comment": "",
Expand Down
36 changes: 17 additions & 19 deletions backend/src/integration/resources/SHIBUI-1335-3.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@
"id": "94e01321-ac2d-427f-89a5-7f816cea0f00",
"comment": "",
"command": "click",
"target": "xpath=(//button[@id='dropdown-basic'])[2]",
"target": "id=metadata-nav-dropdown-toggle",
"targets": [
["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
["id=metadata-nav-dropdown-toggle", "id"],
["css=#metadata-nav-dropdown-toggle", "css:finder"],
["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
["xpath=//div[2]/button", "xpath:position"],
["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
],
Expand All @@ -86,12 +88,14 @@
"id": "c65500ae-3b08-4c22-8c88-b4116d6e0c9b",
"comment": "",
"command": "click",
"target": "linkText=Add a new metadata provider",
"target": "id=metadata-nav-dropdown-provider",
"targets": [
["id=metadata-nav-dropdown-provider", "id"],
["linkText=Add a new metadata provider", "linkText"],
["css=.text-primary:nth-child(2)", "css:finder"],
["css=#metadata-nav-dropdown-provider", "css:finder"],
["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
["xpath=//a[2]", "xpath:position"],
["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
Expand Down Expand Up @@ -123,6 +127,13 @@
["xpath=//input", "xpath:position"]
],
"value": "Local Dynamic Metadata Provider"
}, {
"id": "d2ea5b2f-a693-49bb-b644-b1fb35ff54c6",
"comment": "",
"command": "waitForElementEditable",
"target": "name=type",
"targets": [],
"value": "30000"
}, {
"id": "aac150b1-6140-476b-8bdb-ebb83a14812d",
"comment": "",
Expand Down Expand Up @@ -399,19 +410,6 @@
["xpath=//li[3]/button", "xpath:position"]
],
"value": ""
}, {
"id": "d02ae356-8086-4794-97ba-980fc75cca79",
"comment": "",
"command": "click",
"target": "id=root_enabled",
"targets": [
["id=root_enabled", "id"],
["css=#root_enabled", "css:finder"],
["xpath=//input[@id='root_enabled']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
["xpath=//input", "xpath:position"]
],
"value": ""
}, {
"id": "dc60328b-d6e0-4f62-96c5-012f0fb5edc4",
"comment": "",
Expand Down
51 changes: 18 additions & 33 deletions backend/src/integration/resources/SHIBUI-1335-4.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@
"id": "94e01321-ac2d-427f-89a5-7f816cea0f00",
"comment": "",
"command": "click",
"target": "xpath=(//button[@id='dropdown-basic'])[2]",
"target": "id=metadata-nav-dropdown-toggle",
"targets": [
["xpath=(//button[@id='dropdown-basic'])[2]", "xpath:attributes"],
["xpath=(//div[@id='basic-nav-dropdown']/button)[2]", "xpath:idRelative"],
["id=metadata-nav-dropdown-toggle", "id"],
["css=#metadata-nav-dropdown-toggle", "css:finder"],
["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
["xpath=//div[2]/button", "xpath:position"],
["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
],
Expand All @@ -86,12 +88,14 @@
"id": "c65500ae-3b08-4c22-8c88-b4116d6e0c9b",
"comment": "",
"command": "click",
"target": "linkText=Add a new metadata provider",
"target": "id=metadata-nav-dropdown-provider",
"targets": [
["id=metadata-nav-dropdown-provider", "id"],
["linkText=Add a new metadata provider", "linkText"],
["css=.text-primary:nth-child(2)", "css:finder"],
["css=#metadata-nav-dropdown-provider", "css:finder"],
["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
["xpath=//div[@id='basic-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
["xpath=//a[2]", "xpath:position"],
["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
Expand Down Expand Up @@ -123,6 +127,13 @@
["xpath=//input", "xpath:position"]
],
"value": "Dynamic Http Metadata Provider"
}, {
"id": "833f72b8-851b-469c-bd2d-71f1cfbef83e",
"comment": "",
"command": "waitForElementEditable",
"target": "name=type",
"targets": [],
"value": "30000"
}, {
"id": "aac150b1-6140-476b-8bdb-ebb83a14812d",
"comment": "",
Expand Down Expand Up @@ -648,19 +659,6 @@
["xpath=//li[3]/button", "xpath:position"]
],
"value": ""
}, {
"id": "c4d98111-537a-45a1-9bfd-e8d780a0c0b3",
"comment": "",
"command": "click",
"target": "id=root_enabled",
"targets": [
["id=root_enabled", "id"],
["css=#root_enabled", "css:finder"],
["xpath=//input[@id='root_enabled']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
["xpath=//input", "xpath:position"]
],
"value": ""
}, {
"id": "a57a12dd-b641-46eb-afce-4c7be5a8f180",
"comment": "",
Expand Down Expand Up @@ -809,19 +807,6 @@
["xpath=//button[contains(.,'Add Entity ID  ')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "dff6b5d5-02ae-41a1-bae4-6ce39aeca199",
"comment": "",
"command": "click",
"target": "id=root_filterEnabled",
"targets": [
["id=root_filterEnabled", "id"],
["css=#root_filterEnabled", "css:finder"],
["xpath=//input[@id='root_filterEnabled']", "xpath:attributes"],
["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[5]/div/div/div/div/div/input", "xpath:idRelative"],
["xpath=//div[5]/div/div/div/div/div/input", "xpath:position"]
],
"value": ""
}, {
"id": "f82a986d-d0e8-433d-8b5c-805e84b76d6e",
"comment": "",
Expand Down Expand Up @@ -1168,7 +1153,7 @@
"id": "6b3ec8f1-8b9a-40f5-816f-3a1e415b9d8d",
"comment": "",
"command": "pause",
"target": "3000",
"target": "5000",
"targets": [],
"value": ""
}, {
Expand Down
Loading

0 comments on commit 99d9b7a

Please sign in to comment.