Merge TS_SELENIUM_USERNAME/PASSOWRD with TS_SELENIUM_OCP_USERNAME/PAS…

…SWORD (#22123) * Removed TS_SELENIUM_USERNAME and TS_SELENIUM_PASSOWRD and replaced them with the OCP variants Signed-off-by: Tibor Dancs <tdancs@redhat.com> * Removing usern password from logging Signed-off-by: Tibor Dancs <tdancs@redhat.com> --------- Signed-off-by: Tibor Dancs <tdancs@redhat.com>
eclipse-che · Apr 3, 2023 · 9dbc63a · 9dbc63a
1 parent 0ce9be3
commit 9dbc63a
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 39 deletions.
diff --git a/tests/e2e/build/dockerfiles/entrypoint.sh b/tests/e2e/build/dockerfiles/entrypoint.sh
@@ -73,7 +73,7 @@ fi
 # Launch tests
 if [ $TS_LOAD_TESTS ]; then
   timestamp=$(date +%s)
-  user_folder="$TS_SELENIUM_USERNAME-$timestamp"
+  user_folder="$TS_SELENIUM_OCP_USERNAME-$timestamp"
   export TS_SELENIUM_REPORT_FOLDER="./$user_folder/report"
   export TS_SELENIUM_LOAD_TEST_REPORT_FOLDER="./$user_folder/load-test-folder"
   CONSOLE_LOGS="./$user_folder/console-log.txt"
@@ -103,7 +103,7 @@ else
     trap kill_ffmpeg 2 15
   fi
 
-  echo "Running TEST_SUITE: $TEST_SUITE with user: $TS_SELENIUM_USERNAME"
+  echo "Running TEST_SUITE: $TEST_SUITE with user: $TS_SELENIUM_OCP_USERNAME"
   npm run $TEST_SUITE
   EXIT_CODE=$?
   if [ "${SCREEN_RECORDING}" == "true" ]; then

diff --git a/tests/e2e/configs/sh-scripts/initDefaultValues.sh b/tests/e2e/configs/sh-scripts/initDefaultValues.sh
@@ -17,8 +17,7 @@ echo "TS_SELENIUM_VALUE_OPENSHIFT_OAUTH =   ${TS_SELENIUM_VALUE_OPENSHIFT_OAUTH}
 echo "TS_OCP_LOGIN_PAGE_PROVIDER_TITLE =    ${TS_OCP_LOGIN_PAGE_PROVIDER_TITLE}"
 echo "E2E_OCP_CLUSTER_VERSION =             ${E2E_OCP_CLUSTER_VERSION}"
 echo "TS_SELENIUM_LOG_LEVEL =               ${TS_SELENIUM_LOG_LEVEL}"
-echo "TS_SELENIUM_USERNAME =                ${TS_SELENIUM_USERNAME}"
-echo "TS_SELENIUM_PASSWORD =                ${TS_SELENIUM_PASSWORD}"
+echo "TS_SELENIUM_OCP_USERNAME =            ${TS_SELENIUM_OCP_USERNAME}"
 echo "TS_SELENIUM_W3C_CHROME_OPTION =       ${TS_SELENIUM_W3C_CHROME_OPTION}"
 echo "NODE_TLS_REJECT_UNAUTHORIZED =        ${NODE_TLS_REJECT_UNAUTHORIZED}"
 echo "TS_SELENIUM_EDITOR =                  ${TS_SELENIUM_EDITOR}"
diff --git a/tests/e2e/constants/TestConstants.ts b/tests/e2e/constants/TestConstants.ts
@@ -104,16 +104,6 @@ export const TestConstants: any = {
      */
     TS_SELENIUM_VALUE_OPENSHIFT_OAUTH: process.env.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH === 'true',
 
-    /**
-     * Username used to log in MultiUser Che.
-     */
-    TS_SELENIUM_USERNAME: process.env.TS_SELENIUM_USERNAME || 'che',
-
-    /**
-     * Password used to log in MultiUser Che.
-     */
-    TS_SELENIUM_PASSWORD: process.env.TS_SELENIUM_PASSWORD || '',
-
     /**
      * Log into OCP by using appropriate provider title.
      */

diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json
diff --git a/tests/e2e/pageobjects/dashboard/Dashboard.ts b/tests/e2e/pageobjects/dashboard/Dashboard.ts
@@ -29,8 +29,7 @@ export class Dashboard {
     private static getUserDropdownMenuButtonLocator(): By {
         Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: get current user.`);
 
-        const currentUser: string = TestConstants.TS_SELENIUM_VALUE_OPENSHIFT_OAUTH ?
-            TestConstants.TS_SELENIUM_OCP_USERNAME : TestConstants.TS_SELENIUM_USERNAME;
+        const currentUser: string = TestConstants.TS_SELENIUM_OCP_USERNAME;
         Logger.debug(`Dashboard.getUserDropdownMenuButtonLocator: ${currentUser}.`);
 
         return By.xpath(`//*[text()="${currentUser}"]//parent::button`);

diff --git a/tests/e2e/pageobjects/login/RedHatLoginPage.ts b/tests/e2e/pageobjects/login/RedHatLoginPage.ts
@@ -36,7 +36,7 @@ export class RedHatLoginPage {
         Logger.debug('RedHatLoginPage.enterPasswordRedHat');
         const passwordFieldLocator: By = By.id(PASSWORD_INPUT_ID);
         await this.driverHelper.waitVisibility(passwordFieldLocator, 3000);
-        await this.driverHelper.enterValue(passwordFieldLocator, TestConstants.TS_SELENIUM_PASSWORD, timeout );
+        await this.driverHelper.enterValue(passwordFieldLocator, TestConstants.TS_SELENIUM_OCP_PASSWORD, timeout );
     }
     async clickOnLoginButton(): Promise<void> {
         Logger.debug('RedHatLoginPage.clickOnLoginButton');
@@ -51,7 +51,7 @@ export class RedHatLoginPage {
         Logger.debug('RedHatLoginPage.enterUserNameRedHat');
         const usernameFieldLocator: By = By.id(USERNAME_INPUT_ID);
         await this.driverHelper.waitVisibility(usernameFieldLocator, 20000);
-        await this.driverHelper.enterValue(usernameFieldLocator, TestConstants.TS_SELENIUM_USERNAME, timeout );
+        await this.driverHelper.enterValue(usernameFieldLocator, TestConstants.TS_SELENIUM_OCP_USERNAME, timeout );
     }
 
     async clickNextButton(): Promise<void> {

diff --git a/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts b/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts
@@ -39,7 +39,7 @@ suite(`Create predefined workspace and check it `, async function (): Promise<vo
     // create a predefined namespace for user using shell script and login into user dashboard
     suiteSetup(async function (): Promise<void> {
         Logger.info('Test prerequisites:');
-        Logger.info(' (1) there is OCP user with username and user password that have been set in the TS_SELENIUM_USERNAME and TS_SELENIUM_PASSWORD variables');
+        Logger.info(' (1) there is OCP user with username and user password that have been set in the TS_SELENIUM_OCP_USERNAME and TS_SELENIUM_OCP_PASSWORD variables');
         Logger.info(' (2) \'oc\' client installed and logged into test OCP cluster with admin rights.');
 
         await runShellScript(createPredefinedProjectCommand);

diff --git a/tests/e2e/utils/CheReporter.ts b/tests/e2e/utils/CheReporter.ts
@@ -42,10 +42,7 @@ class CheReporter extends mocha.reporters.Spec {
 
       TS_SELENIUM_BASE_URL: ${TestConstants.TS_SELENIUM_BASE_URL}
       TS_SELENIUM_HEADLESS: ${TestConstants.TS_SELENIUM_HEADLESS}
-
-      TS_SELENIUM_USERNAME: ${TestConstants.TS_SELENIUM_USERNAME}
-      TS_SELENIUM_PASSWORD: ${TestConstants.TS_SELENIUM_PASSWORD}
-
+      TS_SELENIUM_OCP_USERNAME: ${TestConstants.TS_SELENIUM_OCP_USERNAME}
       TS_SELENIUM_EDITOR:   ${TestConstants.TS_SELENIUM_EDITOR}
 
       TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME: ${TestConstants.TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME}