@eclipse-che/che-e2e 7.117.0-next-a349746 → 7.117.0-next-0539715
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/dist/pageobjects/openshift/OcpMainPage.js +15 -1
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +3 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/package.json +1 -1
- package/pageobjects/openshift/OcpMainPage.ts +16 -1
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +6 -1
|
@@ -61,7 +61,7 @@ let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
|
61
61
|
}
|
|
62
62
|
async selectImportFromGitMethod() {
|
|
63
63
|
Logger_1.Logger.debug();
|
|
64
|
-
await this.driverHelper.waitAndClick(OcpMainPage_1.IMPORT_FROM_GIT_ITEM, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.
|
|
64
|
+
await this.driverHelper.waitAndClick(OcpMainPage_1.IMPORT_FROM_GIT_ITEM, TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
|
|
65
65
|
return inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.OcpImportFromGitPage);
|
|
66
66
|
}
|
|
67
67
|
async openImportFromGitPage() {
|
|
@@ -69,6 +69,20 @@ let OcpMainPage = OcpMainPage_1 = class OcpMainPage {
|
|
|
69
69
|
await this.clickAddToProjectButton();
|
|
70
70
|
return await this.selectImportFromGitMethod();
|
|
71
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* prefer Dev Console Add → Import from Git; if that fails , open the import route directly.
|
|
74
|
+
*/
|
|
75
|
+
async openImportFromGitPageWithFallback(importProjectUrl) {
|
|
76
|
+
Logger_1.Logger.debug();
|
|
77
|
+
try {
|
|
78
|
+
return await this.openImportFromGitPage();
|
|
79
|
+
}
|
|
80
|
+
catch (err) {
|
|
81
|
+
Logger_1.Logger.warn(`Import from git via UI failed, navigating to ${importProjectUrl}: ${err}`);
|
|
82
|
+
await this.browserTabsUtil.navigateTo(importProjectUrl);
|
|
83
|
+
return inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.OcpImportFromGitPage);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
72
86
|
async selectProject(projectName) {
|
|
73
87
|
Logger_1.Logger.debug();
|
|
74
88
|
await this.driverHelper.waitAndClick(OcpMainPage_1.SELECT_PROJECT_DROPDOWN);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpMainPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpMainPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,mEAAwD;AACxD,2DAAwC;AACxC,+CAA4C;AAC5C,yEAAsE;AAEtE,qEAA8D;AAC9D,iEAA8D;AAC9D,6EAA0E;AAC1E,uDAA6C;AAGtC,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAavB,YAEkB,YAA0B,EAE1B,eAAgC;QAFhC,iBAAY,GAAZ,YAAY,CAAc;QAE1B,oBAAe,GAAf,eAAe,CAAiB;IAC/C,CAAC;IAEJ,KAAK,CAAC,gBAAgB;QACrB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,aAAW,CAAC,gBAAgB,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IACvH,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC5B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,kBAAkB,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC5B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,UAAU,EAAE,qCAAiB,CAAC,6BAA6B,CAAC,CAAC;IAC/G,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC9B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAW,CAAC,oBAAoB,EAAE,qCAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"OcpMainPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpMainPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,8 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_E
|
|
|
38
38
|
const gitImportReference = 'pipeline';
|
|
39
39
|
const projectLabel = 'app.openshift.io/runtime=spring';
|
|
40
40
|
const projectName = 'devconsole-integration-test';
|
|
41
|
+
const openshiftConsoleUrl = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME(), 'console-openshift-console');
|
|
42
|
+
const importProjectUrl = `${openshiftConsoleUrl}/import/ns/${projectName}`;
|
|
41
43
|
suiteSetup('Create new empty project using ocp', function () {
|
|
42
44
|
kubernetesCommandLineToolsExecutor.loginToOcp();
|
|
43
45
|
// delete the test project on a cluster if it has not been deleted properly in the previous run
|
|
@@ -75,7 +77,7 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_E
|
|
|
75
77
|
await ocpMainPage.selectProject(projectName);
|
|
76
78
|
});
|
|
77
79
|
test('Open import from git project page', async function () {
|
|
78
|
-
ocpImportPage = await ocpMainPage.
|
|
80
|
+
ocpImportPage = await ocpMainPage.openImportFromGitPageWithFallback(importProjectUrl);
|
|
79
81
|
});
|
|
80
82
|
test('Fill and submit import data', async function () {
|
|
81
83
|
ocpApplicationPage = await ocpImportPage.fitAndSubmitConfiguration(gitImportRepo, gitImportReference, projectLabel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevConsoleIntegration.spec.js","sourceRoot":"","sources":["../../../specs/devconsole-intergration/DevConsoleIntegration.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAGxE,8CAAyD;AAEzD,qEAA8D;AAC9D,mEAAwD;AACxD,uFAAoF;AAEpF,+BAA8B;AAI9B,uDAAoD;AAEpD,6EAA0E;AAG1E,yEAAsE;AACtE,+CAA4C;AAI5C,uDAA6C;AAE7C,KAAK,CAAC,0BAA0B,yCAAmB,CAAC,gBAAgB,EAAE,EAAE;IACvE,IAAI,aAAmC,CAAC;IACxC,IAAI,kBAAsC,CAAC;IAC3C,IAAI,UAAU,GAAW,EAAE,CAAC;IAC5B,IAAI,8BAA8B,GAAY,KAAK,CAAC;IACpD,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;IAC/F,MAAM,SAAS,GAAc,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;IACxG,MAAM,aAAa,GAAkB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,aAAa,CAAC,CAAC;IAC7E,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;IACnF,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,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;IAEnF,qBAAqB;IACrB,MAAM,aAAa,GAAW,uDAAuD,CAAC;IACtF,MAAM,kBAAkB,GAAW,UAAU,CAAC;IAC9C,MAAM,YAAY,GAAW,iCAAiC,CAAC;IAC/D,MAAM,WAAW,GAAW,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"DevConsoleIntegration.spec.js","sourceRoot":"","sources":["../../../specs/devconsole-intergration/DevConsoleIntegration.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -72,7 +72,7 @@ export class OcpMainPage {
|
|
|
72
72
|
async selectImportFromGitMethod(): Promise<OcpImportFromGitPage> {
|
|
73
73
|
Logger.debug();
|
|
74
74
|
|
|
75
|
-
await this.driverHelper.waitAndClick(OcpMainPage.IMPORT_FROM_GIT_ITEM, TIMEOUT_CONSTANTS.
|
|
75
|
+
await this.driverHelper.waitAndClick(OcpMainPage.IMPORT_FROM_GIT_ITEM, TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
|
|
76
76
|
return e2eContainer.get(CLASSES.OcpImportFromGitPage);
|
|
77
77
|
}
|
|
78
78
|
|
|
@@ -83,6 +83,21 @@ export class OcpMainPage {
|
|
|
83
83
|
return await this.selectImportFromGitMethod();
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
+
/**
|
|
87
|
+
* prefer Dev Console Add → Import from Git; if that fails , open the import route directly.
|
|
88
|
+
*/
|
|
89
|
+
async openImportFromGitPageWithFallback(importProjectUrl: string): Promise<OcpImportFromGitPage> {
|
|
90
|
+
Logger.debug();
|
|
91
|
+
|
|
92
|
+
try {
|
|
93
|
+
return await this.openImportFromGitPage();
|
|
94
|
+
} catch (err) {
|
|
95
|
+
Logger.warn(`Import from git via UI failed, navigating to ${importProjectUrl}: ${err}`);
|
|
96
|
+
await this.browserTabsUtil.navigateTo(importProjectUrl);
|
|
97
|
+
return e2eContainer.get(CLASSES.OcpImportFromGitPage);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
86
101
|
async selectProject(projectName: string): Promise<void> {
|
|
87
102
|
Logger.debug();
|
|
88
103
|
|
|
@@ -53,6 +53,11 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function
|
|
|
53
53
|
const gitImportReference: string = 'pipeline';
|
|
54
54
|
const projectLabel: string = 'app.openshift.io/runtime=spring';
|
|
55
55
|
const projectName: string = 'devconsole-integration-test';
|
|
56
|
+
const openshiftConsoleUrl: string = BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(
|
|
57
|
+
BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME(),
|
|
58
|
+
'console-openshift-console'
|
|
59
|
+
);
|
|
60
|
+
const importProjectUrl: string = `${openshiftConsoleUrl}/import/ns/${projectName}`;
|
|
56
61
|
|
|
57
62
|
suiteSetup('Create new empty project using ocp', function (): void {
|
|
58
63
|
kubernetesCommandLineToolsExecutor.loginToOcp();
|
|
@@ -101,7 +106,7 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function
|
|
|
101
106
|
});
|
|
102
107
|
|
|
103
108
|
test('Open import from git project page', async function (): Promise<void> {
|
|
104
|
-
ocpImportPage = await ocpMainPage.
|
|
109
|
+
ocpImportPage = await ocpMainPage.openImportFromGitPageWithFallback(importProjectUrl);
|
|
105
110
|
});
|
|
106
111
|
|
|
107
112
|
test('Fill and submit import data', async function (): Promise<void> {
|