@eclipse-che/che-e2e 7.74.1-dev-2e6c485 → 7.74.1-dev-85d287b

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 (7) 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/package.json +1 -1
  6. package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +6 -0
  7. package/pageobjects/login/openshift/RedHatLoginPage.ts +14 -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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-che/che-e2e",
3
- "version": "7.74.1-dev-2e6c485",
3
+ "version": "7.74.1-dev-85d287b",
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