@eclipse-che/che-e2e 7.75.0-next-e862bb5 → 7.75.0-next-6c67694

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.
Files changed (16) hide show
  1. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +7 -0
  2. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
  3. package/dist/pageobjects/login/openshift/RedHatLoginPage.js +12 -0
  4. package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
  5. package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js +17 -24
  6. package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js.map +1 -1
  7. package/dist/tests-library/ProjectAndFileTests.js +3 -0
  8. package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
  9. package/dist/utils/ShellExecutor.js +9 -0
  10. package/dist/utils/ShellExecutor.js.map +1 -1
  11. package/package.json +1 -1
  12. package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +6 -0
  13. package/pageobjects/login/openshift/RedHatLoginPage.ts +14 -0
  14. package/specs/miscellaneous/WorkspaceWithParent.spec.ts +22 -26
  15. package/tests-library/ProjectAndFileTests.ts +3 -1
  16. package/utils/ShellExecutor.ts +9 -0
package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js CHANGED
@@ -43,6 +43,13 @@ let OcpRedHatLoginPage = OcpRedHatLoginPage_1 = class OcpRedHatLoginPage {
43
43
  await this.driverHelper.waitAndClick(OcpRedHatLoginPage_1.OPENSHIFT_LOGIN_LANDING_PAGE_BUTTON, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
44
44
  await this.ocpLogin.waitAndClickOnLoginProviderTitle();
45
45
  await this.redHatLogin.waitRedHatLoginWelcomePage();
46
+ try {
47
+ await this.redHatLogin.waitAndConfirmCookiePolicy();
48
+ }
49
+ catch (err) {
50
+ Logger_1.Logger.warn('Cookie confirmation dialog not present, continuing...');
51
+ Logger_1.Logger.warn(`${err}`);
52
+ }
46
53
  await this.redHatLogin.enterUserNameRedHat();
47
54
  await this.redHatLogin.clickNextButton();
48
55
  await this.redHatLogin.enterPasswordRedHat();
package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OcpRedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpRedHatLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,uDAAoD;AACpD,sEAA2D;AAC3D,2DAAwC;AACxC,4EAAyE;AAEzE,iDAA8C;AAC9C,8DAA2D;AAC3D,kDAA+C;AAGxC,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAK9B,YACgD,QAAsB,EAEpD,WAA4B,EAE5B,YAA0B;QAJI,aAAQ,GAAR,QAAQ,CAAc;QAEpD,gBAAW,GAAX,WAAW,CAAiB;QAE5B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,KAAK;QACV,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,oBAAkB,CAAC,mCAAmC,EACtD,qCAAiB,CAAC,6BAA6B,CAC/C,CAAC;QACF,MAAM,IAAI,CAAC,QAAQ,CAAC,gCAAgC,EAAE,CAAC;QACvD,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,CAAC;QACpD,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,uCAAuC,EAAE,CAAC;IAClE,CAAC;;AAzBuB,sDAAmC,GAAO,uBAAE,CAAC,KAAK,CACzE,gFAAgF,CAChF,CAAC;AAHU,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;IAOV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAH4B,2BAAY;QAEvC,iCAAe;QAEd,2BAAY;GAVhC,kBAAkB,CA2B9B;AA3BY,gDAAkB"}
1
+ {"version":3,"file":"OcpRedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/OcpRedHatLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,uDAAoD;AACpD,sEAA2D;AAC3D,2DAAwC;AACxC,4EAAyE;AAEzE,iDAA8C;AAC9C,8DAA2D;AAC3D,kDAA+C;AAGxC,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAK9B,YACgD,QAAsB,EAEpD,WAA4B,EAE5B,YAA0B;QAJI,aAAQ,GAAR,QAAQ,CAAc;QAEpD,gBAAW,GAAX,WAAW,CAAiB;QAE5B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,KAAK;QACV,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,oBAAkB,CAAC,mCAAmC,EACtD,qCAAiB,CAAC,6BAA6B,CAC/C,CAAC;QACF,MAAM,IAAI,CAAC,QAAQ,CAAC,gCAAgC,EAAE,CAAC;QACvD,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,CAAC;QACpD,IAAI;YACH,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,CAAC;SACpD;QAAC,OAAO,GAAG,EAAE;YACb,eAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;YACrE,eAAM,CAAC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;SACtB;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,uCAAuC,EAAE,CAAC;IAClE,CAAC;;AA/BuB,sDAAmC,GAAO,uBAAE,CAAC,KAAK,CACzE,gFAAgF,CAChF,CAAC;AAHU,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;IAOV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAC5B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,eAAe,CAAC,CAAA;IAE/B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAH4B,2BAAY;QAEvC,iCAAe;QAEd,2BAAY;GAVhC,kBAAkB,CAiC9B;AAjCY,gDAAkB"}
package/dist/pageobjects/login/openshift/RedHatLoginPage.js CHANGED
@@ -39,6 +39,16 @@ let RedHatLoginPage = RedHatLoginPage_1 = class RedHatLoginPage {
39
39
  Logger_1.Logger.debug();
40
40
  await this.driverHelper.waitVisibility(RedHatLoginPage_1.USERNAME_INPUT, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
41
41
  }
42
+ async waitAndConfirmCookiePolicy() {
43
+ Logger_1.Logger.debug();
44
+ await this.driverHelper.waitVisibility(RedHatLoginPage_1.COOKIE_DIALOG_IFRAME, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
45
+ await this.driverHelper
46
+ .getDriver()
47
+ .switchTo()
48
+ .frame(await this.driverHelper.getDriver().findElement(RedHatLoginPage_1.COOKIE_DIALOG_IFRAME));
49
+ await this.driverHelper.waitAndClick(RedHatLoginPage_1.COOKIE_DIALOG_BUTTON, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
50
+ await this.driverHelper.refreshPage();
51
+ }
42
52
  async enterPasswordRedHat() {
43
53
  Logger_1.Logger.debug();
44
54
  await this.driverHelper.enterValue(RedHatLoginPage_1.PASSWORD_INPUT, OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_PASSWORD);
@@ -64,6 +74,8 @@ RedHatLoginPage.USERNAME_INPUT = selenium_webdriver_1.By.id('username-verificati
64
74
  RedHatLoginPage.PASSWORD_INPUT = selenium_webdriver_1.By.id('password');
65
75
  RedHatLoginPage.NEXT_BUTTON = selenium_webdriver_1.By.id('login-show-step2');
66
76
  RedHatLoginPage.LOGIN_BUTTON = selenium_webdriver_1.By.id('rh-password-verification-submit-button');
77
+ RedHatLoginPage.COOKIE_DIALOG_IFRAME = selenium_webdriver_1.By.xpath('//div[@class="truste_box_overlay"]//iframe[@class="truste_popframe"]');
78
+ RedHatLoginPage.COOKIE_DIALOG_BUTTON = selenium_webdriver_1.By.xpath('//div[@class="pdynamicbutton"]//a[@class="call"]');
67
79
  RedHatLoginPage = RedHatLoginPage_1 = __decorate([
68
80
  (0, inversify_1.injectable)(),
69
81
  __param(0, (0, inversify_1.inject)(inversify_types_1.CLASSES.DriverHelper)),
package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/RedHatLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwC;AACxC,sEAA2D;AAC3D,8DAA2D;AAC3D,kDAA+C;AAC/C,wEAAqE;AACrE,4EAAyE;AAGlE,IAAM,eAAe,uBAArB,MAAM,eAAe;IAM3B,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,0BAA0B;QAC/B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAe,CAAC,cAAc,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IACzH,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAe,CAAC,cAAc,EAAE,iCAAe,CAAC,wBAAwB,CAAC,CAAC;IAC9G,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAe,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,uCAAuC;QAC5C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,iBAAe,CAAC,YAAY,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAe,CAAC,cAAc,EAAE,iCAAe,CAAC,wBAAwB,CAAC,CAAC;IAC9G,CAAC;IAED,KAAK,CAAC,eAAe;QACpB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAe,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC;;AA5CuB,8BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;AACpD,8BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;AACvC,2BAAW,GAAO,uBAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC;AAC5C,4BAAY,GAAO,uBAAE,CAAC,EAAE,CAAC,wCAAwC,CAAC,CAAC;AAJ/E,eAAe;IAD3B,IAAA,sBAAU,GAAE;IAQV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GARhC,eAAe,CA8C3B;AA9CY,0CAAe"}
1
+ {"version":3,"file":"RedHatLoginPage.js","sourceRoot":"","sources":["../../../../pageobjects/login/openshift/RedHatLoginPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwC;AACxC,sEAA2D;AAC3D,8DAA2D;AAC3D,kDAA+C;AAC/C,wEAAqE;AACrE,4EAAyE;AAGlE,IAAM,eAAe,uBAArB,MAAM,eAAe;IAQ3B,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,KAAK,CAAC,0BAA0B;QAC/B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAe,CAAC,cAAc,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IACzH,CAAC;IAED,KAAK,CAAC,0BAA0B;QAC/B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAe,CAAC,oBAAoB,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;QAC9H,MAAM,IAAI,CAAC,YAAY;aACrB,SAAS,EAAE;aACX,QAAQ,EAAE;aACV,KAAK,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,iBAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAe,CAAC,oBAAoB,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;QAC5H,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAe,CAAC,cAAc,EAAE,iCAAe,CAAC,wBAAwB,CAAC,CAAC;IAC9G,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAe,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,uCAAuC;QAC5C,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,iBAAe,CAAC,YAAY,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAe,CAAC,cAAc,EAAE,iCAAe,CAAC,wBAAwB,CAAC,CAAC;IAC9G,CAAC;IAED,KAAK,CAAC,eAAe;QACpB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAe,CAAC,WAAW,CAAC,CAAC;IACnE,CAAC;;AA1DuB,8BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;AACpD,8BAAc,GAAO,uBAAE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;AACvC,2BAAW,GAAO,uBAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC;AAC5C,4BAAY,GAAO,uBAAE,CAAC,EAAE,CAAC,wCAAwC,CAAC,CAAC;AACnE,oCAAoB,GAAO,uBAAE,CAAC,KAAK,CAAC,sEAAsE,CAAC,CAAC;AAC5G,oCAAoB,GAAO,uBAAE,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;AANpG,eAAe;IAD3B,IAAA,sBAAU,GAAE;IAUV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GAVhC,eAAe,CA4D3B;AA5DY,0CAAe"}
package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js CHANGED
@@ -17,22 +17,17 @@ const chai_1 = require("chai");
17
17
  const API_TEST_CONSTANTS_1 = require("../../constants/API_TEST_CONSTANTS");
18
18
  const WorkspaceHandlingTests_1 = require("../../tests-library/WorkspaceHandlingTests");
19
19
  const MochaHooks_1 = require("../MochaHooks");
20
- const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
21
- const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
22
- const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
23
- const dashboard = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Dashboard);
24
- const shellExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ShellExecutor);
25
- const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
26
- function executeArbitraryShellScript(command) {
27
- const output = shellExecutor.executeCommand(command);
28
- if (output.stderr.length > 0) {
29
- chai_1.assert.fail(output.stderr);
30
- }
31
- return output.stdout;
32
- }
33
20
  suite('Workspace using a parent test suite', function () {
34
- loginTests.loginIntoChe();
21
+ const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
22
+ const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
23
+ const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
24
+ const dashboard = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Dashboard);
25
+ const shellExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ShellExecutor);
26
+ const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
27
+ const kubernetesCommandLineToolsExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor);
35
28
  let podName = '';
29
+ loginTests.loginIntoChe();
30
+ kubernetesCommandLineToolsExecutor.loginToOcp();
36
31
  test('Create a workspace using a parent', async function () {
37
32
  const factoryUrl = `${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL}/dashboard/#https://github.com/testsfactory/parentDevfile`;
38
33
  await dashboard.waitPage();
@@ -40,8 +35,6 @@ suite('Workspace using a parent test suite', function () {
40
35
  await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
41
36
  (0, MochaHooks_1.registerRunningWorkspace)(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
42
37
  await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
43
- // sometimes the trust dialog does not appear at first time, for avoiding this problem we send click event for activating
44
- await new monaco_page_objects_1.Workbench().click();
45
38
  await projectAndFileTests.performTrustAuthorDialog();
46
39
  });
47
40
  test('Check cloning of the test project', async function () {
@@ -61,22 +54,22 @@ suite('Workspace using a parent test suite', function () {
61
54
  await devFileTask?.click();
62
55
  const firstExpectedQuickPick = await input.findQuickPick('1. This command from the devfile');
63
56
  const secondExpectedQuickPick = await input.findQuickPick('2. This command from the parent');
64
- (0, chai_1.expect)(firstExpectedQuickPick).not.eqls(undefined);
65
- (0, chai_1.expect)(secondExpectedQuickPick).not.eqls(undefined);
57
+ (0, chai_1.expect)(firstExpectedQuickPick).not.undefined;
58
+ (0, chai_1.expect)(secondExpectedQuickPick).not.undefined;
66
59
  });
67
60
  test('Check expected containers in the parent POD', function () {
68
61
  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}\'`;
69
- podName = executeArbitraryShellScript(getPodNameCommand);
70
- const containerNames = executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.containers[*].name}\'`);
62
+ podName = shellExecutor.executeArbitraryShellScript(getPodNameCommand);
63
+ 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}\'`);
71
64
  (0, chai_1.expect)(containerNames).contain('tools');
72
65
  (0, chai_1.expect)(containerNames).contains('che-gateway');
73
- const initContainerName = executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.initContainers[].name}\'`);
66
+ 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}\'`);
74
67
  (0, chai_1.expect)(initContainerName).contain('che-code-injector');
75
68
  });
76
69
  test('Check expected environment variables', function () {
77
- const envList = executeArbitraryShellScript(`${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} exec -i ${podName} -c tools -- sh -c env`);
78
- (0, chai_1.expect)(envList).contain('DEVFILE_ENV_VAR=true');
79
- (0, chai_1.expect)(envList).contain('PARENT_ENV_VAR=true');
70
+ 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`);
71
+ (0, chai_1.expect)(envList).contain('DEVFILE_ENV_VAR=true').and.contain('PARENT_ENV_VAR=true');
80
72
  });
73
+ loginTests.logoutFromChe();
81
74
  });
82
75
  //# sourceMappingURL=WorkspaceWithParent.spec.js.map
package/dist/specs/miscellaneous/WorkspaceWithParent.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WorkspaceWithParent.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceWithParent.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WorkspaceWithParent.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/WorkspaceWithParent.spec.ts"],"names":[],"mappings":"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"}
package/dist/tests-library/ProjectAndFileTests.js CHANGED
@@ -29,6 +29,7 @@ const inversify_types_1 = require("../configs/inversify.types");
29
29
  const Logger_1 = require("../utils/Logger");
30
30
  const TIMEOUT_CONSTANTS_1 = require("../constants/TIMEOUT_CONSTANTS");
31
31
  const CheCodeLocatorLoader_1 = require("../pageobjects/ide/CheCodeLocatorLoader");
32
+ const monaco_page_objects_1 = require("monaco-page-objects");
32
33
  let ProjectAndFileTests = class ProjectAndFileTests {
33
34
  constructor(driverHelper, cheCodeLocatorLoader) {
34
35
  this.driverHelper = driverHelper;
@@ -49,6 +50,8 @@ let ProjectAndFileTests = class ProjectAndFileTests {
49
50
  }
50
51
  async performTrustAuthorDialog() {
51
52
  Logger_1.Logger.debug();
53
+ // sometimes the trust dialog does not appear at first time, for avoiding this problem we send click event for activating
54
+ await new monaco_page_objects_1.Workbench().click();
52
55
  await this.driverHelper.waitAndClick(this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT);
53
56
  try {
54
57
  await this.driverHelper.waitAndClick(this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT);
package/dist/tests-library/ProjectAndFileTests.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,wDAAqD;AACrD,gEAAqD;AACrD,4CAAyC;AACzC,sEAAmE;AACnE,kFAA+E;AAGxE,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAEkB,YAA0B,EAE1B,oBAA0C;QAF1C,iBAAY,GAAZ,YAAY,CAAc;QAE1B,yBAAoB,GAApB,oBAAoB,CAAsB;IACzD,CAAC;IAEJ,KAAK,CAAC,sCAAsC;QAC3C,eAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACpC,IAAI;YACH,MAAM,KAAK,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CACrC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,SAAS,CAAC,WAAW,EAClE,qCAAiB,CAAC,mCAAmC,CACrD,CAAC;YACF,MAAM,GAAG,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACzC,eAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,GAAG,KAAK,WAAW,CAAC,CAAC;SAC7D;QAAC,OAAO,GAAG,EAAE;YACb,eAAM,CAAC,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;YAC/D,MAAM,GAAG,CAAC;SACV;IACF,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC7B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,EAClE,qCAAiB,CAAC,gCAAgC,CAClD,CAAC;QAEF,IAAI;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,EAClE,qCAAiB,CAAC,gCAAgC,CAClD,CAAC;SACF;QAAC,OAAO,CAAC,EAAE;YACX,eAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;SAC/D;IACF,CAAC;CACD,CAAA;AAzCY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IAGV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAE5B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;qCADN,2BAAY;QAEJ,2CAAoB;GALhD,mBAAmB,CAyC/B;AAzCY,kDAAmB"}
1
+ {"version":3,"file":"ProjectAndFileTests.js","sourceRoot":"","sources":["../../tests-library/ProjectAndFileTests.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,wDAAqD;AACrD,gEAAqD;AACrD,4CAAyC;AACzC,sEAAmE;AACnE,kFAA+E;AAC/E,6DAAgD;AAGzC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YAEkB,YAA0B,EAE1B,oBAA0C;QAF1C,iBAAY,GAAZ,YAAY,CAAc;QAE1B,yBAAoB,GAApB,oBAAoB,CAAsB;IACzD,CAAC;IAEJ,KAAK,CAAC,sCAAsC;QAC3C,eAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACpC,IAAI;YACH,MAAM,KAAK,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CACrC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,SAAS,CAAC,WAAW,EAClE,qCAAiB,CAAC,mCAAmC,CACrD,CAAC;YACF,MAAM,GAAG,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;YACzC,eAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,GAAG,KAAK,WAAW,CAAC,CAAC;SAC7D;QAAC,OAAO,GAAG,EAAE;YACb,eAAM,CAAC,KAAK,CAAC,2CAA2C,GAAG,EAAE,CAAC,CAAC;YAC/D,MAAM,GAAG,CAAC;SACV;IACF,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC7B,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,yHAAyH;QACzH,MAAM,IAAI,+BAAS,EAAE,CAAC,KAAK,EAAE,CAAC;QAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,EAClE,qCAAiB,CAAC,gCAAgC,CAClD,CAAC;QAEF,IAAI;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACnC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,EAClE,qCAAiB,CAAC,gCAAgC,CAClD,CAAC;SACF;QAAC,OAAO,CAAC,EAAE;YACX,eAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;SAC/D;IACF,CAAC;CACD,CAAA;AA1CY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IAGV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;IAE5B,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;qCADN,2BAAY;QAEJ,2CAAoB;GALhD,mBAAmB,CA0C/B;AA1CY,kDAAmB"}
package/dist/utils/ShellExecutor.js CHANGED
@@ -19,6 +19,7 @@ exports.ShellExecutor = void 0;
19
19
  const shelljs_1 = require("shelljs");
20
20
  const Logger_1 = require("./Logger");
21
21
  const inversify_1 = require("inversify");
22
+ const chai_1 = require("chai");
22
23
  let ShellExecutor = class ShellExecutor {
23
24
  wait(seconds) {
24
25
  this.executeCommand(`sleep ${seconds}s`);
@@ -30,6 +31,14 @@ let ShellExecutor = class ShellExecutor {
30
31
  Logger_1.Logger.debug(command);
31
32
  return (0, shelljs_1.exec)(command);
32
33
  }
34
+ executeArbitraryShellScript(command) {
35
+ Logger_1.Logger.debug(command);
36
+ const output = this.executeCommand(command);
37
+ if (output.stderr.length > 0) {
38
+ chai_1.assert.fail(output.stderr);
39
+ }
40
+ return output.stdout;
41
+ }
33
42
  };
34
43
  ShellExecutor = __decorate([
35
44
  (0, inversify_1.injectable)()
package/dist/utils/ShellExecutor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ShellExecutor.js","sourceRoot":"","sources":["../../utils/ShellExecutor.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,qCAA4C;AAC5C,qCAAkC;AAClC,yCAAuC;AAGhC,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,IAAI,CAAC,OAAe;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,IAAY;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,OAAe;QAC7B,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC;IACtB,CAAC;CACD,CAAA;AAbY,aAAa;IADzB,IAAA,sBAAU,GAAE;GACA,aAAa,CAazB;AAbY,sCAAa"}
1
+ {"version":3,"file":"ShellExecutor.js","sourceRoot":"","sources":["../../utils/ShellExecutor.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,qCAA4C;AAC5C,qCAAkC;AAClC,yCAAuC;AACvC,+BAA8B;AAGvB,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,IAAI,CAAC,OAAe;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,IAAY;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,OAAe;QAC7B,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC;IACtB,CAAC;IACD,2BAA2B,CAAC,OAAe;QAC1C,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,MAAM,MAAM,GAAgB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,aAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAC3B;QACD,OAAO,MAAM,CAAC,MAAM,CAAC;IACtB,CAAC;CACD,CAAA;AArBY,aAAa;IADzB,IAAA,sBAAU,GAAE;GACA,aAAa,CAqBzB;AArBY,sCAAa"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-che/che-e2e",
3
- "version": "7.75.0-next-e862bb5",
3
+ "version": "7.75.0-next-6c67694",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/pageobjects/login/openshift/OcpRedHatLoginPage.ts CHANGED
@@ -40,6 +40,12 @@ export class OcpRedHatLoginPage implements ICheLoginPage {
40
40
  );
41
41
  await this.ocpLogin.waitAndClickOnLoginProviderTitle();
42
42
  await this.redHatLogin.waitRedHatLoginWelcomePage();
43
+ try {
44
+ await this.redHatLogin.waitAndConfirmCookiePolicy();
45
+ } catch (err) {
46
+ Logger.warn('Cookie confirmation dialog not present, continuing...');
47
+ Logger.warn(`${err}`);
48
+ }
43
49
  await this.redHatLogin.enterUserNameRedHat();
44
50
  await this.redHatLogin.clickNextButton();
45
51
  await this.redHatLogin.enterPasswordRedHat();
package/pageobjects/login/openshift/RedHatLoginPage.ts CHANGED
@@ -22,6 +22,8 @@ export class RedHatLoginPage {
22
22
  private static readonly PASSWORD_INPUT: By = By.id('password');
23
23
  private static readonly NEXT_BUTTON: By = By.id('login-show-step2');
24
24
  private static readonly LOGIN_BUTTON: By = By.id('rh-password-verification-submit-button');
25
+ private static readonly COOKIE_DIALOG_IFRAME: By = By.xpath('//div[@class="truste_box_overlay"]//iframe[@class="truste_popframe"]');
26
+ private static readonly COOKIE_DIALOG_BUTTON: By = By.xpath('//div[@class="pdynamicbutton"]//a[@class="call"]');
25
27
 
26
28
  constructor(
27
29
  @inject(CLASSES.DriverHelper)
@@ -34,6 +36,18 @@ export class RedHatLoginPage {
34
36
  await this.driverHelper.waitVisibility(RedHatLoginPage.USERNAME_INPUT, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
35
37
  }
36
38
 
39
+ async waitAndConfirmCookiePolicy(): Promise<void> {
40
+ Logger.debug();
41
+
42
+ await this.driverHelper.waitVisibility(RedHatLoginPage.COOKIE_DIALOG_IFRAME, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
43
+ await this.driverHelper
44
+ .getDriver()
45
+ .switchTo()
46
+ .frame(await this.driverHelper.getDriver().findElement(RedHatLoginPage.COOKIE_DIALOG_IFRAME));
47
+ await this.driverHelper.waitAndClick(RedHatLoginPage.COOKIE_DIALOG_BUTTON, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
48
+ await this.driverHelper.refreshPage();
49
+ }
50
+
37
51
  async enterPasswordRedHat(): Promise<void> {
38
52
  Logger.debug();
39
53
 
package/specs/miscellaneous/WorkspaceWithParent.spec.ts CHANGED
@@ -16,27 +16,25 @@ import { LoginTests } from '../../tests-library/LoginTests';
16
16
  import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
17
17
  import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
18
18
  import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
19
- import { assert, expect } from 'chai';
19
+ import { expect } from 'chai';
20
20
  import { API_TEST_CONSTANTS } from '../../constants/API_TEST_CONSTANTS';
21
- import { ShellString } from 'shelljs';
22
21
  import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
23
22
  import { registerRunningWorkspace } from '../MochaHooks';
24
- const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
25
- const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
26
- const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
27
- const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
28
- const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
29
- const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
30
- function executeArbitraryShellScript(command: string): string {
31
- const output: ShellString = shellExecutor.executeCommand(command);
32
- if (output.stderr.length > 0) {
33
- assert.fail(output.stderr);
34
- }
35
- return output.stdout;
36
- }
23
+ import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
24
+
37
25
  suite('Workspace using a parent test suite', function (): void {
38
- loginTests.loginIntoChe();
26
+ const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
27
+ const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
28
+ const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
29
+ const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
30
+ const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
31
+ const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
32
+ const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
33
+ CLASSES.KubernetesCommandLineToolsExecutor
34
+ );
39
35
  let podName: string = '';
36
+ loginTests.loginIntoChe();
37
+ kubernetesCommandLineToolsExecutor.loginToOcp();
40
38
 
41
39
  test('Create a workspace using a parent', async function (): Promise<void> {
42
40
  const factoryUrl: string = `${BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL}/dashboard/#https://github.com/testsfactory/parentDevfile`;
@@ -45,8 +43,6 @@ suite('Workspace using a parent test suite', function (): void {
45
43
  await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
46
44
  registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
47
45
  await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
48
- // sometimes the trust dialog does not appear at first time, for avoiding this problem we send click event for activating
49
- await new Workbench().click();
50
46
  await projectAndFileTests.performTrustAuthorDialog();
51
47
  });
52
48
 
@@ -69,31 +65,31 @@ suite('Workspace using a parent test suite', function (): void {
69
65
  await devFileTask?.click();
70
66
  const firstExpectedQuickPick: QuickPickItem | undefined = await input.findQuickPick('1. This command from the devfile');
71
67
  const secondExpectedQuickPick: QuickPickItem | undefined = await input.findQuickPick('2. This command from the parent');
72
- expect(firstExpectedQuickPick).not.eqls(undefined);
73
- expect(secondExpectedQuickPick).not.eqls(undefined);
68
+ expect(firstExpectedQuickPick).not.undefined;
69
+ expect(secondExpectedQuickPick).not.undefined;
74
70
  });
75
71
 
76
72
  test('Check expected containers in the parent POD', function (): void {
77
73
  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}\'`;
78
74
 
79
- podName = executeArbitraryShellScript(getPodNameCommand);
80
- const containerNames: string = executeArbitraryShellScript(
75
+ podName = shellExecutor.executeArbitraryShellScript(getPodNameCommand);
76
+ const containerNames: string = shellExecutor.executeArbitraryShellScript(
81
77
  `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.containers[*].name}\'`
82
78
  );
83
79
  expect(containerNames).contain('tools');
84
80
  expect(containerNames).contains('che-gateway');
85
81
 
86
- const initContainerName: string = executeArbitraryShellScript(
82
+ const initContainerName: string = shellExecutor.executeArbitraryShellScript(
87
83
  `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.initContainers[].name}\'`
88
84
  );
89
85
  expect(initContainerName).contain('che-code-injector');
90
86
  });
91
87
 
92
88
  test('Check expected environment variables', function (): void {
93
- const envList: string = executeArbitraryShellScript(
89
+ const envList: string = shellExecutor.executeArbitraryShellScript(
94
90
  `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} exec -i ${podName} -c tools -- sh -c env`
95
91
  );
96
- expect(envList).contain('DEVFILE_ENV_VAR=true');
97
- expect(envList).contain('PARENT_ENV_VAR=true');
92
+ expect(envList).contain('DEVFILE_ENV_VAR=true').and.contain('PARENT_ENV_VAR=true');
98
93
  });
94
+ loginTests.logoutFromChe();
99
95
  });
package/tests-library/ProjectAndFileTests.ts CHANGED
@@ -15,6 +15,7 @@ import { CLASSES } from '../configs/inversify.types';
15
15
  import { Logger } from '../utils/Logger';
16
16
  import { TIMEOUT_CONSTANTS } from '../constants/TIMEOUT_CONSTANTS';
17
17
  import { CheCodeLocatorLoader } from '../pageobjects/ide/CheCodeLocatorLoader';
18
+ import { Workbench } from 'monaco-page-objects';
18
19
 
19
20
  @injectable()
20
21
  export class ProjectAndFileTests {
@@ -43,7 +44,8 @@ export class ProjectAndFileTests {
43
44
 
44
45
  async performTrustAuthorDialog(): Promise<void> {
45
46
  Logger.debug();
46
-
47
+ // sometimes the trust dialog does not appear at first time, for avoiding this problem we send click event for activating
48
+ await new Workbench().click();
47
49
  await this.driverHelper.waitAndClick(
48
50
  this.cheCodeLocatorLoader.webCheCodeLocators.WelcomeContent.button,
49
51
  TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
package/utils/ShellExecutor.ts CHANGED
@@ -10,6 +10,7 @@
10
10
  import { exec, ShellString } from 'shelljs';
11
11
  import { Logger } from './Logger';
12
12
  import { injectable } from 'inversify';
13
+ import { assert } from 'chai';
13
14
 
14
15
  @injectable()
15
16
  export class ShellExecutor {
@@ -25,4 +26,12 @@ export class ShellExecutor {
25
26
  Logger.debug(command);
26
27
  return exec(command);
27
28
  }
29
+ executeArbitraryShellScript(command: string): string {
30
+ Logger.debug(command);
31
+ const output: ShellString = this.executeCommand(command);
32
+ if (output.stderr.length > 0) {
33
+ assert.fail(output.stderr);
34
+ }
35
+ return output.stdout;
36
+ }
28
37
  }