@eclipse-che/che-e2e 7.94.0-next-8cb40db → 7.94.0-next-51a833a
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/git-providers/OauthPage.js +20 -0
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +2 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/miscellaneous/UserSecretsInWorkspace.spec.js +2 -2
- package/dist/specs/miscellaneous/UserSecretsInWorkspace.spec.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/package.json +1 -1
- package/pageobjects/git-providers/OauthPage.ts +29 -0
- package/specs/api/EmptyWorkspaceAPI.spec.ts +3 -2
- package/specs/miscellaneous/UserSecretsInWorkspace.spec.ts +2 -2
- package/utils/DevWorkspaceConfigurationHelper.ts +0 -1
|
@@ -60,6 +60,8 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
60
60
|
OauthPage_1.SUBMIT_BUTTON = selenium_webdriver_1.By.id('login-submit');
|
|
61
61
|
OauthPage_1.APPROVE_BUTTON = selenium_webdriver_1.By.xpath('//button[@value="approve"]');
|
|
62
62
|
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.xpath('//button[@value="deny"]');
|
|
63
|
+
OauthPage_1.ENABLE_TWO_STEP_VERIFICATION_FORM = selenium_webdriver_1.By.id('ProductHeading');
|
|
64
|
+
OauthPage_1.DENY_TWO_STEP_VERIFICATION = selenium_webdriver_1.By.id('mfa-promote-dismiss');
|
|
63
65
|
}
|
|
64
66
|
break;
|
|
65
67
|
case FACTORY_TEST_CONSTANTS_1.GitProviderType.GITLAB:
|
|
@@ -135,6 +137,18 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
135
137
|
Logger_1.Logger.debug();
|
|
136
138
|
await this.driverHelper.waitDisappearance(OauthPage_1.APPROVE_BUTTON);
|
|
137
139
|
}
|
|
140
|
+
async waitVisibilityTwoStepVerificationForm() {
|
|
141
|
+
Logger_1.Logger.debug();
|
|
142
|
+
return this.driverHelper.waitVisibilityBoolean(OauthPage_1.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
143
|
+
}
|
|
144
|
+
async clickOnDenyTwoStepVerification() {
|
|
145
|
+
Logger_1.Logger.debug();
|
|
146
|
+
await this.driverHelper.waitAndClick(OauthPage_1.DENY_TWO_STEP_VERIFICATION);
|
|
147
|
+
}
|
|
148
|
+
async waitDisappearanceTwoStepVerificationForm() {
|
|
149
|
+
Logger_1.Logger.debug();
|
|
150
|
+
await this.driverHelper.waitDisappearance(OauthPage_1.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
151
|
+
}
|
|
138
152
|
async login() {
|
|
139
153
|
Logger_1.Logger.debug();
|
|
140
154
|
await this.waitLoginPage();
|
|
@@ -149,6 +163,12 @@ let OauthPage = OauthPage_1 = class OauthPage {
|
|
|
149
163
|
await this.clickOnNotRememberCredentialsButton();
|
|
150
164
|
}
|
|
151
165
|
await this.waitClosingLoginPage();
|
|
166
|
+
if (FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === FACTORY_TEST_CONSTANTS_1.GitProviderType.BITBUCKET_CLOUD_OAUTH2) {
|
|
167
|
+
if (await this.waitVisibilityTwoStepVerificationForm()) {
|
|
168
|
+
await this.clickOnDenyTwoStepVerification();
|
|
169
|
+
await this.waitDisappearanceTwoStepVerificationForm();
|
|
170
|
+
}
|
|
171
|
+
}
|
|
152
172
|
}
|
|
153
173
|
async confirmAccess() {
|
|
154
174
|
Logger_1.Logger.debug();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,2DAAwC;AACxC,mEAAwD;AACxD,2DAAwD;AACxD,+CAA4C;AAC5C,yEAAsE;AACtE,mFAAiG;AACjG,qEAAkE;AAG3D,IAAM,SAAS,iBAAf,MAAM,SAAS;
|
|
1
|
+
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,8 @@ suite('Empty workspace API test', function () {
|
|
|
23
23
|
const devfileContent = 'schemaVersion: 2.2.0\n' + 'metadata:\n' + ` name: ${workspaceName}\n`;
|
|
24
24
|
const editorContent = '';
|
|
25
25
|
devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper_1.DevWorkspaceConfigurationHelper({
|
|
26
|
-
devfileContent,
|
|
26
|
+
devfileContent,
|
|
27
|
+
editorContent
|
|
27
28
|
});
|
|
28
29
|
devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
|
|
29
30
|
devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmptyWorkspaceAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/EmptyWorkspaceAPI.spec.ts"],"names":[],"mappings":";;AAUA,+BAA8B;AAE9B,uDAAoD;AACpD,iGAA8F;AAE9F,2EAAwE;AACxE,6EAA0E;AAC1E,qEAA8D;AAC9D,mEAAwD;AAExD,KAAK,CAAC,0BAA0B,EAAE;IACjC,2BAA2B;IAC3B,MAAM,SAAS,GAAuB,uCAAkB,CAAC,qBAAqB,CAAC;IAC/E,IAAI,iBAAyB,CAAC;IAC9B,IAAI,gBAAwB,CAAC;IAC7B,IAAI,+BAAgE,CAAC;IACrE,IAAI,kCAAsE,CAAC;IAC3E,IAAI,cAA8B,CAAC;IACnC,IAAI,gBAAoC,CAAC;IACzC,IAAI,iBAAoC,CAAC;IAEzC,MAAM,aAAa,GAAW,6CAA6C,CAAC;IAE5E,UAAU,CAAC,yCAAyC,yCAAmB,CAAC,gBAAgB,EAAE,EAAE,KAAK;QAChG,MAAM,aAAa,GAAW,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAW,wBAAwB,GAAG,aAAa,GAAG,WAAW,aAAa,IAAI,CAAC;QACvG,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"EmptyWorkspaceAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/EmptyWorkspaceAPI.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ suite('"User secrets in workspace" test', function () {
|
|
|
25
25
|
let kubernetesCommandLineToolsExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor);
|
|
26
26
|
const shellExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ShellExecutor);
|
|
27
27
|
const testWorkspaceUtil = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.WorkspaceUtil);
|
|
28
|
-
const userProject = OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME +
|
|
28
|
+
const userProject = OAUTH_CONSTANTS_1.OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-devspaces';
|
|
29
29
|
const stackName = 'Empty Workspace';
|
|
30
30
|
const mountEnvCommand = `echo '
|
|
31
31
|
apiVersion: v1
|
|
@@ -56,7 +56,7 @@ type: Opaque
|
|
|
56
56
|
(0, MochaHooks_1.registerRunningWorkspace)(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
|
|
57
57
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
58
58
|
});
|
|
59
|
-
test('Check that mounted secret exists in envs list',
|
|
59
|
+
test('Check that mounted secret exists in envs list', function () {
|
|
60
60
|
kubernetesCommandLineToolsExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor);
|
|
61
61
|
kubernetesCommandLineToolsExecutor.workspaceName = WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName();
|
|
62
62
|
kubernetesCommandLineToolsExecutor.loginToOcp();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserSecretsInWorkspace.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/UserSecretsInWorkspace.spec.ts"],"names":[],"mappings":";;AAAA;;;;;;;;wEAQwE;AACxE,qEAA8D;AAC9D,mEAA+D;AAC/D,uFAAoF;AAGpF,8CAAyD;AAIzD,qCAAsC;AACtC,+BAA8B;AAG9B,qEAAkE;AAElE,KAAK,CAAC,kCAAkC,EAAE;IACzC,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;IACxG,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,SAAS,GAAc,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;IAEnF,IAAI,kCAAkC,GAAuC,+BAAY,CAAC,GAAG,CAC5F,yBAAO,CAAC,kCAAkC,CAC1C,CAAC;IACF,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,WAAW,GAAW,iCAAe,CAAC,wBAAwB,GAAG,YAAY,CAAC;IACpF,MAAM,SAAS,GAAW,iBAAiB,CAAC;IAE5C,MAAM,eAAe,GAAW;;;;;;;;;;;;;kBAaf,CAAC;IAElB,UAAU,CAAC,wDAAwD,EAAE;QACpE,kCAAkC,CAAC,UAAU,EAAE,CAAC;QAChD,aAAa,CAAC,cAAc,CAAC,aAAa,GAAG,WAAW,CAAC,CAAC;QAC1D,aAAa,CAAC,cAAc,CAAC,gCAAgC,CAAC,CAAC;QAE/D,IAAA,qBAAW,EAAC,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,OAAO,EAAE,KAAK;QACxB,MAAM,UAAU,CAAC,YAAY,EAAE,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wCAAwC,SAAS,+BAA+B,EAAE,KAAK;QAC3F,MAAM,sBAAsB,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAC/D,MAAM,sBAAsB,CAAC,mCAAmC,EAAE,CAAC;QAEnE,IAAA,qCAAwB,EAAC,+CAAsB,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACpE,MAAM,mBAAmB,CAAC,sCAAsC,EAAE,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+CAA+C,EAAE
|
|
1
|
+
{"version":3,"file":"UserSecretsInWorkspace.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/UserSecretsInWorkspace.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;
|
|
1
|
+
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -24,6 +24,8 @@ export class OauthPage {
|
|
|
24
24
|
private static APPROVE_BUTTON: By;
|
|
25
25
|
private static DENY_ACCESS_BUTTON: By;
|
|
26
26
|
private static DENY_SAVE_CREDENTIALS_BUTTON: By;
|
|
27
|
+
private static ENABLE_TWO_STEP_VERIFICATION_FORM: By;
|
|
28
|
+
private static DENY_TWO_STEP_VERIFICATION: By;
|
|
27
29
|
|
|
28
30
|
constructor(
|
|
29
31
|
@inject(CLASSES.DriverHelper)
|
|
@@ -55,6 +57,8 @@ export class OauthPage {
|
|
|
55
57
|
OauthPage.SUBMIT_BUTTON = By.id('login-submit');
|
|
56
58
|
OauthPage.APPROVE_BUTTON = By.xpath('//button[@value="approve"]');
|
|
57
59
|
OauthPage.DENY_ACCESS_BUTTON = By.xpath('//button[@value="deny"]');
|
|
60
|
+
OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM = By.id('ProductHeading');
|
|
61
|
+
OauthPage.DENY_TWO_STEP_VERIFICATION = By.id('mfa-promote-dismiss');
|
|
58
62
|
}
|
|
59
63
|
break;
|
|
60
64
|
case GitProviderType.GITLAB:
|
|
@@ -153,6 +157,24 @@ export class OauthPage {
|
|
|
153
157
|
await this.driverHelper.waitDisappearance(OauthPage.APPROVE_BUTTON);
|
|
154
158
|
}
|
|
155
159
|
|
|
160
|
+
async waitVisibilityTwoStepVerificationForm(): Promise<boolean> {
|
|
161
|
+
Logger.debug();
|
|
162
|
+
|
|
163
|
+
return this.driverHelper.waitVisibilityBoolean(OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
async clickOnDenyTwoStepVerification(): Promise<void> {
|
|
167
|
+
Logger.debug();
|
|
168
|
+
|
|
169
|
+
await this.driverHelper.waitAndClick(OauthPage.DENY_TWO_STEP_VERIFICATION);
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
async waitDisappearanceTwoStepVerificationForm(): Promise<void> {
|
|
173
|
+
Logger.debug();
|
|
174
|
+
|
|
175
|
+
await this.driverHelper.waitDisappearance(OauthPage.ENABLE_TWO_STEP_VERIFICATION_FORM);
|
|
176
|
+
}
|
|
177
|
+
|
|
156
178
|
async login(): Promise<void> {
|
|
157
179
|
Logger.debug();
|
|
158
180
|
|
|
@@ -170,6 +192,13 @@ export class OauthPage {
|
|
|
170
192
|
await this.clickOnNotRememberCredentialsButton();
|
|
171
193
|
}
|
|
172
194
|
await this.waitClosingLoginPage();
|
|
195
|
+
|
|
196
|
+
if (FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.BITBUCKET_CLOUD_OAUTH2) {
|
|
197
|
+
if (await this.waitVisibilityTwoStepVerificationForm()) {
|
|
198
|
+
await this.clickOnDenyTwoStepVerification();
|
|
199
|
+
await this.waitDisappearanceTwoStepVerificationForm();
|
|
200
|
+
}
|
|
201
|
+
}
|
|
173
202
|
}
|
|
174
203
|
|
|
175
204
|
async confirmAccess(): Promise<void> {
|
|
@@ -34,10 +34,11 @@ suite('Empty workspace API test', function (): void {
|
|
|
34
34
|
suiteSetup(`Create empty workspace with OC client ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, async function (): Promise<void> {
|
|
35
35
|
const workspaceName: string = 'empty-' + Math.floor(Math.random() * 1000);
|
|
36
36
|
const devfileContent: string = 'schemaVersion: 2.2.0\n' + 'metadata:\n' + ` name: ${workspaceName}\n`;
|
|
37
|
-
const editorContent:string='';
|
|
37
|
+
const editorContent: string = '';
|
|
38
38
|
|
|
39
39
|
devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
|
|
40
|
-
devfileContent,
|
|
40
|
+
devfileContent,
|
|
41
|
+
editorContent
|
|
41
42
|
});
|
|
42
43
|
devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
|
|
43
44
|
devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
|
|
@@ -34,7 +34,7 @@ suite('"User secrets in workspace" test', function (): void {
|
|
|
34
34
|
);
|
|
35
35
|
const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
|
|
36
36
|
const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
|
|
37
|
-
const userProject: string = OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME +
|
|
37
|
+
const userProject: string = OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-devspaces';
|
|
38
38
|
const stackName: string = 'Empty Workspace';
|
|
39
39
|
|
|
40
40
|
const mountEnvCommand: string = `echo '
|
|
@@ -72,7 +72,7 @@ type: Opaque
|
|
|
72
72
|
await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
|
|
73
73
|
});
|
|
74
74
|
|
|
75
|
-
test('Check that mounted secret exists in envs list',
|
|
75
|
+
test('Check that mounted secret exists in envs list', function (): void {
|
|
76
76
|
kubernetesCommandLineToolsExecutor = e2eContainer.get(CLASSES.KubernetesCommandLineToolsExecutor);
|
|
77
77
|
kubernetesCommandLineToolsExecutor.workspaceName = WorkspaceHandlingTests.getWorkspaceName();
|
|
78
78
|
kubernetesCommandLineToolsExecutor.loginToOcp();
|
|
@@ -20,7 +20,6 @@ import { IContextParams } from './IContextParams';
|
|
|
20
20
|
import { e2eContainer } from '../configs/inversify.config';
|
|
21
21
|
import { CLASSES, EXTERNAL_CLASSES } from '../configs/inversify.types';
|
|
22
22
|
import getDecorators from 'inversify-inject-decorators';
|
|
23
|
-
import {DevfilesHelper} from "./DevfilesHelper";
|
|
24
23
|
|
|
25
24
|
const { lazyInject } = getDecorators(e2eContainer);
|
|
26
25
|
|