From 61ae5ffbf835c3aaabeaea3c9e642eb48c2d1c8f Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Wed, 30 Nov 2022 17:13:51 -0700 Subject: [PATCH] SHIBUI-2393 Continued work on test fixes. --- .../integration/resources/SHIBUI-1385-1.side | 82 +++++++++++++++---- .../integration/resources/SHIBUI-1407-1.side | 75 +++++++++++++---- .../integration/resources/SHIBUI-1732-3.side | 35 ++++---- 3 files changed, 142 insertions(+), 50 deletions(-) diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side index a81d2a2f2..be5b65800 100644 --- a/backend/src/integration/resources/SHIBUI-1385-1.side +++ b/backend/src/integration/resources/SHIBUI-1385-1.side @@ -1334,6 +1334,19 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", + "comment": "", + "command": "click", + "target": "id=root_relyingPartyOverrides_forceAuthn", + "targets": [ + ["id=root_relyingPartyOverrides_forceAuthn", "id"], + ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], + ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], + ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] + ], + "value": "" }, { "id": "134bf1f3-1e86-49e7-91de-185e513b02be", "comment": "", @@ -1742,6 +1755,47 @@ "target": "500", "targets": [], "value": "" + }, { + "id": "94eaa0f0-8bd4-4bf1-b3ad-944279f73ab2", + "comment": "", + "command": "click", + "target": "id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", + "targets": [ + ["id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "id"], + ["css=#array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "css:finder"], + ["xpath=//button[@id='array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0']", "xpath:attributes"], + ["xpath=//div[@id='root_relyingPartyOverrides_authenticationMethods-group']/div/div/div/div[2]/div/div/div[2]/div/button", "xpath:idRelative"], + ["xpath=//div[2]/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Delete')]", "xpath:innerText"] + ], + "value": "" + }, { + "id": "ee3e9a44-6002-4540-adb4-ab50eefbd899", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" + }, { + "id": "e3e7f5f1-108b-4392-ace7-305685bec4ab", + "comment": "", + "command": "click", + "target": "id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", + "targets": [ + ["id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "id"], + ["css=#array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "css:finder"], + ["xpath=//button[@id='array-field-addbtn-root_relyingPartyOverrides_authenticationMethods']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div/button", "xpath:idRelative"], + ["xpath=//div[6]/div/div/div/div/div/div/button", "xpath:position"] + ], + "value": "" + }, { + "id": "d78f24cf-8517-4a85-acbb-e44add1a7d43", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1946,19 +2000,6 @@ ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] ], "value": "" - }, { - "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", - "comment": "", - "command": "click", - "target": "id=root_relyingPartyOverrides_forceAuthn", - "targets": [ - ["id=root_relyingPartyOverrides_forceAuthn", "id"], - ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], - ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "204ea80c-4aac-497f-8956-6370967ba73e", "comment": "", @@ -1973,11 +2014,24 @@ "id": "553dd570-b1bb-43bb-a469-63ee08a09794", "comment": "", "command": "click", - "target": "css=.fa-check", + "target": "css=#attributeRelease\\.checkAll", "targets": [ ["css=.fa-check", "css:finder"] ], "value": "" + }, { + "id": "f2e019e5-db1e-493a-90d3-182d2c2f7690", + "comment": "", + "command": "assertChecked", + "target": "id=root_attributeRelease_0", + "targets": [ + ["id=root_attributeRelease_0", "id"], + ["css=#root_attributeRelease_0", "css:finder"], + ["xpath=//input[@id='root_attributeRelease_0']", "xpath:attributes"], + ["xpath=//div[@id='root_attributeRelease-group']/div/fieldset/table/tbody/tr/td[2]/fieldset/div/div/input", "xpath:idRelative"], + ["xpath=//input", "xpath:position"] + ], + "value": "" }, { "id": "4adb7283-b1ad-4553-a934-afc54fa8b04f", "comment": "", diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side index b0b65dbb5..7af4de5ef 100644 --- a/backend/src/integration/resources/SHIBUI-1407-1.side +++ b/backend/src/integration/resources/SHIBUI-1407-1.side @@ -1327,6 +1327,19 @@ ["xpath=//li[3]/button", "xpath:position"] ], "value": "" + }, { + "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", + "comment": "", + "command": "click", + "target": "id=root_relyingPartyOverrides_forceAuthn", + "targets": [ + ["id=root_relyingPartyOverrides_forceAuthn", "id"], + ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], + ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], + ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] + ], + "value": "" }, { "id": "134bf1f3-1e86-49e7-91de-185e513b02be", "comment": "", @@ -1742,6 +1755,47 @@ "target": "500", "targets": [], "value": "" + }, { + "id": "47ce7b12-97c8-4393-9f28-2fbc0537627f", + "comment": "", + "command": "click", + "target": "id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", + "targets": [ + ["id=array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "id"], + ["css=#array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0", "css:finder"], + ["xpath=//button[@id='array-field-deletebtn-root_relyingPartyOverrides_authenticationMethods-0']", "xpath:attributes"], + ["xpath=//div[@id='root_relyingPartyOverrides_authenticationMethods-group']/div/div/div/div[2]/div/div/div[2]/div/button", "xpath:idRelative"], + ["xpath=//div[2]/div/button", "xpath:position"], + ["xpath=//button[contains(.,'Delete')]", "xpath:innerText"] + ], + "value": "" + }, { + "id": "3c94a090-d35c-4412-80cb-bbe7bf6ea6d9", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" + }, { + "id": "3d6a17e4-d895-45aa-9dd5-22cc130ebbfe", + "comment": "", + "command": "click", + "target": "id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", + "targets": [ + ["id=array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "id"], + ["css=#array-field-addbtn-root_relyingPartyOverrides_authenticationMethods", "css:finder"], + ["xpath=//button[@id='array-field-addbtn-root_relyingPartyOverrides_authenticationMethods']", "xpath:attributes"], + ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div/button", "xpath:idRelative"], + ["xpath=//div[6]/div/div/div/div/div/div/button", "xpath:position"] + ], + "value": "" + }, { + "id": "cb08a311-29b6-41a6-bfd1-38c12e9aca93", + "comment": "", + "command": "pause", + "target": "500", + "targets": [], + "value": "" }, { "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1", "comment": "", @@ -1945,19 +1999,6 @@ ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"] ], "value": "" - }, { - "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5", - "comment": "", - "command": "click", - "target": "id=root_relyingPartyOverrides_forceAuthn", - "targets": [ - ["id=root_relyingPartyOverrides_forceAuthn", "id"], - ["css=#root_relyingPartyOverrides_forceAuthn", "css:finder"], - ["xpath=//input[@id='root_relyingPartyOverrides_forceAuthn']", "xpath:attributes"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/div/input", "xpath:idRelative"], - ["xpath=//div[10]/div/div/div/div/div/input", "xpath:position"] - ], - "value": "" }, { "id": "204ea80c-4aac-497f-8956-6370967ba73e", "comment": "", @@ -2325,11 +2366,11 @@ "id": "e8b794fc-20e2-4317-8bdd-73eee8e94951", "comment": "", "command": "assertText", - "target": "css=div:nth-child(9) .text-truncate", + "target": "css=div:nth-child(10) .text-truncate", "targets": [ - ["css=div:nth-child(9) .text-truncate", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:idRelative"], - ["xpath=//div[9]/div/span[2]", "xpath:position"] + ["css=div:nth-child(10) .text-truncate", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"], + ["xpath=//div[10]/div/span[2]", "xpath:position"] ], "value": "true" }, { diff --git a/backend/src/integration/resources/SHIBUI-1732-3.side b/backend/src/integration/resources/SHIBUI-1732-3.side index ad3bec798..79e2f313a 100644 --- a/backend/src/integration/resources/SHIBUI-1732-3.side +++ b/backend/src/integration/resources/SHIBUI-1732-3.side @@ -461,15 +461,10 @@ }, { "id": "95c2701d-82d8-4d2d-b83e-82bb4bd2cf8c", "comment": "", - "command": "assertText", - "target": "css=.row:nth-child(5) .control-label", - "targets": [ - ["css=.row:nth-child(5) .control-label", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[8]/div/div/div/div[5]/div/div/div/div/div/div/span", "xpath:idRelative"], - ["xpath=//div[5]/div/div/div/div/div/div/span", "xpath:position"], - ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"] - ], - "value": "Custom List Display" + "command": "assertElementPresent", + "target": "//*[text()[contains(.,'Custom List Display')]]", + "targets": [], + "value": "" }, { "id": "d6d968f3-a549-4e0b-8fe0-0ad37d80fea7", "comment": "", @@ -636,11 +631,11 @@ "id": "63e0b87d-4da3-4fb8-aa9f-6412e0562709", "comment": "", "command": "waitForElementVisible", - "target": "css=.align-items-start:nth-child(7) > .p-2", + "target": "css=.align-items-start:nth-child(5) > .p-2", "targets": [ - ["css=.align-items-start:nth-child(7) > .p-2", "css:finder"], - ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/span", "xpath:idRelative"], - ["xpath=//div[7]/span", "xpath:position"], + ["css=.align-items-start:nth-child(5) > .p-2", "css:finder"], + ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[5]/span", "xpath:idRelative"], + ["xpath=//div[5]/span", "xpath:position"], ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"] ], "value": "30000" @@ -1220,7 +1215,8 @@ "targets": [ ["css=.d-flex:nth-child(5) .d-block", "css:finder"], ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/ul/li/span", "xpath:idRelative"], - ["xpath=//div[5]/ul/li/span", "xpath:position"] + ["xpath=//div[5]/ul/li/span", "xpath:position"], + ["xpath=//span[contains(.,'bar')]", "xpath:innerText"] ], "value": "bar" }, { @@ -1300,11 +1296,12 @@ "id": "83aa335b-5efb-4ca2-9e41-f06213cc68e2", "comment": "", "command": "assertText", - "target": "css=.d-flex:nth-child(5) .d-block", + "target": "css=.d-flex:nth-child(5) .d-flex:nth-child(1) > .d-block", "targets": [ - ["css=.d-flex:nth-child(5) .d-block", "css:finder"], + ["css=.d-flex:nth-child(5) .d-flex:nth-child(1) > .d-block", "css:finder"], ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/ul/li/span", "xpath:idRelative"], - ["xpath=//div[5]/ul/li/span", "xpath:position"] + ["xpath=//div[5]/ul/li/span", "xpath:position"], + ["xpath=//span[contains(.,'bar')]", "xpath:innerText"] ], "value": "bar" }, { @@ -1314,8 +1311,8 @@ "target": "css=.d-flex:nth-child(2) > .d-block", "targets": [ ["css=.d-flex:nth-child(2) > .d-block", "css:finder"], - ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/ul/li[2]/span", "xpath:idRelative"], - ["xpath=//ul/li[2]/span", "xpath:position"] + ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[5]/ul/li[2]/span", "xpath:idRelative"], + ["xpath=//li[2]/span", "xpath:position"] ], "value": "foo" }, {