@eclipse-che/che-e2e 7.105.0-next-1999bed → 7.105.0-next-ccfb961
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/OcpImportFromGitPage.js +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +37 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/package.json +1 -1
- package/pageobjects/openshift/OcpImportFromGitPage.ts +1 -1
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +48 -1
|
@@ -79,7 +79,7 @@ OcpImportFromGitPage.HIDE_ADVANCED_GIT_OPTIONS = selenium_webdriver_1.By.xpath('
|
|
|
79
79
|
OcpImportFromGitPage.GIT_REFERENCE_INPUT = selenium_webdriver_1.By.id('form-input-git-ref-field');
|
|
80
80
|
OcpImportFromGitPage.EDIT_IMPORT_STRATEGY_LINK = selenium_webdriver_1.By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button');
|
|
81
81
|
OcpImportFromGitPage.BUILDER_IMAGE_STRATEGY_ITEM = selenium_webdriver_1.By.xpath('//*[text()="Builder Image"]//parent::div//parent::div');
|
|
82
|
-
OcpImportFromGitPage.ADD_LABEL_LINK = selenium_webdriver_1.By.xpath('//button[text()="Labels"]');
|
|
82
|
+
OcpImportFromGitPage.ADD_LABEL_LINK = selenium_webdriver_1.By.xpath('//button[text()="Labels" or .//span[text()="Labels"]]');
|
|
83
83
|
OcpImportFromGitPage.ADD_LABEL_INPUT = selenium_webdriver_1.By.id('form-selector-labels-field');
|
|
84
84
|
OcpImportFromGitPage.SUBMIT_BUTTON = selenium_webdriver_1.By.xpath('//*[@data-test-id="submit-button"]');
|
|
85
85
|
OcpImportFromGitPage = OcpImportFromGitPage_1 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OcpImportFromGitPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpImportFromGitPage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OcpImportFromGitPage.js","sourceRoot":"","sources":["../../../pageobjects/openshift/OcpImportFromGitPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/** *******************************************************************
|
|
3
|
-
* copyright (c) 2019-
|
|
3
|
+
* copyright (c) 2019-2025 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -18,10 +18,12 @@ const StringUtil_1 = require("../../utils/StringUtil");
|
|
|
18
18
|
const BASE_TEST_CONSTANTS_1 = require("../../constants/BASE_TEST_CONSTANTS");
|
|
19
19
|
const TIMEOUT_CONSTANTS_1 = require("../../constants/TIMEOUT_CONSTANTS");
|
|
20
20
|
const Logger_1 = require("../../utils/Logger");
|
|
21
|
+
const compare_versions_1 = require("compare-versions");
|
|
21
22
|
suite(`DevConsole Integration ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function () {
|
|
22
23
|
let ocpImportPage;
|
|
23
24
|
let ocpApplicationPage;
|
|
24
25
|
let parentGUID = '';
|
|
26
|
+
let developerPerspectiveWasEnabled = false;
|
|
25
27
|
const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
|
|
26
28
|
const dashboard = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Dashboard);
|
|
27
29
|
const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
|
|
@@ -45,6 +47,27 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_E
|
|
|
45
47
|
}
|
|
46
48
|
kubernetesCommandLineToolsExecutor.createProject(projectName);
|
|
47
49
|
});
|
|
50
|
+
// configure Developer perspective for OCP 4.19+
|
|
51
|
+
suiteSetup('Configure Developer perspective for OCP 4.19+', function () {
|
|
52
|
+
if (BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.OCP_VERSION && (0, compare_versions_1.satisfies)(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.OCP_VERSION, '>=4.19')) {
|
|
53
|
+
// check current state
|
|
54
|
+
const checkState = shellExecutor.executeCommand('oc get console.operator.openshift.io/cluster -o jsonpath="{.spec.customization.perspectives[?(@.id==\'dev\')].visibility.state}" 2>/dev/null || echo "notfound"');
|
|
55
|
+
if (checkState.stdout.trim() === 'Enabled') {
|
|
56
|
+
Logger_1.Logger.info('Developer perspective already enabled');
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const enableResult = shellExecutor.executeCommand('oc patch consoles.operator.openshift.io cluster --type=merge -p \'{"spec":{"customization":{"perspectives":[{"id":"dev","visibility":{"state":"Enabled"}}]}}}\'');
|
|
60
|
+
if (enableResult.code === 0) {
|
|
61
|
+
developerPerspectiveWasEnabled = true;
|
|
62
|
+
Logger_1.Logger.info('Developer perspective enabled - waiting 30s to take effect');
|
|
63
|
+
shellExecutor.executeCommand('sleep 30');
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
Logger_1.Logger.error(`Failed to enable developer perspective: ${enableResult.stderr}`);
|
|
67
|
+
throw new Error(`Failed to enable developer perspective: ${enableResult.stderr}`);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
});
|
|
48
71
|
loginTests.loginIntoOcpConsole();
|
|
49
72
|
test('Select test project and Developer role on DevConsole', async function () {
|
|
50
73
|
parentGUID = await browserTabsUtil.getCurrentWindowHandle();
|
|
@@ -110,6 +133,19 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_E
|
|
|
110
133
|
Logger_1.Logger.error(`Cannot delete the project: ${err}`);
|
|
111
134
|
}
|
|
112
135
|
});
|
|
136
|
+
// restore original console configuration
|
|
137
|
+
suiteTeardown('Restore Developer perspective configuration', function () {
|
|
138
|
+
if (BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.OCP_VERSION && (0, compare_versions_1.satisfies)(BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.OCP_VERSION, '>=4.19') && developerPerspectiveWasEnabled) {
|
|
139
|
+
Logger_1.Logger.info('Restoring Developer perspective to disabled state');
|
|
140
|
+
const restoreResult = shellExecutor.executeCommand('oc patch consoles.operator.openshift.io cluster --type=merge -p \'{"spec":{"customization":{"perspectives":[{"id":"dev","visibility":{"state":"Disabled"}}]}}}\'');
|
|
141
|
+
if (restoreResult.code === 0) {
|
|
142
|
+
Logger_1.Logger.info('Developer perspective restored to disabled');
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
Logger_1.Logger.warn(`Failed to restore developer perspective: ${restoreResult.stderr}`);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
});
|
|
113
149
|
suiteTeardown('Unregister running workspace', function () {
|
|
114
150
|
(0, MochaHooks_1.registerRunningWorkspace)('');
|
|
115
151
|
});
|
|
@@ -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;
|
|
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
|
@@ -24,7 +24,7 @@ export class OcpImportFromGitPage {
|
|
|
24
24
|
private static readonly GIT_REFERENCE_INPUT: By = By.id('form-input-git-ref-field');
|
|
25
25
|
private static readonly EDIT_IMPORT_STRATEGY_LINK: By = By.xpath('//*[text()="Edit Import Strategy"]//ancestor::button');
|
|
26
26
|
private static readonly BUILDER_IMAGE_STRATEGY_ITEM: By = By.xpath('//*[text()="Builder Image"]//parent::div//parent::div');
|
|
27
|
-
private static readonly ADD_LABEL_LINK: By = By.xpath('//button[text()="Labels"]');
|
|
27
|
+
private static readonly ADD_LABEL_LINK: By = By.xpath('//button[text()="Labels" or .//span[text()="Labels"]]');
|
|
28
28
|
private static readonly ADD_LABEL_INPUT: By = By.id('form-selector-labels-field');
|
|
29
29
|
private static readonly SUBMIT_BUTTON: By = By.xpath('//*[@data-test-id="submit-button"]');
|
|
30
30
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** *******************************************************************
|
|
2
|
-
* copyright (c) 2019-
|
|
2
|
+
* copyright (c) 2019-2025 Red Hat, Inc.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made
|
|
5
5
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -29,11 +29,13 @@ import { Logger } from '../../utils/Logger';
|
|
|
29
29
|
import { ShellExecutor } from '../../utils/ShellExecutor';
|
|
30
30
|
import { ShellString } from 'shelljs';
|
|
31
31
|
import { CreateWorkspace } from '../../pageobjects/dashboard/CreateWorkspace';
|
|
32
|
+
import { satisfies } from 'compare-versions';
|
|
32
33
|
|
|
33
34
|
suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
|
|
34
35
|
let ocpImportPage: OcpImportFromGitPage;
|
|
35
36
|
let ocpApplicationPage: OcpApplicationPage;
|
|
36
37
|
let parentGUID: string = '';
|
|
38
|
+
let developerPerspectiveWasEnabled: boolean = false;
|
|
37
39
|
const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
|
|
38
40
|
const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
|
|
39
41
|
const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
|
|
@@ -62,6 +64,34 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function
|
|
|
62
64
|
kubernetesCommandLineToolsExecutor.createProject(projectName);
|
|
63
65
|
});
|
|
64
66
|
|
|
67
|
+
// configure Developer perspective for OCP 4.19+
|
|
68
|
+
suiteSetup('Configure Developer perspective for OCP 4.19+', function (): void {
|
|
69
|
+
if (BASE_TEST_CONSTANTS.OCP_VERSION && satisfies(BASE_TEST_CONSTANTS.OCP_VERSION, '>=4.19')) {
|
|
70
|
+
// check current state
|
|
71
|
+
const checkState: ShellString = shellExecutor.executeCommand(
|
|
72
|
+
'oc get console.operator.openshift.io/cluster -o jsonpath="{.spec.customization.perspectives[?(@.id==\'dev\')].visibility.state}" 2>/dev/null || echo "notfound"'
|
|
73
|
+
);
|
|
74
|
+
|
|
75
|
+
if (checkState.stdout.trim() === 'Enabled') {
|
|
76
|
+
Logger.info('Developer perspective already enabled');
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
const enableResult: ShellString = shellExecutor.executeCommand(
|
|
81
|
+
'oc patch consoles.operator.openshift.io cluster --type=merge -p \'{"spec":{"customization":{"perspectives":[{"id":"dev","visibility":{"state":"Enabled"}}]}}}\''
|
|
82
|
+
);
|
|
83
|
+
|
|
84
|
+
if (enableResult.code === 0) {
|
|
85
|
+
developerPerspectiveWasEnabled = true;
|
|
86
|
+
Logger.info('Developer perspective enabled - waiting 30s to take effect');
|
|
87
|
+
shellExecutor.executeCommand('sleep 30');
|
|
88
|
+
} else {
|
|
89
|
+
Logger.error(`Failed to enable developer perspective: ${enableResult.stderr}`);
|
|
90
|
+
throw new Error(`Failed to enable developer perspective: ${enableResult.stderr}`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
|
|
65
95
|
loginTests.loginIntoOcpConsole();
|
|
66
96
|
|
|
67
97
|
test('Select test project and Developer role on DevConsole', async function (): Promise<void> {
|
|
@@ -143,6 +173,23 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function
|
|
|
143
173
|
}
|
|
144
174
|
});
|
|
145
175
|
|
|
176
|
+
// restore original console configuration
|
|
177
|
+
suiteTeardown('Restore Developer perspective configuration', function (): void {
|
|
178
|
+
if (BASE_TEST_CONSTANTS.OCP_VERSION && satisfies(BASE_TEST_CONSTANTS.OCP_VERSION, '>=4.19') && developerPerspectiveWasEnabled) {
|
|
179
|
+
Logger.info('Restoring Developer perspective to disabled state');
|
|
180
|
+
|
|
181
|
+
const restoreResult: ShellString = shellExecutor.executeCommand(
|
|
182
|
+
'oc patch consoles.operator.openshift.io cluster --type=merge -p \'{"spec":{"customization":{"perspectives":[{"id":"dev","visibility":{"state":"Disabled"}}]}}}\''
|
|
183
|
+
);
|
|
184
|
+
|
|
185
|
+
if (restoreResult.code === 0) {
|
|
186
|
+
Logger.info('Developer perspective restored to disabled');
|
|
187
|
+
} else {
|
|
188
|
+
Logger.warn(`Failed to restore developer perspective: ${restoreResult.stderr}`);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
|
|
146
193
|
suiteTeardown('Unregister running workspace', function (): void {
|
|
147
194
|
registerRunningWorkspace('');
|
|
148
195
|
});
|