fix conflict names in htpasswd provider and DevWorkspace test (#20903)

fix conflict names in htpasswd provider and DevWorkspace test
eclipse-che · Dec 9, 2021 · 6e259a3 · 6e259a3
1 parent 7e33489
commit 6e259a3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/tests/devworkspace-happy-path/resources/cluster-oauth-patch.json b/tests/devworkspace-happy-path/resources/cluster-oauth-patch.json
@@ -2,12 +2,12 @@
   "spec": {
     "identityProviders": [
       {
-        "name": "che-htpasswd",
-        "mappingMethod": "claim",
+        "name": "dev-htpasswd",
+        "mappingMethod": "add",
         "type": "HTPasswd",
         "htpasswd": {
           "fileData": {
-            "name": "che-htpasswd-secret"
+            "name": "dev-htpasswd-secret"
           }
         }
       }

diff --git a/tests/devworkspace-happy-path/resources/pod-che-happy-path.yaml b/tests/devworkspace-happy-path/resources/pod-che-happy-path.yaml
@@ -28,17 +28,17 @@ spec:
         - name: TS_SELENIUM_LOG_LEVEL
           value: TRACE
         - name: TS_SELENIUM_OCP_USERNAME
-          value: 'che-user'
+          value: 'happypath-dev'
         - name: TS_SELENIUM_OCP_PASSWORD
-          value: "user"
+          value: "dev"
         - name: TS_SELENIUM_VALUE_OPENSHIFT_OAUTH
           value: 'true'
         - name: TS_SELENIUM_USERNAME
           value: "admin"
         - name: TS_SELENIUM_PASSWORD
           value: 'admin'
         - name: TS_OCP_LOGIN_PAGE_PROVIDER_TITLE
-          value: "che-htpasswd"
+          value: "dev-htpasswd"
         - name: DELETE_WORKSPACE_ON_FAILED_TEST
           value: "true"
         - name: TS_SELENIUM_START_WORKSPACE_TIMEOUT
@@ -57,7 +57,7 @@ spec:
         limits:
           memory: "4Gi"
           cpu: "2"
-    # Download results    
+    # Download results
     - name: download-reports
       image: eeacms/rsync
       imagePullPolicy: IfNotPresent

diff --git a/tests/devworkspace-happy-path/resources/users.htpasswd b/tests/devworkspace-happy-path/resources/users.htpasswd
@@ -1,2 +1 @@
-# login: che-user. password: user
-che-user:{SHA}Et6pb+wgWTVmq3VpLJlJWWgzrck=
+happypath-dev:$2y$05$W0AwRfPa1A1ne8QI0rvzpOgroeASayQdvNR.5GteVqjx26TOWz/km
diff --git a/tests/e2e/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts b/tests/e2e/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts
@@ -141,7 +141,7 @@ suite('Workspace creation via factory url', async () => {
         });
 
         test('Run application', async () => {
-           const taskName: string = 'run';
+           const taskName: string = 'run-with-hsqldb';
            await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
            await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120_000);
             // devWs specific. After running test application we can open it just in the new window.
@@ -154,8 +154,8 @@ suite('Workspace creation via factory url', async () => {
        });
 
         test('Close the terminal running tasks', async () => {
-            await terminal.rejectTerminalProcess('run');
-            await terminal.closeTerminalTab('run');
+            await terminal.rejectTerminalProcess('run-with-hsqldb');
+            await terminal.closeTerminalTab('run-with-hsqldb');
             await warningDialog.waitAndCloseIfAppear();
             await terminal.closeTerminalTab('build');
        });