@eclipse-che/che-e2e 7.76.0-next-c527b61 → 7.76.0-next-018710d
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -27,7 +27,7 @@ suite(`Login to Openshift console and start WebTerminal ${BASE_TEST_CONSTANTS_1.
|
|
|
27
27
|
await ocpMainPage.waitOpenMainPage();
|
|
28
28
|
await ocpMainPage.openWebTerminal();
|
|
29
29
|
});
|
|
30
|
-
test('Check username is correct',
|
|
30
|
+
test('Check username is correct', function () {
|
|
31
31
|
const userUid = shellExecutor.executeCommand('oc get user $(oc whoami) -o jsonpath={.metadata.uid}').replace(/\n/g, '');
|
|
32
32
|
// label selector for Web Terminal workspaces owned by the currently-logged in user
|
|
33
33
|
const labelSelector = 'console.openshift.io/terminal=true,controller.devfile.io/creator=' + userUid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebTerminalTest.spec.js","sourceRoot":"","sources":["../../../specs/web-terminal/WebTerminalTest.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,mEAAwD;AACxD,qEAA8D;AAG9D,6EAA0E;AAG1E,+BAA8B;AAE9B,KAAK,CAAC,oDAAoD,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;IACjG,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,WAAW,GAAgB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,kCAAkC,GAAuC,+BAAY,CAAC,GAAG,CAC9F,yBAAO,CAAC,kCAAkC,CAC1C,CAAC;IACF,MAAM,aAAa,GAAkB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,aAAa,CAAC,CAAC;IAE7E,UAAU,CAAC;QACV,kCAAkC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACvD,aAAa,CAAC,cAAc,CAAC,gCAAgC,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,mBAAmB,EAAE,CAAC;IAEjC,IAAI,CAAC,mBAAmB,EAAE,KAAK;QAC9B,MAAM,WAAW,CAAC,gBAAgB,EAAE,CAAC;QACrC,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,EAAE
|
|
1
|
+
{"version":3,"file":"WebTerminalTest.spec.js","sourceRoot":"","sources":["../../../specs/web-terminal/WebTerminalTest.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,mEAAwD;AACxD,qEAA8D;AAG9D,6EAA0E;AAG1E,+BAA8B;AAE9B,KAAK,CAAC,oDAAoD,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;IACjG,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,WAAW,GAAgB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,kCAAkC,GAAuC,+BAAY,CAAC,GAAG,CAC9F,yBAAO,CAAC,kCAAkC,CAC1C,CAAC;IACF,MAAM,aAAa,GAAkB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,aAAa,CAAC,CAAC;IAE7E,UAAU,CAAC;QACV,kCAAkC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACvD,aAAa,CAAC,cAAc,CAAC,gCAAgC,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,mBAAmB,EAAE,CAAC;IAEjC,IAAI,CAAC,mBAAmB,EAAE,KAAK;QAC9B,MAAM,WAAW,CAAC,gBAAgB,EAAE,CAAC;QACrC,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,EAAE;QACjC,MAAM,OAAO,GAAW,aAAa,CAAC,cAAc,CAAC,sDAAsD,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEhI,mFAAmF;QACnF,MAAM,aAAa,GAAW,mEAAmE,GAAG,OAAO,CAAC;QAC5G,uCAAuC;QACvC,MAAM,SAAS,GAAW,aAAa,CAAC,cAAc,CACrD,mBAAmB,aAAa,+CAA+C,CAC/E,CAAC;QACF,8CAA8C;QAC9C,MAAM,QAAQ,GAAW,aAAa,CAAC,cAAc,CACpD,mBAAmB,aAAa,kDAAkD,CAClF,CAAC;QACF,2DAA2D;QAC3D,MAAM,IAAI,GAAW,aAAa;aAChC,cAAc,CAAC,cAAc,SAAS,WAAW,QAAQ,uCAAuC,CAAC;aACjG,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACrB,+CAA+C;QAC/C,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -36,17 +36,21 @@ suite(`Login to Openshift console and start WebTerminal ${BASE_TEST_CONSTANTS.TE
|
|
|
36
36
|
await ocpMainPage.openWebTerminal();
|
|
37
37
|
});
|
|
38
38
|
|
|
39
|
-
test('Check username is correct',
|
|
40
|
-
const userUid = shellExecutor.executeCommand('oc get user $(oc whoami) -o jsonpath={.metadata.uid}').replace(/\n/g, '');
|
|
39
|
+
test('Check username is correct', function (): void {
|
|
40
|
+
const userUid: string = shellExecutor.executeCommand('oc get user $(oc whoami) -o jsonpath={.metadata.uid}').replace(/\n/g, '');
|
|
41
41
|
|
|
42
42
|
// label selector for Web Terminal workspaces owned by the currently-logged in user
|
|
43
|
-
const labelSelector = 'console.openshift.io/terminal=true,controller.devfile.io/creator=' + userUid;
|
|
43
|
+
const labelSelector: string = 'console.openshift.io/terminal=true,controller.devfile.io/creator=' + userUid;
|
|
44
44
|
// namespace of this users web terminal
|
|
45
|
-
const namespace = shellExecutor.executeCommand(
|
|
45
|
+
const namespace: string = shellExecutor.executeCommand(
|
|
46
|
+
`oc get dw -A -l ${labelSelector} -o jsonpath='{.items[0].metadata.namespace}'`
|
|
47
|
+
);
|
|
46
48
|
// devWorkspace ID for this users web terminal
|
|
47
|
-
const termDwId = shellExecutor.executeCommand(
|
|
49
|
+
const termDwId: string = shellExecutor.executeCommand(
|
|
50
|
+
`oc get dw -A -l ${labelSelector} -o jsonpath='{.items[0].status.devworkspaceId}'`
|
|
51
|
+
);
|
|
48
52
|
// use oc exec to run oc whoami inside this user's terminal
|
|
49
|
-
const user = shellExecutor
|
|
53
|
+
const user: string = shellExecutor
|
|
50
54
|
.executeCommand(`oc exec -n ${namespace} deploy/${termDwId} -c web-terminal-tooling -- oc whoami`)
|
|
51
55
|
.replace(/\n/g, '');
|
|
52
56
|
// above should output current user's username:
|