diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy index df43399aa..96de34699 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ActiveProfiles +import spock.lang.Ignore import spock.lang.Specification import spock.lang.Unroll @@ -17,6 +18,28 @@ class SeleniumSIDETest extends Specification { @Value('${local.server.port}') int randomPort + def "Selenium: just run one"() { + setup: + def file = "/CreateMetadataSourceFromCopy.side" + def main = new Main() + def config = new DefaultConfig([] as String[]).with { + System.properties.contains('') + if (System.properties.getProperty('webdriver.driver')) { + it.driver = System.properties.getProperty('webdriver.driver') + } + it.baseurl = "http://localhost:${this.randomPort}" + it + } + def runner = new Runner() + main.setupRunner(runner, config, [] as String[]) + + expect: + def result = runner.run(file, this.class.getResourceAsStream(file)) + runner.finish() + + assert result.level.exitCode == 0 + } + @Unroll def "#name"() { setup: @@ -40,12 +63,12 @@ class SeleniumSIDETest extends Specification { where: name | file -// 'Create Dynamic HTTP Metadata Resolver' | '/dhmr.side' //passing -// 'Metadata Source Happy Path Save' | '/MetadataSourceHappyPathSAVE.side' //passing -// 'Metadata Provider Happy Path Save' | '/MetadataProviderHappyPathSAVE.side' // failing (decimal point bug) -// 'Create Filter Entity ID' | '/CreateFilterEntityID.side' // failing (decimal point bug) -// 'Create Filter REGEX' | '/CreateFilterREGEX.side' // failing (decimal point bug) -// 'Create Filter Script' | '/CreateFilterScript.side' // failing (decimal point bug) + 'Create Dynamic HTTP Metadata Resolver' | '/dhmr.side' + 'Metadata Source Happy Path Save' | '/MetadataSourceHappyPathSAVE.side' + 'Metadata Provider Happy Path Save' | '/MetadataProviderHappyPathSAVE.side' + 'Create Filter Entity ID' | '/CreateFilterEntityID.side' + 'Create Filter REGEX' | '/CreateFilterREGEX.side' + 'Create Filter Script' | '/CreateFilterScript.side' // 'Create Metadata Source From XML' | '/CreateMetadataSourceFromXML.side' // failing (Failure: Cannot click elements) // 'Create Metadata Source From Copy' | '/CreateMetadataSourceFromCopy.side' //passing // 'Delete Entity ID Filter' | '/DeleteEntityIDFilter.side' // failing (decimal point bug, possibly also incomplete) @@ -53,6 +76,6 @@ class SeleniumSIDETest extends Specification { // 'Create Metadata Source from URL' | '/CreateMetadataSourceFromURL.side' //passing // 'Delete Incomplete Source' | '/DeleteIncompleteSource_Incomplete.side' // incomplete // 'Admin Login' | '/SHIBUI-1031_AdminLogin.side' - 'Delegated Admin: SubmitSourceWithError' | '/SHIBUI-1058_DelegatedAdmin_SubmitSourceWithError.side' //passing, but with heap problem +// 'Delegated Admin: SubmitSourceWithError' | '/SHIBUI-1058_DelegatedAdmin_SubmitSourceWithError.side' //passing, but with heap problem } } diff --git a/backend/src/integration/resources/CreateFilterEntityID.side b/backend/src/integration/resources/CreateFilterEntityID.side index 30e843ca5..ac657aca9 100644 --- a/backend/src/integration/resources/CreateFilterEntityID.side +++ b/backend/src/integration/resources/CreateFilterEntityID.side @@ -1,29 +1,54 @@ { "id": "16b5f41b-30c1-4cc1-9c9e-bc15e40d1318", - "version": "1.1", + "version": "2.0", "name": "ShibUI", "url": "http://localhost:10101/", "tests": [{ "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c", - "name": "nada", + "name": "FBHMR - Entity Attributes - Entity ID", "commands": [{ - "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2", "comment": "", @@ -615,7 +640,7 @@ ["css=.px-2", "css:finder"], ["xpath=//div[2]/div[2]", "xpath:position"] ], - "value": "Metadata Provider: FBHMP\\nFileBackedHttpMetadataResolver" + "value": "Metadata Provider: FBHMP FileBackedHttpMetadataResolver" }, { "id": "108a25aa-6b33-4fa2-870d-ee413d7eb986", "comment": "", @@ -639,19 +664,29 @@ ], "value": "" }, { - "id": "5693bc4b-80b7-41e3-885b-0911a4835211", + "id": "5693bc4b-80b7-41e3-885b-0911a4835212", "comment": "", "command": "click", - "target": "id=field33", + "target": "name=type", "targets": [ - ["id=field33", "id"], - ["name=field33", "name"], - ["css=#field33", "css"], - ["css=#field33", "css:finder"], - ["xpath=//input[@id='field33']", "xpath:attributes"], - ["xpath=//input", "xpath:position"] + ["name=type", "name"], + ["css=.is-valid", "css:finder"], + ["xpath=//select[@name='type']", "xpath:attributes"], + ["xpath=//select", "xpath:position"] ], "value": "" + }, { + "id": "5693bc4b-80b7-41e3-885b-0911a4835211", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [ + ["name=type", "name"], + ["css=.is-valid", "css:finder"], + ["xpath=//select[@name='type']", "xpath:attributes"], + ["xpath=//select", "xpath:position"] + ], + "value": "label=EntityAttributes" }, { "id": "31dca951-b673-41a5-9430-184ed7d8a170", "comment": "", @@ -684,14 +719,13 @@ "id": "a453edf2-c8c5-47d1-86a2-c59d30d0935f", "comment": "", "command": "click", - "target": "id=undefined__option--0", + "target": "id=targetInput", "targets": [ - ["id=undefined__option--0", "id"], - ["css=#undefined__option--0", "css"], - ["css=#undefined__option--0", "css:finder"], - ["xpath=//li[@id='undefined__option--0']", "xpath:attributes"], - ["xpath=//ul[@id='__listbox']/li", "xpath:idRelative"], - ["xpath=//auto-complete/div/ul/li", "xpath:position"] + ["id=targetInput", "id"], + ["css=#targetInput", "css:finder"], + ["xpath=//input[@id='targetInput']", "xpath:attributes"], + ["xpath=//div[@id='-container']/div/input", "xpath:idRelative"], + ["xpath=//div/div/input", "xpath:position"] ], "value": "" }, { @@ -925,4 +959,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/CreateFilterREGEX.side b/backend/src/integration/resources/CreateFilterREGEX.side index 01f6319c4..467db057f 100644 --- a/backend/src/integration/resources/CreateFilterREGEX.side +++ b/backend/src/integration/resources/CreateFilterREGEX.side @@ -1,29 +1,54 @@ { "id": "16b5f41b-30c1-4cc1-9c9e-bc15e40d1318", - "version": "1.1", + "version": "2.0", "name": "ShibUI", "url": "http://localhost:10101/", "tests": [{ "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c", "name": "Create Filter REGEX", "commands": [{ - "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2", "comment": "", @@ -615,7 +640,7 @@ ["css=.px-2", "css:finder"], ["xpath=//div[2]/div[2]", "xpath:position"] ], - "value": "Metadata Provider: FBHMP\\nFileBackedHttpMetadataResolver" + "value": "Metadata Provider: FBHMP FileBackedHttpMetadataResolver" }, { "id": "b8c89883-4999-4429-a4f0-b20f7dbc825c", "comment": "", @@ -638,6 +663,30 @@ ["xpath=//div[2]/a/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "5693bc4b-80b7-41e3-885b-0911a4835212", + "comment": "", + "command": "click", + "target": "name=type", + "targets": [ + ["name=type", "name"], + ["css=.is-valid", "css:finder"], + ["xpath=//select[@name='type']", "xpath:attributes"], + ["xpath=//select", "xpath:position"] + ], + "value": "" + }, { + "id": "5693bc4b-80b7-41e3-885b-0911a4835211", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [ + ["name=type", "name"], + ["css=.is-valid", "css:finder"], + ["xpath=//select[@name='type']", "xpath:attributes"], + ["xpath=//select", "xpath:position"] + ], + "value": "label=EntityAttributes" }, { "id": "a69166b9-4073-4653-987d-0537702f5dbb", "comment": "", @@ -681,13 +730,14 @@ "id": "bcb6b08c-2c96-4662-9615-172c5cca5555", "comment": "", "command": "click", - "target": "linkText=Regex", + "target": "css=.dropdown-item:nth-child(2)", "targets": [ ["linkText=Regex", "linkText"], ["css=.dropdown-item:nth-child(2)", "css:finder"], ["xpath=//a[contains(text(),'Regex')]", "xpath:link"], ["xpath=(//a[contains(@href, '#')])[2]", "xpath:href"], - ["xpath=//div/div/a[2]", "xpath:position"] + ["xpath=//div/div/a[2]", "xpath:position"], + ["xpath=//a[contains(.,'Regex')]", "xpath:innerText"] ], "value": "" }, { @@ -745,7 +795,7 @@ ["xpath=//input[@id='targetInput']", "xpath:attributes"], ["xpath=//div/div/input", "xpath:position"] ], - "value": "/foo.*/" + "value": "foo.*" }, { "id": "9c0fcb70-83f6-45b5-b5ef-d0ff7bdc80cb", "comment": "", @@ -808,15 +858,26 @@ ["xpath=//div/button", "xpath:position"] ], "value": "" + }, { + "id": "e54836ef-e3ac-41df-9989-ca8abffa0ee5", + "comment": "", + "command": "waitForElementPresent", + "target": "css=.td-lg:nth-child(3)", + "targets": [ + ["css=.td-lg:nth-child(3)", "css:finder"], + ["xpath=//td[3]", "xpath:position"], + ["xpath=//td[contains(.,'REGEX')]", "xpath:innerText"] + ], + "value": "" }, { "id": "8d472caf-2525-4e20-9f14-195e0212f72f", "comment": "", "command": "assertText", - "target": "css=td.td-lg", + "target": "css=.td-lg:nth-child(3)", "targets": [ - ["css=td.td-lg", "css"], ["css=.td-lg:nth-child(3)", "css:finder"], - ["xpath=//td[3]", "xpath:position"] + ["xpath=//td[3]", "xpath:position"], + ["xpath=//td[contains(.,'REGEX')]", "xpath:innerText"] ], "value": "REGEX" }] @@ -831,4 +892,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/CreateFilterScript.side b/backend/src/integration/resources/CreateFilterScript.side index 7af77db4f..d68f3c280 100644 --- a/backend/src/integration/resources/CreateFilterScript.side +++ b/backend/src/integration/resources/CreateFilterScript.side @@ -1,29 +1,54 @@ { "id": "16b5f41b-30c1-4cc1-9c9e-bc15e40d1318", - "version": "1.1", + "version": "2.0", "name": "ShibUI", "url": "http://localhost:10101/", "tests": [{ "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c", "name": "Create Filter Script", "commands": [{ - "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2", "comment": "", @@ -615,7 +640,7 @@ ["css=.px-2", "css:finder"], ["xpath=//div[2]/div[2]", "xpath:position"] ], - "value": "Metadata Provider: FBHMP\\nFileBackedHttpMetadataResolver" + "value": "Metadata Provider: FBHMP FileBackedHttpMetadataResolver" }, { "id": "9dadc071-16b4-4758-8e21-93933d72e8b5", "comment": "", @@ -638,6 +663,30 @@ ["xpath=//div[2]/a/translate-i18n", "xpath:position"] ], "value": "" + }, { + "id": "5693bc4b-80b7-41e3-885b-0911a4835212", + "comment": "", + "command": "click", + "target": "name=type", + "targets": [ + ["name=type", "name"], + ["css=.is-valid", "css:finder"], + ["xpath=//select[@name='type']", "xpath:attributes"], + ["xpath=//select", "xpath:position"] + ], + "value": "" + }, { + "id": "5693bc4b-80b7-41e3-885b-0911a4835211", + "comment": "", + "command": "select", + "target": "name=type", + "targets": [ + ["name=type", "name"], + ["css=.is-valid", "css:finder"], + ["xpath=//select[@name='type']", "xpath:attributes"], + ["xpath=//select", "xpath:position"] + ], + "value": "label=EntityAttributes" }, { "id": "5fc45586-7f56-4cce-927c-986c51eb5fde", "comment": "", @@ -692,7 +741,7 @@ "id": "a42808f2-8ec5-42f7-b74b-ab8487bb1134", "comment": "", "command": "click", - "target": "linkText=Script", + "target": "css=.dropdown-item:nth-child(3)", "targets": [ ["linkText=Script", "linkText"], ["css=.dropdown-item:nth-child(3)", "css:finder"], @@ -715,13 +764,25 @@ ], "value": "" }, { - "id": "d78e18ea-1c46-41d1-af83-4ce4ef54716a", + "id": "12e67d13-7a7d-4467-940d-11e5a24db0b4", + "comment": "", + "command": "sendKeys", + "target": "id=targetInput", + "targets": [ + ["id=targetInput", "id"], + ["css=#targetInput", "css:finder"], + ["xpath=//p[@id='targetInput']", "xpath:attributes"], + ["xpath=//p", "xpath:position"], + ["xpath=//p[contains(.,'eval(true);')]", "xpath:innerText"] + ], + "value": "\\n" + }, { + "id": "0d3f1f64-0a69-4dfe-bc6a-1287a8a3b79f", "comment": "", "command": "editContent", "target": "id=targetInput", "targets": [ ["id=targetInput", "id"], - ["css=#targetInput", "css"], ["css=#targetInput", "css:finder"], ["xpath=//p[@id='targetInput']", "xpath:attributes"], ["xpath=//p", "xpath:position"] diff --git a/backend/src/integration/resources/CreateMetadataSourceFromCopy.side b/backend/src/integration/resources/CreateMetadataSourceFromCopy.side index 50982ab23..43f8a4438 100644 --- a/backend/src/integration/resources/CreateMetadataSourceFromCopy.side +++ b/backend/src/integration/resources/CreateMetadataSourceFromCopy.side @@ -1,29 +1,54 @@ { "id": "16b5f41b-30c1-4cc1-9c9e-bc15e40d1318", - "version": "1.1", + "version": "2.0", "name": "ShibUI", "url": "http://localhost:10101/", "tests": [{ "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c", "name": "Create Metadata Source From Copy", "commands": [{ - "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2", "comment": "", @@ -1283,22 +1308,22 @@ "id": "97ed715c-ad35-4757-ace8-f7eb6942b6af", "comment": "", "command": "click", - "target": "css=.col-9 > div:nth-child(2)", + "target": "css=.row:nth-child(1) > .col:nth-child(2)", "targets": [ - ["css=.col-9 > div:nth-child(2)", "css:finder"], - ["xpath=//div/div/div/div/div[2]", "xpath:position"] + ["css=.row:nth-child(1) > .col:nth-child(2)", "css:finder"], + ["xpath=//div[2]/div/div/div/div/div[2]", "xpath:position"] ], "value": "" }, { "id": "930367f7-083e-4c98-bd2b-99d26e8c3b5f", "comment": "", "command": "assertText", - "target": "css=.col-9 > div:nth-child(2)", + "target": "css=.row:nth-child(1) > .col:nth-child(2)", "targets": [ ["css=.col-9 > div:nth-child(2)", "css:finder"], ["xpath=//div/div/div/div/div[2]", "xpath:position"] ], - "value": "Metadata Source Happy Path Metadata Source Happy Path" + "value": "Metadata Source Happy Path" }, { "id": "42ec39b0-db7b-4f35-9f09-921fb986ed37", "comment": "", @@ -1440,18 +1465,17 @@ "id": "b47410a0-db5a-47f2-8517-a28dee54eb88", "comment": "", "command": "click", - "target": "css=label.custom-control-label", + "target": "css=tr:nth-child(1) .custom-control-input", "targets": [ - ["css=label.custom-control-label", "css"], - ["css=tr:nth-child(1) .custom-control-label", "css:finder"], - ["xpath=//td[2]/fieldset/div/label", "xpath:position"] + ["css=tr:nth-child(1) .custom-control", "css:finder"], + ["xpath=//td[2]/fieldset/div", "xpath:position"] ], "value": "" }, { "id": "670157c7-d87e-45ad-8989-f4f86c6196e8", "comment": "", "command": "click", - "target": "css=tr:nth-child(2) .custom-control-label", + "target": "css=tr:nth-child(2) .custom-control-input", "targets": [ ["css=tr:nth-child(2) .custom-control-label", "css:finder"], ["xpath=//tr[2]/td[2]/fieldset/div/label", "xpath:position"] @@ -1461,7 +1485,7 @@ "id": "ade20551-aa8a-4910-9c9e-1c19a1a75991", "comment": "", "command": "click", - "target": "css=tr:nth-child(3) .custom-control-label", + "target": "css=tr:nth-child(3) .custom-control-input", "targets": [ ["css=tr:nth-child(3) .custom-control-label", "css:finder"], ["xpath=//tr[3]/td[2]/fieldset/div/label", "xpath:position"] @@ -1471,7 +1495,7 @@ "id": "f880fd51-9737-450a-95a7-4ae2aa7639da", "comment": "", "command": "click", - "target": "css=tr:nth-child(4) .custom-control-label", + "target": "css=tr:nth-child(4) .custom-control-input", "targets": [ ["css=tr:nth-child(4) .custom-control-label", "css:finder"], ["xpath=//tr[4]/td[2]/fieldset/div/label", "xpath:position"] @@ -1481,7 +1505,7 @@ "id": "d509550c-17e1-4f93-88f8-f653b2669a16", "comment": "", "command": "click", - "target": "css=tr:nth-child(5) .custom-control-label", + "target": "css=tr:nth-child(5) .custom-control-input", "targets": [ ["css=tr:nth-child(5) .custom-control-label", "css:finder"], ["xpath=//tr[5]/td[2]/fieldset/div/label", "xpath:position"] @@ -1491,7 +1515,7 @@ "id": "fc2fe574-5d70-4cb7-b1c0-b4d074f0e97a", "comment": "", "command": "click", - "target": "css=tr:nth-child(6) .custom-control-label", + "target": "css=tr:nth-child(6) .custom-control-input", "targets": [ ["css=tr:nth-child(6) .custom-control-label", "css:finder"], ["xpath=//tr[6]/td[2]/fieldset/div/label", "xpath:position"] @@ -1501,7 +1525,7 @@ "id": "20098998-d725-4a7d-9406-9c19842ff0fb", "comment": "", "command": "click", - "target": "css=tr:nth-child(7) .custom-control-label", + "target": "css=tr:nth-child(7) .custom-control-input", "targets": [ ["css=tr:nth-child(7) .custom-control-label", "css:finder"], ["xpath=//tr[7]/td[2]/fieldset/div/label", "xpath:position"] @@ -1511,7 +1535,7 @@ "id": "6f21d5a5-f98b-4295-9fb7-b44dde90dfff", "comment": "", "command": "click", - "target": "css=tr:nth-child(8) .custom-control-label", + "target": "css=tr:nth-child(8) .custom-control-input", "targets": [ ["css=tr:nth-child(8) .custom-control-label", "css:finder"], ["xpath=//tr[8]/td[2]/fieldset/div/label", "xpath:position"] @@ -1521,7 +1545,7 @@ "id": "774eb1e9-37fe-47a1-89c9-48ec55061233", "comment": "", "command": "click", - "target": "css=tr:nth-child(9) .custom-control-label", + "target": "css=tr:nth-child(9) .custom-control-input", "targets": [ ["css=tr:nth-child(9) .custom-control-label", "css:finder"], ["xpath=//tr[9]/td[2]/fieldset/div/label", "xpath:position"] @@ -1559,6 +1583,17 @@ ["xpath=//li[3]/button/span[2]", "xpath:position"] ], "value": "" + }, { + "id": "5297a9fe-85c3-4daf-b2a6-c8533c9d5f1c", + "comment": "", + "command": "assertText", + "target": "css=.lead", + "targets": [ + ["css=.lead", "css:finder"], + ["xpath=//div/div/div/span", "xpath:position"], + ["xpath=//span[contains(.,'Current Metadata Sources')]", "xpath:innerText"] + ], + "value": "Current Metadata Sources" }] }], "suites": [{ diff --git a/backend/src/integration/resources/CreateMetadataSourceFromXML.side b/backend/src/integration/resources/CreateMetadataSourceFromXML.side index 87a3f6828..e05ad5d11 100644 --- a/backend/src/integration/resources/CreateMetadataSourceFromXML.side +++ b/backend/src/integration/resources/CreateMetadataSourceFromXML.side @@ -7,23 +7,48 @@ "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c", "name": "Create Metadata Source from XML", "commands": [{ - "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2", "comment": "", @@ -221,4 +246,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/MetadataProviderHappyPathSAVE.side b/backend/src/integration/resources/MetadataProviderHappyPathSAVE.side index 5f2e99141..71d55847c 100644 --- a/backend/src/integration/resources/MetadataProviderHappyPathSAVE.side +++ b/backend/src/integration/resources/MetadataProviderHappyPathSAVE.side @@ -1,29 +1,54 @@ { "id": "16b5f41b-30c1-4cc1-9c9e-bc15e40d1318", - "version": "1.1", + "version": "2.0", "name": "ShibUI", "url": "http://localhost:10101/", "tests": [{ "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c", - "name": "nada", + "name": "FBHMP Happy Path Save", "commands": [{ - "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2", "comment": "", @@ -535,7 +560,6 @@ "command": "click", "target": "css=div.px-2", "targets": [ - ["css=div.px-2", "css"], ["css=.px-2", "css:finder"], ["xpath=//div[2]/div[2]", "xpath:position"] ], @@ -550,7 +574,7 @@ ["css=.px-2", "css:finder"], ["xpath=//div[2]/div[2]", "xpath:position"] ], - "value": "Metadata Provider: FBHMP\\nFileBackedHttpMetadataResolver" + "value": "Metadata Provider: FBHMP FileBackedHttpMetadataResolver" }] }], "suites": [{ @@ -563,4 +587,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +} diff --git a/backend/src/integration/resources/MetadataSourceHappyPathSAVE.side b/backend/src/integration/resources/MetadataSourceHappyPathSAVE.side index 5fbef7ef7..55d2cf06b 100644 --- a/backend/src/integration/resources/MetadataSourceHappyPathSAVE.side +++ b/backend/src/integration/resources/MetadataSourceHappyPathSAVE.side @@ -1,29 +1,54 @@ { "id": "16b5f41b-30c1-4cc1-9c9e-bc15e40d1318", - "version": "1.1", + "version": "2.0", "name": "ShibUI", "url": "http://localhost:10101/", "tests": [{ "id": "daacdb81-2f14-49f3-8d15-da5f5d52586c", "name": "Metadata Source Happy Path till Death", "commands": [{ - "id": "227fe3ca-ebb3-46ee-8067-eb1bd1290801", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "853ef897-df38-4b31-ad06-3598bf9bc5e2", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "effbf04c-a1fa-411e-a47f-0b71acfbf4b2", "comment": "", @@ -1283,22 +1308,22 @@ "id": "97ed715c-ad35-4757-ace8-f7eb6942b6af", "comment": "", "command": "click", - "target": "css=.col-9 > div:nth-child(2)", + "target": "css=.row:nth-child(1) > .col:nth-child(2)", "targets": [ - ["css=.col-9 > div:nth-child(2)", "css:finder"], - ["xpath=//div/div/div/div/div[2]", "xpath:position"] + ["css=.row:nth-child(1) > .col:nth-child(2)", "css:finder"], + ["xpath=//div[2]/div/div/div/div/div[2]", "xpath:position"] ], "value": "" }, { "id": "930367f7-083e-4c98-bd2b-99d26e8c3b5f", "comment": "", "command": "assertText", - "target": "css=.col-9 > div:nth-child(2)", + "target": "css=.row:nth-child(1) > .col:nth-child(2)", "targets": [ ["css=.col-9 > div:nth-child(2)", "css:finder"], ["xpath=//div/div/div/div/div[2]", "xpath:position"] ], - "value": "Metadata Source Happy Path Metadata Source Happy Path" + "value": "Metadata Source Happy Path" }] }], "suites": [{ @@ -1311,4 +1336,4 @@ }], "urls": ["http://localhost:10101/"], "plugins": [] -} +} \ No newline at end of file diff --git a/backend/src/integration/resources/dhmr.side b/backend/src/integration/resources/dhmr.side index 01c783678..e32e0073e 100644 --- a/backend/src/integration/resources/dhmr.side +++ b/backend/src/integration/resources/dhmr.side @@ -7,23 +7,48 @@ "id": "be39a393-4d08-45ed-b09a-782ec26c9968", "name": "create test-dhmr", "commands": [{ - "id": "d95540e7-36b9-4d1a-a664-ba45d9a9d792", + "id": "c023f973-f799-4dc3-90d0-d75ccade0317", "comment": "", "command": "open", - "target": "/api/heheheheheheheWipeout", + "target": "/login", "targets": [], "value": "" }, { - "id": "a01fba64-9612-41ec-bd53-f731464a1d52", + "id": "492f48b4-97f8-4cb7-b8de-abf963b576af", + "comment": "Use User Login", + "command": "type", + "target": "name=username", + "targets": [ + ["name=username", "name"], + ["css=tr:nth-child(1) input", "css:finder"], + ["xpath=//input[@name='username']", "xpath:attributes"], + ["xpath=//input", "xpath:position"] + ], + "value": "admin" + }, { + "id": "f61dd17c-d2ee-4200-a8f7-96d841d4ccb8", + "comment": "Use User Password", + "command": "type", + "target": "name=password", + "targets": [ + ["name=password", "name"], + ["css=tr:nth-child(2) input", "css:finder"], + ["xpath=//input[@name='password']", "xpath:attributes"], + ["xpath=//tr[2]/td[2]/input", "xpath:position"] + ], + "value": "adminpass" + }, { + "id": "fdb5a585-49aa-403c-8c23-c4fc548267b3", "comment": "", - "command": "assertText", - "target": "css=body", + "command": "click", + "target": "name=submit", "targets": [ - ["css=body", "css"], - ["css=body", "css:finder"], - ["xpath=//body", "xpath:position"] + ["name=submit", "name"], + ["css=td:nth-child(1) > input", "css:finder"], + ["xpath=//input[@name='submit']", "xpath:attributes"], + ["xpath=//tr[3]/td/input", "xpath:position"] ], - "value": "yes, you did it" + "value": "" }, { "id": "ee5fb7bf-b12e-485e-95bd-98bb41ea7072", "comment": "", @@ -350,4 +375,4 @@ }], "urls": ["http://localhost:8080/", "http://localhost:10101/"], "plugins": [] -} \ No newline at end of file +}