fix dc edit test + edit dc name

Signed-off-by: bdattoma <[email protected]>
bdattoma · Oct 16, 2023 · 3b1e293 · 3b1e293
1 parent dd53c69
commit 3b1e293
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
@@ -35,11 +35,11 @@ Create S3 Data Connection
 
 Edit S3 Data Connection
     [Documentation]    Edits a S3 Data Connection from DS Project details page
-    [Arguments]    ${project_title}    ${dc_name}    ${aws_access_key}    ${aws_secret_access}
+    [Arguments]    ${project_title}    ${dc_name}    ${aws_access_key}    ${aws_secret_access}    ${new_dc_name}=${dc_name}
     ...            ${aws_s3_endpoint}=${S3.AWS_DEFAULT_ENDPOINT}    ${aws_region}=${S3.AWS_DEFAULT_REGION}
     ...            ${connected_workbench}=${NONE}    ${press_cancel}=${FALSE}    ${aws_bucket_name}=${NONE}
     Workbenches.Click Action From Actions Menu    item_title=${dc_name}    item_type=data connection    action=Edit
-    Fill Data Connection Form    ${project_title}    ${dc_name}    ${aws_access_key}    ${aws_secret_access}
+    Fill Data Connection Form    ${project_title}    ${new_dc_name}    ${aws_access_key}    ${aws_secret_access}
     ...            ${S3_DC_EDIT_BTN}    aws_s3_endpoint=${aws_s3_endpoint}    aws_region=${aws_region}
     ...            connected_workbench=${connected_workbench}    press_cancel=${press_cancel}
     ...            aws_bucket_name=${aws_bucket_name}

diff --git a/...sts/400__ods_dashboard/415__ods_dashboard_projects/415__ods_dashboard_projects_edit.robot b/...sts/400__ods_dashboard/415__ods_dashboard_projects/415__ods_dashboard_projects_edit.robot
@@ -27,6 +27,11 @@ ${WORKBENCH_DESC_UPDATED}=     ${WORKBENCH_DESCRIPTION} Updated
 ${PV_BASENAME}=                ods-ci-pv
 ${PV_DESCRIPTION}=             ods-ci-pv is a PV created to test DS Projects feature
 ${PV_SIZE}=                    2    # PV sizes are in GB
+${DC_S3_NAME}=                 ods-ci-dc
+${DC_S3_AWS_SECRET_ACCESS_KEY}=    custom dummy secret access key
+${DC_S3_AWS_ACCESS_KEY}=    custom dummy access key id
+${DC_S3_ENDPOINT}=    custom.endpoint.s3.com
+${DC_S3_REGION}=    ods-ci-region
 
 
 *** Test Cases ***
@@ -76,17 +81,18 @@ Verify User Can Edit A S3 Data Connection
     ...                          aws_access_key=${DC_S3_AWS_SECRET_ACCESS_KEY}
     ...                          aws_secret_access=${DC_S3_AWS_SECRET_ACCESS_KEY}
     ...                          aws_s3_endpoint=${DC_S3_ENDPOINT}    aws_region=${DC_S3_REGION}
-    Edit S3 Data Connection    project_title=${PRJ_TITLE}    dc_name=${DC_S3_NAME}-test
+    Edit S3 Data Connection    project_title=${PRJ_TITLE}    dc_name=${DC_S3_NAME}    new_dc_name=${DC_S3_NAME}-test
     ...            aws_access_key=${S3.AWS_ACCESS_KEY_ID}-test    aws_secret_access=${S3.AWS_SECRET_ACCESS_KEY}-test
     ...            aws_bucket_name=ods-ci-ds-pipelines-test    aws_region=${DC_S3_REGION}
     ...            aws_s3_endpoint=${DC_S3_ENDPOINT}
-    ${s3_name}    ${s3_key}    ${s3_secret}    ${s3_endpoint}    ${s3_region}    ${s3_bucket}    Get Data Connection Form Values    ${DC_S3_NAME}
+    ${s3_name}    ${s3_key}    ${s3_secret}    ${s3_endpoint}    ${s3_region}    ${s3_bucket}    Get Data Connection Form Values    ${DC_S3_NAME}-test
     Should Be Equal  ${s3_name}  ${DC_S3_NAME}-test
     Should Be Equal  ${s3_key}  ${S3.AWS_ACCESS_KEY_ID}-test
     Should Be Equal  ${s3_secret}  ${S3.AWS_SECRET_ACCESS_KEY}-test
     Should Be Equal  ${s3_endpoint}  ${DC_S3_ENDPOINT}
     Should Be Equal  ${s3_region}  ${DC_S3_REGION}
     Should Be Equal  ${s3_bucket}  ods-ci-ds-pipelines-test
+    SeleniumLibrary.Click Button    ${GENERIC_CANCEL_BTN_XP}
     Delete Data Connection    name=${DC_S3_NAME}-test