Skip to content

Commit

Permalink
SHIBUI-1437
Browse files Browse the repository at this point in the history 
Relocated the 1364 tests to run earlier in the suite.
  • Loading branch information
Bill Smith committed Oct 14, 2019
1 parent ae2a17e commit 023e2e4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 87 deletions.
9 changes: 5 additions & 4 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,6 +88,10 @@ 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-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'
Expand All @@ -107,10 +111,7 @@ class SeleniumSIDETest extends Specification {
'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-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'

}
}

99 changes: 16 additions & 83 deletions backend/src/integration/resources/SHIBUI-1364-4.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1019,87 +1019,13 @@
["xpath=//translate-i18n[contains(.,'Save')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "f79371b5-0081-45a0-bfb3-c403db903043",
"comment": "",
"command": "pause",
"target": "5000",
"targets": [],
"value": ""
}, {
"id": "f967bc76-becf-4cf1-a2a1-11a9d7c9be49",
"comment": "",
"command": "waitForElementVisible",
"target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
"targets": [],
"value": "30000"
}, {
"id": "06d1f11d-1935-4b80-827c-72f48ea482ab",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg: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"]
],
"value": "EntityAttributes"
}, {
"id": "a8ed628c-53f7-4551-9ce8-fef976cc96ce",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(1) .fa-arrow-circle-down",
"targets": [
["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"],
["xpath=//button[2]/i", "xpath:position"]
],
"value": ""
}, {
"id": "6b3ec8f1-8b9a-40f5-816f-3a1e415b9d8d",
"comment": "",
"command": "pause",
"target": "5000",
"targets": [],
"value": ""
}, {
"id": "be805934-2692-4a1c-a28f-afb3cc4eb5f4",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg: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"]
],
"value": "NameIDFormat"
}, {
"id": "039aff93-c0de-40fb-a1c9-e22ffbf7e1da",
"comment": "",
"command": "click",
"target": "css=tr:nth-child(1) .fa-arrow-circle-down",
"targets": [
["css=tr:nth-child(1) .fa-arrow-circle-down", "css:finder"],
["xpath=//button[2]/i", "xpath:position"]
],
"value": ""
}, {
"id": "403570ff-e1f0-4db9-925f-f90c5994b60e",
"comment": "",
"command": "pause",
"target": "2000",
"targets": [],
"value": ""
}, {
"id": "8f2da627-e8ad-473a-a71a-bec5dd1f0999",
"comment": "",
"command": "assertText",
"target": "css=tr:nth-child(1) > .td-lg: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"]
],
"value": "EntityAttributes"
}, {
"id": "56e4a69d-0fcd-4d50-82c6-6716af892e39",
"comment": "",
Expand Down Expand Up @@ -1129,15 +1055,15 @@
}, {
"id": "4025491d-ad25-4b49-879a-af34ebd9ca7a",
"comment": "",
"command": "pause",
"target": "2000",
"command": "waitForElementVisible",
"target": "css=td > a",
"targets": [],
"value": ""
"value": "30000"
}, {
"id": "e28ed34b-a0bd-4339-844c-454835619d65",
"comment": "",
"command": "click",
"target": "linkText=Dynamic Http Metadata Provider",
"target": "css=td > a",
"targets": [
["linkText=Dynamic Http Metadata Provider", "linkText"],
["css=td > a", "css:finder"],
Expand Down Expand Up @@ -1176,7 +1102,7 @@
}, {
"id": "c82354e7-3041-4b44-952a-a654510d0069",
"comment": "",
"command": "waitForElementEditable",
"command": "waitForElementVisible",
"target": "id=/name",
"targets": [],
"value": "30000"
Expand Down Expand Up @@ -1310,6 +1236,13 @@
"target": "2000",
"targets": [],
"value": ""
}, {
"id": "f2dd5a70-a30f-4011-a3f5-cb0862c76edb",
"comment": "",
"command": "waitForElementVisible",
"target": "css=.bg-diff > .d-block:nth-child(2)",
"targets": [],
"value": "30000"
}, {
"id": "678221bc-06e0-4aa3-884f-e56d8418f1b9",
"comment": "",
Expand Down Expand Up @@ -1391,12 +1324,12 @@
],
"value": ""
}, {
"id": "74e14851-7254-4d18-8a33-e81af5b0b08f",
"id": "2457e1c1-6ff5-4839-bdb4-311aadc87b78",
"comment": "",
"command": "pause",
"target": "2000",
"command": "waitForElementVisible",
"target": "id=/name",
"targets": [],
"value": ""
"value": "30000"
}, {
"id": "4600a21d-e332-4d99-8903-691a6126722f",
"comment": "",
Expand Down

0 comments on commit 023e2e4

Please sign in to comment.