Skip to content

Commit

Permalink
Merged in feature/SHIBUI-1440-QA (pull request #395)
Browse files Browse the repository at this point in the history 
Feature/SHIBUI-1440 QA
  • Loading branch information
@rmathis
Bill Smith authored and rmathis committed Oct 28, 2019
2 parents 8bce8ea + b0a26cd commit c9a19fc
Show file tree
Hide file tree
Showing 18 changed files with 564 additions and 688 deletions.
45 changes: 29 additions & 16 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 @@ -29,6 +29,9 @@ class SeleniumSIDETest extends Specification {
def config = new DefaultConfig([] as String[]).with {
if (System.properties.getProperty('webdriver.driver')) {
it.driver = System.properties.getProperty('webdriver.driver')
if (it.driver == "chrome") {
it.addCliArgs('--disable-extensions')
}
} else {
it.driver = 'remote'
it.remoteUrl = 'http://selenium-hub:4444/wd/hub'
Expand All @@ -39,10 +42,14 @@ class SeleniumSIDETest extends Specification {
} else {
it.baseurl = "http://localhost:${this.randomPort}"
}
if (System.properties.getProperty('webdriver.headless')) {
it.addCliArgs('--headless')
}
it
}
def runner = new Runner()
runner.varsMap.put('xmlUpload', Paths.get(this.class.getResource('/TestUpload.xml').toURI()).toString())
runner.varsMap.put('SHIBUI950', Paths.get(this.class.getResource('/SHIBUI-950.xml').toURI()).toString())
main.setupRunner(runner, config, [] as String[])

expect:
Expand All @@ -59,6 +66,9 @@ class SeleniumSIDETest extends Specification {
def config = new DefaultConfig([] as String[]).with {
if (System.properties.getProperty('webdriver.driver')) {
it.driver = System.properties.getProperty('webdriver.driver')
if (it.driver == "chrome") {
it.addCliArgs('--disable-extensions')
}
} else {
it.driver = 'remote'
it.remoteUrl = 'http://selenium-hub:4444/wd/hub'
Expand All @@ -85,32 +95,35 @@ class SeleniumSIDETest extends Specification {

assert result.level.exitCode == 0

cleanup:
runner.getWrappedDriver().quit()

// 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-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-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-1385: Restore a metadata source version' | '/SHIBUI-1385-1.side'
// 'SHIBUI-1385: Restore a metadata provider version' | '/SHIBUI-1385-2.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'
}
}

155 changes: 106 additions & 49 deletions backend/src/integration/resources/SHIBUI-1311.side
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,21 +546,23 @@
"id": "52f5680c-c63d-411e-8332-52901f12ea3b",
"comment": "",
"command": "assertText",
"target": "css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
"target": "css=.mb-4:nth-child(1) primitive-property:nth-child(1) .d-block:nth-child(2)",
"targets": [
["css=.px-3:nth-child(1) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"],
["xpath=//summary-property/div/span", "xpath:position"],
["css=.mb-4:nth-child(1) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"],
["xpath=//metadata-configuration[@id='configuration']/div/section/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"],
["xpath=//div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'Test Metadata Provider')]", "xpath:innerText"]
],
"value": "Test Metadata Provider"
}, {
"id": "67ff44aa-1efd-4b13-a0e9-3648a09911dd",
"comment": "",
"command": "assertText",
"target": "css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)",
"target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)",
"targets": [
["css=.px-3:nth-child(2) > summary-property:nth-child(2) > .mb-3 > .d-block:nth-child(2)", "css:finder"],
["xpath=//section[2]/summary-property/div/span", "xpath:position"],
["css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)", "css:finder"],
["xpath=//metadata-configuration[@id='configuration']/div/section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:idRelative"],
["xpath=//section[2]/div/div[2]/object-property/primitive-property/div/div/span[2]", "xpath:position"],
["xpath=//span[contains(.,'123')]", "xpath:innerText"]
],
"value": "123"
Expand All @@ -575,27 +577,56 @@
],
"value": ""
}, {
"id": "1067b0b4-8aff-4972-b6f5-e4479eca9150",
"id": "563d35c7-65c9-4d10-9e0f-87d8fa31a036",
"comment": "",
"command": "waitForElementPresent",
"target": "css=.badge-success",
"command": "pause",
"target": "2000",
"targets": [],
"value": ""
}, {
"id": "8ae5598c-a4b0-4816-859a-d30f38029f65",
"comment": "",
"command": "click",
"target": "linkText=Dashboard",
"targets": [
["css=.badge > span", "css:finder"],
["xpath=//span/span", "xpath:position"]
["linkText=Dashboard", "linkText"],
["css=.nav-item > .nav-link", "css:finder"],
["xpath=//div[@id='navbar']/ul/li[2]/a", "xpath:idRelative"],
["xpath=//a[contains(@href, '/dashboard')]", "xpath:href"],
["xpath=//li[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Dashboard')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "dcc49d9d-c0c6-41e0-9683-8e5d6271b3e9",
"comment": "",
"command": "click",
"target": "linkText=Metadata Providers",
"targets": [
["linkText=Metadata Providers", "linkText"],
["css=.nav > .nav-item:nth-child(2) > .nav-link", "css:finder"],
["xpath=//a[contains(text(),'Metadata Providers')]", "xpath:link"],
["xpath=//a[contains(@href, '/dashboard/metadata/manager/providers')]", "xpath:href"],
["xpath=//dashboard-page/div/ul/li[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Metadata Providers')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "c0acbec5-58ad-43de-837c-c40c2769fdd6",
"comment": "",
"command": "waitForElementVisible",
"target": "css=td:nth-child(2)",
"targets": [],
"value": "10000"
}, {
"id": "f48dd1b5-607a-485b-b1d5-03301f99b9ce",
"comment": "",
"command": "assertText",
"target": "linkText=Test Metadata Provider",
"target": "css=td:nth-child(2)",
"targets": [
["linkText=Test Metadata Provider", "linkText"],
["css=td > a", "css:finder"],
["xpath=//a[contains(text(),'Test Metadata Provider')]", "xpath:link"],
["xpath=//a[contains(@href, '/metadata/provider/4cc9924f-fd9e-4ef3-bf57-3b24eec9f27f/configuration/options')]", "xpath:href"],
["xpath=//td[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"]
["css=td:nth-child(2)", "css:finder"],
["xpath=//td[2]", "xpath:position"],
["xpath=//td[contains(.,'Test Metadata Provider')]", "xpath:innerText"]
],
"value": "Test Metadata Provider"
}, {
Expand Down Expand Up @@ -624,11 +655,14 @@
"id": "211711a2-0af5-4f5e-a427-812c2de0264d",
"comment": "",
"command": "click",
"target": "css=.fa-plus-circle",
"target": "id=addNewDropdown",
"targets": [
["css=.fa-plus-circle", "css:finder"],
["xpath=//button[@id='addNewDropdown']/i", "xpath:idRelative"],
["xpath=//i", "xpath:position"]
["id=addNewDropdown", "id"],
["css=#addNewDropdown", "css:finder"],
["xpath=//button[@id='addNewDropdown']", "xpath:attributes"],
["xpath=//div[@id='navbar']/ul/li/button", "xpath:idRelative"],
["xpath=//li/button", "xpath:position"],
["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
],
"value": ""
}, {
Expand All @@ -645,25 +679,19 @@
],
"value": ""
}, {
"id": "664722f5-86a5-49a8-b60e-fac67544fbea",
"id": "6b776e7b-87ec-4a61-bb51-face4b5b8c97",
"comment": "",
"command": "waitForElementVisible",
"target": "id=/name",
"command": "pause",
"target": "2000",
"targets": [],
"value": "10000"
"value": ""
}, {
"id": "6437379e-d34f-479e-82f1-bf52654a95cb",
"id": "664722f5-86a5-49a8-b60e-fac67544fbea",
"comment": "",
"command": "click",
"command": "waitForElementEditable",
"target": "id=/name",
"targets": [
["id=/name", "id"],
["name=field37", "name"],
["css=#\\/name", "css:finder"],
["xpath=//input[@id='/name']", "xpath:attributes"],
["xpath=//input", "xpath:position"]
],
"value": ""
"targets": [],
"value": "10000"
}, {
"id": "79471f9f-e04f-4d98-8e78-f8f554d36821",
"comment": "",
Expand Down Expand Up @@ -707,19 +735,6 @@
"target": "id=/xmlId",
"targets": [],
"value": "10000"
}, {
"id": "5795f70f-79e1-4b45-9c38-ef96d5197e70",
"comment": "",
"command": "click",
"target": "id=/xmlId",
"targets": [
["id=/xmlId", "id"],
["name=field43", "name"],
["css=#\\/xmlId", "css:finder"],
["xpath=//input[@id='/xmlId']", "xpath:attributes"],
["xpath=//input", "xpath:position"]
],
"value": ""
}, {
"id": "88a910a8-1e02-400a-9875-c76d0095aa57",
"comment": "",
Expand Down Expand Up @@ -916,6 +931,48 @@
["xpath=//li[3]/button", "xpath:position"]
],
"value": ""
}, {
"id": "8b702597-90a0-464d-90e6-99c0f0de3c3d",
"comment": "",
"command": "pause",
"target": "2000",
"targets": [],
"value": ""
}, {
"id": "c8b7c426-9afc-4fb0-8c09-211ae9ba0a62",
"comment": "",
"command": "click",
"target": "linkText=Dashboard",
"targets": [
["linkText=Dashboard", "linkText"],
["css=.nav-item > .nav-link", "css:finder"],
["xpath=//div[@id='navbar']/ul/li[2]/a", "xpath:idRelative"],
["xpath=//a[contains(@href, '/dashboard')]", "xpath:href"],
["xpath=//li[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Dashboard')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "0ddad000-2e43-46f6-9558-6cb001a465dc",
"comment": "",
"command": "click",
"target": "linkText=Metadata Providers",
"targets": [
["linkText=Metadata Providers", "linkText"],
["css=.nav > .nav-item:nth-child(2) > .nav-link", "css:finder"],
["xpath=//a[contains(text(),'Metadata Providers')]", "xpath:link"],
["xpath=//a[contains(@href, '/dashboard/metadata/manager/providers')]", "xpath:href"],
["xpath=//dashboard-page/div/ul/li[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Metadata Providers')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "25583134-24c4-4fab-9a11-7e4cf0c05f1a",
"comment": "",
"command": "pause",
"target": "2000",
"targets": [],
"value": ""
}, {
"id": "1675c12e-8951-4d07-87b1-15e280699d66",
"comment": "",
Expand Down
Loading

0 comments on commit c9a19fc

Please sign in to comment.