Skip to content

Commit

Permalink
Merged develop into feature/shibui-2269
Browse files Browse the repository at this point in the history
  • Loading branch information
@chasegawa
chasegawa committed Jul 5, 2022
2 parents fe5a762 + 5d5dc4d commit 2f33071
Show file tree
Hide file tree
Showing 53 changed files with 736 additions and 82 deletions.
2 changes: 1 addition & 1 deletion backend/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ dependencies {
compile group: 'org.jadira.usertype', name: 'usertype.core', version: '6.0.1.GA'

//For easy data mocking capabilities
compile 'net.andreinc.mockneat:mockneat:0.1.4'
compile 'net.andreinc:mockneat:0.4.7'

//So it works on Java 9 without explicitly requiring to load that module (needed by Hibernate)
runtimeOnly 'javax.xml.bind:jaxb-api:2.3.0'
Expand Down
25 changes: 16 additions & 9 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 @@ -37,6 +37,9 @@ class SeleniumSIDETest extends Specification {
it.remoteUrl = 'http://selenium-hub:4444/wd/hub'
it.remoteBrowser = 'firefox'
}
if (System.properties.getProperty('selenium.port')) {
this.setRandomPort("${System.properties.getProperty('selenium.port')}" as int)
}
if (System.properties.getProperty('selenium.host')) {
it.baseurl = "http://${System.properties.getProperty('selenium.host')}:${this.randomPort}"
} else {
Expand Down Expand Up @@ -74,6 +77,9 @@ class SeleniumSIDETest extends Specification {
it.remoteUrl = 'http://selenium-hub:4444/wd/hub'
it.remoteBrowser = 'firefox'
}
if (System.properties.getProperty('selenium.port')) {
this.setRandomPort("${System.properties.getProperty('selenium.port')}" as int)
}
if (System.properties.getProperty('selenium.host')) {
it.baseurl = "http://${System.properties.getProperty('selenium.host')}:${this.randomPort}"
} else {
Expand Down Expand Up @@ -126,7 +132,14 @@ class SeleniumSIDETest extends Specification {
'SHIBUI-1503: Non-admin can create metadata source' | '/SHIBUI-1503-1.side'
'SHIBUI-1503: User can be deleted' | '/SHIBUI-1503-2.side'
'SHIBUI-1503: User can be enabled' | '/SHIBUI-1503-3.side'
'SHIBUI-2052: Logged in user & role appear on dashboard' | '/SHIBUI-2052.side'
'SHIBUI-1732: Create, use, and delete CEA String' | '/SHIBUI-1732-1.side'
'SHIBUI-1732: Create, use, and delete CEA Boolean' | '/SHIBUI-1732-2.side'
'SHIBUI-1732: Create, use, and delete CEA List' | '/SHIBUI-1732-3.side'
'SHIBUI-1732: Create, use, and delete CEA Long' | '/SHIBUI-1732-4.side'
'SHIBUI-1732: Create, use, and delete CEA Double' | '/SHIBUI-1732-5.side'
'SHIBUI-1732: Create, use, and delete CEA Duration' | '/SHIBUI-1732-6.side'
'SHIBUI-1732: Create, use, and delete CEA Spring Bean' | '/SHIBUI-1732-7.side'
'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side'
'SHIBUI-1740: Group can be created, edited, deleted' | '/SHIBUI-1740-1.side'
'SHIBUI-1740: Verify dev profile group membership' | '/SHIBUI-1740-2.side'
'SHIBUI-1740: Verify admin-owned resource not visible to nonadmins' | '/SHIBUI-1740-3.side'
Expand All @@ -138,14 +151,8 @@ class SeleniumSIDETest extends Specification {
'SHIBUI-1744: Verify attribute bundle CRUD operations' | '/SHIBUI-1744-1.side'
'SHIBUI-1744: Verify attribute bundles in metadata sources' | '/SHIBUI-1744-2.side'
'SHIBUI-1744: Verify attribute bundles in entity attribute filters' | '/SHIBUI-1744-3.side'
'SHIBUI-2052: Logged in user & role appear on dashboard' | '/SHIBUI-2052.side'
'SHIBUI-2116: Verify entity attribute bundle highlights' | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
'SHIBUI-1732: Create, use, and delete CEA String' | '/SHIBUI-1732-1.side'
'SHIBUI-1732: Create, use, and delete CEA Boolean' | '/SHIBUI-1732-2.side'
'SHIBUI-1732: Create, use, and delete CEA List' | '/SHIBUI-1732-3.side'
'SHIBUI-1732: Create, use, and delete CEA Long' | '/SHIBUI-1732-4.side'
'SHIBUI-1732: Create, use, and delete CEA Double' | '/SHIBUI-1732-5.side'
'SHIBUI-1732: Create, use, and delete CEA Duration' | '/SHIBUI-1732-6.side'
'SHIBUI-1732: Create, use, and delete CEA Spring Bean' | '/SHIBUI-1732-7.side'
'SHIBUI-1392: Verify provider with script filter is persistable' | '/SHIBUI-1392.side' // Something about this test breaks all the other ones after it

}
}
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1281.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2111,7 +2111,21 @@
"target": "css=td:nth-child(2)",
"targets": [],
"value": ""
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1311.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,21 @@
["xpath=//td[contains(.,'Disabled')]", "xpath:innerText"]
],
"value": ""
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "894bbaf7-9978-4d30-b4e3-3c4263e084aa",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1333.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2254,7 +2254,21 @@
["xpath=//section[8]/div/div[2]/object-property/array-property/div/div/div[3]/div/span", "xpath:position"]
],
"value": "True"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1334-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2717,7 +2717,21 @@
["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
],
"value": "Display Name"
}]
}, {
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1334-2.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,21 @@
["xpath=//div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"]
],
"value": "PT10M"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "894bbaf7-9978-4d30-b4e3-3c4263e084aa",
Expand Down
24 changes: 19 additions & 5 deletions backend/src/integration/resources/SHIBUI-1335-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,13 @@
"target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0",
"targets": [
["id=option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "id"],
["linkText=PT0S", "linkText"],
["linkText=PT1M", "linkText"],
["css=#option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0", "css:finder"],
["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay-item-0']", "xpath:attributes"],
["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_minRefreshDelay']/a", "xpath:idRelative"],
["xpath=//a[contains(@href, '#')]", "xpath:href"],
["xpath=//div[2]/a", "xpath:position"],
["xpath=//a[contains(.,'PT0S')]", "xpath:innerText"]
["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"]
],
"value": ""
}, {
Expand Down Expand Up @@ -390,13 +390,13 @@
"target": "id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2",
"targets": [
["id=option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "id"],
["linkText=PT1M", "linkText"],
["linkText=PT10M", "linkText"],
["css=#option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2", "css:finder"],
["xpath=//a[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay-item-2']", "xpath:attributes"],
["xpath=//div[@id='option-selector-items-root_reloadableMetadataResolverAttributes_maxRefreshDelay']/a[3]", "xpath:idRelative"],
["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"],
["xpath=//a[3]", "xpath:position"],
["xpath=//a[contains(.,'PT1M')]", "xpath:innerText"]
["xpath=//a[contains(.,'PT10M')]", "xpath:innerText"]
],
"value": ""
}, {
Expand Down Expand Up @@ -1794,7 +1794,21 @@
["xpath=//button[contains(.,'Entity Attributes Filter')]", "xpath:innerText"]
],
"value": "Entity Attributes Filter"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "248ba015-77cd-430f-b973-d14fd4f39a27",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1335-2.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,21 @@
["xpath=//span[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"]
],
"value": "FilesystemMetadataResolver"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "248ba015-77cd-430f-b973-d14fd4f39a27",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1335-3.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,21 @@
["xpath=//span[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"]
],
"value": "LocalDynamicMetadataResolver"
}]
}, {
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "248ba015-77cd-430f-b973-d14fd4f39a27",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1335-4.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,21 @@
["xpath=//td[contains(.,'EntityAttributes')]", "xpath:innerText"]
],
"value": "EntityAttributes"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "248ba015-77cd-430f-b973-d14fd4f39a27",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1352-1.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,21 @@
["xpath=//td[contains(.,'LocalDynamicMetadataResolver')]", "xpath:innerText"]
],
"value": "LocalDynamicMetadataResolver"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "537e85aa-f94d-4fef-bc13-2ecdf5132fa2",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1352-2.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,21 @@
["xpath=//td[contains(.,'FilesystemMetadataResolver')]", "xpath:innerText"]
],
"value": "FilesystemMetadataResolver"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "cb217b7c-b7f0-47a4-9860-8731876d2b1a",
Expand Down
16 changes: 15 additions & 1 deletion backend/src/integration/resources/SHIBUI-1361.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,21 @@
"target": "rightDateIsDate",
"targets": [],
"value": "true"
}]
},{
"id": "4ec2c493-85e4-403b-9b09-031c5728f498",
"comment": "",
"command": "open",
"target": "/api/heheheheheheheWipeout",
"targets": [],
"value": ""
}, {
"id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
"comment": "",
"command": "assertText",
"target": "css=body",
"targets": [],
"value": "yes, you did it"
}]
}],
"suites": [{
"id": "894bbaf7-9978-4d30-b4e3-3c4263e084aa",
Expand Down
Loading

0 comments on commit 2f33071

Please sign in to comment.