@eclipse-che/che-e2e 7.78.0 → 7.79.0-next-57fc319
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.
- package/configs/mocharc.ts +9 -9
- package/constants/BASE_TEST_CONSTANTS.ts +2 -2
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/BASE_TEST_CONSTANTS.js.map +1 -1
- package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js +4 -4
- package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/package.json +2 -3
- package/specs/miscellaneous/WorkspaceWithParent.spec.ts +4 -6
- package/utils/DevWorkspaceConfigurationHelper.ts +4 -4
package/configs/mocharc.ts
CHANGED
|
@@ -31,15 +31,15 @@ module.exports = {
|
|
|
31
31
|
BASE_TEST_CONSTANTS.TEST_ENVIRONMENT !== ''
|
|
32
32
|
? `dist/suites/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_SUITE}.suite.js`
|
|
33
33
|
: // variable MOCHA_DIRECTORY uses in command "test-all-devfiles" and sets up automatically.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
34
|
+
// you can set it up to run files from specific directory with export environmental variable.
|
|
35
|
+
MOCHA_CONSTANTS.MOCHA_DIRECTORY
|
|
36
|
+
? // to run one file (name without extension). uses in "test", "test-all-devfiles".
|
|
37
|
+
MOCHA_CONSTANTS.MOCHA_USERSTORY
|
|
38
|
+
? `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`
|
|
39
|
+
: `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/**.spec.js`
|
|
40
|
+
: MOCHA_CONSTANTS.MOCHA_USERSTORY
|
|
41
|
+
? [`dist/specs/**/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`, `dist/specs/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`]
|
|
42
|
+
: ['dist/specs/**/**.spec.js', 'dist/specs/**.spec.js'],
|
|
43
43
|
retries: MOCHA_CONSTANTS.MOCHA_RETRIES,
|
|
44
44
|
grep: MOCHA_CONSTANTS.MOCHA_GREP
|
|
45
45
|
};
|
|
@@ -66,8 +66,8 @@ export const BASE_TEST_CONSTANTS: {
|
|
|
66
66
|
return BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('devspaces')
|
|
67
67
|
? 'devspaces'
|
|
68
68
|
: BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('che')
|
|
69
|
-
|
|
70
|
-
|
|
69
|
+
? 'che'
|
|
70
|
+
: 'default';
|
|
71
71
|
},
|
|
72
72
|
/**
|
|
73
73
|
* testing application version
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocharc.js","sourceRoot":"","sources":["../../configs/mocharc.ts"],"names":[],"mappings":"AAAA;;;;;;;;wEAQwE;AAExE,YAAY,CAAC;;AAEb,kEAA+D;AAC/D,0EAAuE;AAEvE;;GAEG;AAEH,MAAM,CAAC,OAAO,GAAG;IAChB,OAAO,EAAE,iCAAe,CAAC,qBAAqB;IAC9C,IAAI,EAAE,KAAK;IACX,QAAQ,EAAE,uBAAuB;IACjC,eAAe,EAAE,wCAAwC;IACzD,EAAE,EAAE,KAAK;IACT,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC;IAC/B,OAAO,EAAE,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;IACzD,IAAI,EAAE,iCAAe,CAAC,UAAU;IAChC,YAAY,EAAE,IAAI;IAClB,IAAI,EACH,yCAAmB,CAAC,gBAAgB,KAAK,EAAE;QAC1C,CAAC,CAAC,eAAe,iCAAe,CAAC,eAAe,IAAI,iCAAe,CAAC,WAAW,WAAW;QAC1F,CAAC,CAAC,0FAA0F;
|
|
1
|
+
{"version":3,"file":"mocharc.js","sourceRoot":"","sources":["../../configs/mocharc.ts"],"names":[],"mappings":"AAAA;;;;;;;;wEAQwE;AAExE,YAAY,CAAC;;AAEb,kEAA+D;AAC/D,0EAAuE;AAEvE;;GAEG;AAEH,MAAM,CAAC,OAAO,GAAG;IAChB,OAAO,EAAE,iCAAe,CAAC,qBAAqB;IAC9C,IAAI,EAAE,KAAK;IACX,QAAQ,EAAE,uBAAuB;IACjC,eAAe,EAAE,wCAAwC;IACzD,EAAE,EAAE,KAAK;IACT,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC;IAC/B,OAAO,EAAE,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;IACzD,IAAI,EAAE,iCAAe,CAAC,UAAU;IAChC,YAAY,EAAE,IAAI;IAClB,IAAI,EACH,yCAAmB,CAAC,gBAAgB,KAAK,EAAE;QAC1C,CAAC,CAAC,eAAe,iCAAe,CAAC,eAAe,IAAI,iCAAe,CAAC,WAAW,WAAW;QAC1F,CAAC,CAAC,0FAA0F;YAC5F,6FAA6F;YAC7F,iCAAe,CAAC,eAAe;gBAC/B,CAAC,CAAC,iFAAiF;oBACjF,iCAAe,CAAC,eAAe;wBAChC,CAAC,CAAC,cAAc,iCAAe,CAAC,eAAe,IAAI,iCAAe,CAAC,eAAe,UAAU;wBAC5F,CAAC,CAAC,cAAc,iCAAe,CAAC,eAAe,aAAa;gBAC7D,CAAC,CAAC,iCAAe,CAAC,eAAe;oBACjC,CAAC,CAAC,CAAC,iBAAiB,iCAAe,CAAC,eAAe,UAAU,EAAE,cAAc,iCAAe,CAAC,eAAe,UAAU,CAAC;oBACvH,CAAC,CAAC,CAAC,0BAA0B,EAAE,uBAAuB,CAAC;IACzD,OAAO,EAAE,iCAAe,CAAC,aAAa;IACtC,IAAI,EAAE,iCAAe,CAAC,UAAU;CAChC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BASE_TEST_CONSTANTS.js","sourceRoot":"","sources":["../../constants/BASE_TEST_CONSTANTS.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,IAAY,QAGX;AAHD,WAAY,QAAQ;IACnB,mCAAuB,CAAA;IACvB,qCAAyB,CAAA;AAC1B,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAEY,QAAA,mBAAmB,GAqB5B;IACH;;OAEG;IACH,oBAAoB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;IAEnI;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE;IAEtC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;IAE1C;;OAEG;IACH,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE;IAEpD;;OAEG;IACH,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE;IAEhD;;OAEG;IACH,wBAAwB,EAAE,GAAW,EAAE;QACtC,OAAO,2BAAmB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC;YACpE,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,2BAAmB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"BASE_TEST_CONSTANTS.js","sourceRoot":"","sources":["../../constants/BASE_TEST_CONSTANTS.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,IAAY,QAGX;AAHD,WAAY,QAAQ;IACnB,mCAAuB,CAAA;IACvB,qCAAyB,CAAA;AAC1B,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAEY,QAAA,mBAAmB,GAqB5B;IACH;;OAEG;IACH,oBAAoB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;IAEnI;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE;IAEtC;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE;IAE1C;;OAEG;IACH,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE;IAEpD;;OAEG;IACH,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE;IAEhD;;OAEG;IACH,wBAAwB,EAAE,GAAW,EAAE;QACtC,OAAO,2BAAmB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC;YACpE,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,2BAAmB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAC1D,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,SAAS,CAAC;IACd,CAAC;IACD;;OAEG;IACH,2BAA2B,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,KAAK;IAE7E;;;OAGG;IACH,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,MAAM;IAE3F;;OAEG;IACH,uBAAuB,EAAE,GAAY,EAAE,CAAC,2BAAmB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAEnG;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,QAAQ,CAAC,SAAS;IAE1D;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,UAAU;IAEhE;;OAEG;IACH,kCAAkC,EAAE,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,cAAc;IAEpG;;OAEG;IACH,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,QAAQ;IAE5F;;OAEG;IACH,qCAAqC,EAAE,OAAO,CAAC,GAAG,CAAC,qCAAqC,IAAI,gBAAgB;IAE5G;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO;IAEnD;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,MAAM;IAEzF;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAE3F;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;CACnD,CAAC"}
|
|
@@ -63,15 +63,15 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS_1.BASE_TEST_CON
|
|
|
63
63
|
(0, chai_1.expect)(secondExpectedQuickPick).not.undefined;
|
|
64
64
|
});
|
|
65
65
|
test('Check expected containers in the parent POD', function () {
|
|
66
|
-
const getPodNameCommand = `${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pods --selector=controller.devfile.io/devworkspace_name=sample-using-parent --output jsonpath=\'{.items[0].metadata.name}\'`;
|
|
66
|
+
const getPodNameCommand = `${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pods -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_NAMESPACE} --selector=controller.devfile.io/devworkspace_name=sample-using-parent --output jsonpath=\'{.items[0].metadata.name}\'`;
|
|
67
67
|
podName = shellExecutor.executeArbitraryShellScript(getPodNameCommand);
|
|
68
|
-
const containerNames = shellExecutor.executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.containers[*].name}\'`);
|
|
68
|
+
const containerNames = shellExecutor.executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_NAMESPACE} --output jsonpath=\'{.spec.containers[*].name}\'`);
|
|
69
69
|
(0, chai_1.expect)(containerNames).contains('tools').and.contains('che-gateway');
|
|
70
|
-
const initContainerName = shellExecutor.executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.initContainers[].name}\'`);
|
|
70
|
+
const initContainerName = shellExecutor.executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_NAMESPACE} --output jsonpath=\'{.spec.initContainers[].name}\'`);
|
|
71
71
|
(0, chai_1.expect)(initContainerName).contains('che-code-injector');
|
|
72
72
|
});
|
|
73
73
|
test('Check expected environment variables', function () {
|
|
74
|
-
const envList = shellExecutor.executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} exec -i ${podName} -c tools -- sh -c env`);
|
|
74
|
+
const envList = shellExecutor.executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} -n admin-devspaces exec -i ${podName} -c tools -- sh -c env`);
|
|
75
75
|
(0, chai_1.expect)(envList).contains('DEVFILE_ENV_VAR=true').and.contains('PARENT_ENV_VAR=true');
|
|
76
76
|
});
|
|
77
77
|
suiteTeardown('Stop and delete the workspace by API', async function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceWithParent.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceWithParent.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,qEAA8D;AAE9D,6DAA8G;AAC9G,mEAA+D;AAK/D,6EAA0E;AAC1E,+BAA8B;AAC9B,2EAAwE;AACxE,uFAAoF;AACpF,8CAAyD;AAIzD,KAAK,CAAC,uCAAuC,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;IACpF,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;IAC/F,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;IACnF,MAAM,SAAS,GAAc,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,aAAa,GAAkB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,aAAa,CAAC,CAAC;IAC7E,MAAM,iBAAiB,GAAuB,+BAAY,CAAC,GAAG,CAAC,uBAAK,CAAC,aAAa,CAAC,CAAC;IACpF,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;IACxG,MAAM,kCAAkC,GAAuC,+BAAY,CAAC,GAAG,CAC9F,yBAAO,CAAC,kCAAkC,CAC1C,CAAC;
|
|
1
|
+
{"version":3,"file":"WorkspaceWithParent.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceWithParent.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,2EAAqF;AAGrF,gDAAwB;AACxB,6CAA+B;AAC/B,qCAAkC;AAClC,mDAAgD;AAChD,wEAAqE;AACrE,yCAAuC;AAEvC,kEAA2D;AAC3D,gEAAuE;AACvE,8FAAwD;AAExD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,qCAAa,EAAC,+BAAY,CAAC,CAAC;AAG5C,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAO3C,YAAY,MAAsB;QACjC,yBAAyB;QACzB,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE;YACvE,MAAM,CAAC,WAAW,GAAG,+BAA+B,CAAC;SACrD;QACD,iCAAiC;QACjC,IAAI,uCAAkB,CAAC,qBAAqB,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAC7E,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC;YACvC,sEAAsE;YACtE,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE;gBAClC,MAAM,CAAC,qBAAqB,GAAG,uCAAkB,CAAC,qBAAqB,CAAC;aACxE;SACD;QACD,2DAA2D;QAC3D,IAAI,uCAAkB,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YACpF,MAAM,CAAC,iBAAiB,GAAG,uCAAkB,CAAC,+BAA+B,CAAC;SAC9E;QACD,IAAI,uCAAkB,CAAC,uCAAuC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACxF,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,uCAAkB,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC;SAClH;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC1B;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CACjD;YACC,GAAG,IAAI,CAAC,MAAM;YACd,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;SAC9B,EACD,KAAK,CAAC,OAAc,CACpB,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,wCAAwC,CAAC,OAAuB;QAC/D,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,eAAe,GAAU,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,QAAsC,EAAU,EAAE,CACnH,cAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACxB,CAAC;QACF,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAE3D,OAAO,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,mCAAmC,CAAC,gBAAwB;QAC3D,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,MAAM,YAAY,GAAa,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/D,YAAY,CAAC,OAAO,CAAC,CAAC,CAAM,EAAQ,EAAE;YACrC,CAAC,GAAG,cAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,IAAI,KAAK,cAAc;gBACxB,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAsB;
|
|
1
|
+
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.79.0-next-57fc319",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -65,8 +65,7 @@
|
|
|
65
65
|
"dependencies": {
|
|
66
66
|
"@eclipse-che/api": "latest",
|
|
67
67
|
"inversify": "6.0.1",
|
|
68
|
-
"reflect-metadata": "0.1.13"
|
|
69
|
-
"@eclipse-che/che-devworkspace-generator": "7.78.0"
|
|
68
|
+
"reflect-metadata": "0.1.13"
|
|
70
69
|
},
|
|
71
70
|
"resolutions": {
|
|
72
71
|
"minimist": "^1.2.5"
|
|
@@ -34,7 +34,6 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN
|
|
|
34
34
|
const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
|
|
35
35
|
CLASSES.KubernetesCommandLineToolsExecutor
|
|
36
36
|
);
|
|
37
|
-
|
|
38
37
|
let podName: string = '';
|
|
39
38
|
|
|
40
39
|
suiteSetup(function (): void {
|
|
@@ -58,7 +57,6 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN
|
|
|
58
57
|
test('Check cloning of the test project', async function (): Promise<void> {
|
|
59
58
|
const expectedProjectItems: string[] = ['.devfile.yaml', 'parent.yaml', 'README.md', 'parentdevfile'];
|
|
60
59
|
const visibleContent: ViewSection = await projectAndFileTests.getProjectViewSession();
|
|
61
|
-
|
|
62
60
|
for (const expectedProjectItem of expectedProjectItems) {
|
|
63
61
|
const visibleItem: ViewItem | undefined = await projectAndFileTests.getProjectTreeItem(visibleContent, expectedProjectItem);
|
|
64
62
|
expect(visibleItem).not.undefined;
|
|
@@ -79,23 +77,23 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN
|
|
|
79
77
|
});
|
|
80
78
|
|
|
81
79
|
test('Check expected containers in the parent POD', function (): void {
|
|
82
|
-
const getPodNameCommand: string = `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pods --selector=controller.devfile.io/devworkspace_name=sample-using-parent --output jsonpath=\'{.items[0].metadata.name}\'`;
|
|
80
|
+
const getPodNameCommand: string = `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pods -n ${BASE_TEST_CONSTANTS.TEST_NAMESPACE} --selector=controller.devfile.io/devworkspace_name=sample-using-parent --output jsonpath=\'{.items[0].metadata.name}\'`;
|
|
83
81
|
|
|
84
82
|
podName = shellExecutor.executeArbitraryShellScript(getPodNameCommand);
|
|
85
83
|
const containerNames: string = shellExecutor.executeArbitraryShellScript(
|
|
86
|
-
`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.containers[*].name}\'`
|
|
84
|
+
`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} -n ${BASE_TEST_CONSTANTS.TEST_NAMESPACE} --output jsonpath=\'{.spec.containers[*].name}\'`
|
|
87
85
|
);
|
|
88
86
|
expect(containerNames).contains('tools').and.contains('che-gateway');
|
|
89
87
|
|
|
90
88
|
const initContainerName: string = shellExecutor.executeArbitraryShellScript(
|
|
91
|
-
`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.initContainers[].name}\'`
|
|
89
|
+
`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} -n ${BASE_TEST_CONSTANTS.TEST_NAMESPACE} --output jsonpath=\'{.spec.initContainers[].name}\'`
|
|
92
90
|
);
|
|
93
91
|
expect(initContainerName).contains('che-code-injector');
|
|
94
92
|
});
|
|
95
93
|
|
|
96
94
|
test('Check expected environment variables', function (): void {
|
|
97
95
|
const envList: string = shellExecutor.executeArbitraryShellScript(
|
|
98
|
-
`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} exec -i ${podName} -c tools -- sh -c env`
|
|
96
|
+
`${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} -n admin-devspaces exec -i ${podName} -c tools -- sh -c env`
|
|
99
97
|
);
|
|
100
98
|
expect(envList).contains('DEVFILE_ENV_VAR=true').and.contains('PARENT_ENV_VAR=true');
|
|
101
99
|
});
|
|
@@ -90,10 +90,10 @@ export class DevWorkspaceConfigurationHelper {
|
|
|
90
90
|
e.kind === 'DevWorkspace'
|
|
91
91
|
? (content.DevWorkspace = e)
|
|
92
92
|
: e.kind === 'DevWorkspaceTemplate'
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
93
|
+
? (content.DevWorkspaceTemplate = e)
|
|
94
|
+
: Logger.error(
|
|
95
|
+
'Problems with configuration parsing, string should be in format "DevWorkspace\\n---\\nDevWorkspaceTemplate"'
|
|
96
|
+
);
|
|
97
97
|
});
|
|
98
98
|
|
|
99
99
|
return content;
|