From 5d1030801a83f09bc30d8e22a9b219d1598f961a Mon Sep 17 00:00:00 2001 From: manosnoam Date: Thu, 21 Mar 2024 07:08:28 +0000 Subject: [PATCH] Rebase Signed-off-by: manosnoam --- ods_ci/tests/Resources/Common.robot | 4 ++-- ods_ci/tests/Resources/Page/LoginPage.robot | 2 +- .../Resources/Page/OCPDashboard/OCPMenu.robot | 2 +- ~/.kube/config | 19 ------------------- 4 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 ~/.kube/config diff --git a/ods_ci/tests/Resources/Common.robot b/ods_ci/tests/Resources/Common.robot index 33438b428..190582dfa 100644 --- a/ods_ci/tests/Resources/Common.robot +++ b/ods_ci/tests/Resources/Common.robot @@ -97,7 +97,7 @@ CSS Property Value Should Be [Documentation] Compare the actual CSS property value with the expected one [Arguments] ${locator} ${property} ${exp_value} ${operation}=equal ${el_text}= Get Text xpath:${locator} - Log Text of the target element: ${el_text}//div[contains(@class,'odh-markdown-view')]//p + Log Text of the target element: ${el_text} ${actual_value}= Get CSS Property Value xpath:${locator} ${property} IF $operation == "contains" Run Keyword And Continue On Failure Should Contain ${actual_value} ${exp_value} @@ -316,7 +316,7 @@ Get Sub Domain Of Current URL ${domain} = Fetch From Left string=${current_url} marker=. RETURN ${domain} -Is Current Sub Domain Start With +Does Current Sub Domain Start With [Documentation] Check if current sub-domain start with the given String ... and returns True/False [Arguments] ${url} diff --git a/ods_ci/tests/Resources/Page/LoginPage.robot b/ods_ci/tests/Resources/Page/LoginPage.robot index 69f8add9b..76b20d61c 100644 --- a/ods_ci/tests/Resources/Page/LoginPage.robot +++ b/ods_ci/tests/Resources/Page/LoginPage.robot @@ -42,7 +42,7 @@ Login To Openshift ${expected_text_list} = Create List Log in with Administrator Developer Data Science Projects Wait Until Page Contains A String In List ${expected_text_list} # Return if page is not the Login page (no login required) - ${should_login} = Is Current Sub Domain Start With https://oauth + ${should_login} = Does Current Sub Domain Start With https://oauth IF not ${should_login} RETURN # If here we need to login Wait Until Element is Visible xpath://div[@class="pf-c-login"] timeout=10s diff --git a/ods_ci/tests/Resources/Page/OCPDashboard/OCPMenu.robot b/ods_ci/tests/Resources/Page/OCPDashboard/OCPMenu.robot index 2d5c66f35..c5a9fe970 100644 --- a/ods_ci/tests/Resources/Page/OCPDashboard/OCPMenu.robot +++ b/ods_ci/tests/Resources/Page/OCPDashboard/OCPMenu.robot @@ -49,7 +49,7 @@ Switch To Developer Perspective Maybe Skip Tour [Documentation] If we are in the openshift web console, maybe skip the first time ... tour popup given to users, otherwise RETURN. - ${should_cont} = Is Current Sub Domain Start With https://console-openshift-console + ${should_cont} = Does Current Sub Domain Start With https://console-openshift-console IF ${should_cont}==False RETURN END diff --git a/~/.kube/config b/~/.kube/config deleted file mode 100644 index 551f02c30..000000000 --- a/~/.kube/config +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - insecure-skip-tls-verify: true - server: https://api.ods-qe-gcp-01-pool-88c66.gcp.rh-ods.com:6443 - name: api-ods-qe-gcp-01-pool-88c66-gcp-rh-ods-com:6443 -contexts: -- context: - cluster: api-ods-qe-gcp-01-pool-88c66-gcp-rh-ods-com:6443 - namespace: default - user: htpasswd-cluster-admin-user/api-ods-qe-gcp-01-pool-88c66-gcp-rh-ods-com:6443 - name: default/api-ods-qe-gcp-01-pool-88c66-gcp-rh-ods-com:6443/htpasswd-cluster-admin-user -current-context: default/api-ods-qe-gcp-01-pool-88c66-gcp-rh-ods-com:6443/htpasswd-cluster-admin-user -kind: Config -preferences: {} -users: -- name: htpasswd-cluster-admin-user/api-ods-qe-gcp-01-pool-88c66-gcp-rh-ods-com:6443 - user: - token: sha256~1qITdV3asnLqE0b1fC6I-4faLJ5y56CzIgLa4xPJt9o