@eclipse-che/che-e2e 7.72.0-dev-3dd17c7 → 7.72.0-dev-4dc1021
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/README.md +1 -1
- package/build/dockerfiles/Dockerfile +1 -1
- package/constants/FactoryTestConstants.ts +2 -1
- package/constants/OAuthConstants.ts +1 -0
- package/dist/constants/FactoryTestConstants.js +1 -0
- package/dist/constants/FactoryTestConstants.js.map +1 -1
- package/dist/constants/OAuthConstants.js +1 -0
- package/dist/constants/OAuthConstants.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +67 -33
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +3 -3
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/package.json +2 -2
- package/pageobjects/git-providers/OauthPage.ts +70 -36
- package/specs/factory/RefusedOAuthFactory.spec.ts +1 -1
- package/utils/KubernetesCommandLineToolsExecutor.ts +3 -3
package/README.md
CHANGED
|
@@ -12,7 +12,8 @@ import { BaseTestConstants } from './BaseTestConstants';
|
|
|
12
12
|
export enum GitProviderType {
|
|
13
13
|
GITHUB = 'github',
|
|
14
14
|
GITLAB = 'gitlab',
|
|
15
|
-
BITBUCKET = 'bitbucket'
|
|
15
|
+
BITBUCKET = 'bitbucket',
|
|
16
|
+
AZURE = 'azure'
|
|
16
17
|
}
|
|
17
18
|
|
|
18
19
|
export const FactoryTestConstants: any = {
|
|
@@ -41,6 +41,7 @@ export const OAuthConstants: any = {
|
|
|
41
41
|
|
|
42
42
|
/**
|
|
43
43
|
* For login via github for example on https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com
|
|
44
|
+
* For factory tests
|
|
44
45
|
*/
|
|
45
46
|
TS_SELENIUM_GIT_PROVIDER_OAUTH: process.env.TS_SELENIUM_GIT_PROVIDER_OAUTH === 'true',
|
|
46
47
|
|
|
@@ -16,6 +16,7 @@ var GitProviderType;
|
|
|
16
16
|
GitProviderType["GITHUB"] = "github";
|
|
17
17
|
GitProviderType["GITLAB"] = "gitlab";
|
|
18
18
|
GitProviderType["BITBUCKET"] = "bitbucket";
|
|
19
|
+
GitProviderType["AZURE"] = "azure";
|
|
19
20
|
})(GitProviderType = exports.GitProviderType || (exports.GitProviderType = {}));
|
|
20
21
|
exports.FactoryTestConstants = {
|
|
21
22
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FactoryTestConstants.js","sourceRoot":"","sources":["../../constants/FactoryTestConstants.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,2DAAwD;AAExD,IAAY,
|
|
1
|
+
{"version":3,"file":"FactoryTestConstants.js","sourceRoot":"","sources":["../../constants/FactoryTestConstants.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,2DAAwD;AAExD,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;IACjB,0CAAuB,CAAA;IACvB,kCAAe,CAAA;AACnB,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B;AAEY,QAAA,oBAAoB,GAAQ;IACrC;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,eAAe,CAAC,MAAM;IAExG;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;IAEpF;;OAEG;IACH,uCAAuC,EAAE,OAAO,CAAC,GAAG,CAAC,uCAAuC,KAAK,MAAM;IAEvG;;OAEG;IACH,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,QAAQ;IAEhG;;OAEG;IACH,uBAAuB;QACnB,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,qCAAiB,CAAC,oBAAoB,GAAG,eAAe,GAAG,IAAI,CAAC,gCAAgC,CAAC;IACnJ,CAAC;CACJ,CAAC"}
|
|
@@ -38,6 +38,7 @@ exports.OAuthConstants = {
|
|
|
38
38
|
TS_SELENIUM_K8S_PASSWORD: process.env.TS_SELENIUM_K8S_PASSWORD || '',
|
|
39
39
|
/**
|
|
40
40
|
* For login via github for example on https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com
|
|
41
|
+
* For factory tests
|
|
41
42
|
*/
|
|
42
43
|
TS_SELENIUM_GIT_PROVIDER_OAUTH: process.env.TS_SELENIUM_GIT_PROVIDER_OAUTH === 'true',
|
|
43
44
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OAuthConstants.js","sourceRoot":"","sources":["../../constants/OAuthConstants.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AAC3D,QAAA,cAAc,GAAQ;IAC/B;;;OAGG;IACH,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,MAAM;IAE3F;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;IAEpF;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE
|
|
1
|
+
{"version":3,"file":"OAuthConstants.js","sourceRoot":"","sources":["../../constants/OAuthConstants.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AAC3D,QAAA,cAAc,GAAQ;IAC/B;;;OAGG;IACH,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,MAAM;IAE3F;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;IAEpF;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;;OAGG;IACH,8BAA8B,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,MAAM;IAErF;;OAEG;IACH,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,EAAE;IAEtF;;OAEG;IACH,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,EAAE;CACzF,CAAC"}
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var OauthPage_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.OauthPage = void 0;
|
|
16
17
|
/*********************************************************************
|
|
@@ -30,84 +31,104 @@ const Logger_1 = require("../../utils/Logger");
|
|
|
30
31
|
const TimeoutConstants_1 = require("../../constants/TimeoutConstants");
|
|
31
32
|
const FactoryTestConstants_1 = require("../../constants/FactoryTestConstants");
|
|
32
33
|
const OAuthConstants_1 = require("../../constants/OAuthConstants");
|
|
33
|
-
let OauthPage = class OauthPage {
|
|
34
|
+
let OauthPage = OauthPage_1 = class OauthPage {
|
|
34
35
|
constructor(driverHelper) {
|
|
35
36
|
this.driverHelper = driverHelper;
|
|
36
37
|
switch (FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
|
|
37
38
|
case FactoryTestConstants_1.GitProviderType.BITBUCKET:
|
|
38
39
|
{
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.id('j_username');
|
|
41
|
+
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.id('j_password');
|
|
42
|
+
OauthPage_1.APPROVE_BUTTON = selenium_webdriver_1.By.id('approve');
|
|
43
|
+
OauthPage_1.SUBMIT_BUTTON = selenium_webdriver_1.By.id('submit');
|
|
44
|
+
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.id('deny');
|
|
44
45
|
}
|
|
45
46
|
break;
|
|
46
47
|
case FactoryTestConstants_1.GitProviderType.GITLAB:
|
|
47
48
|
{
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.id('user_login');
|
|
50
|
+
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.id('user_password');
|
|
51
|
+
OauthPage_1.SUBMIT_BUTTON = selenium_webdriver_1.By.xpath('//button[@data-qa-selector="sign_in_button"]');
|
|
52
|
+
OauthPage_1.APPROVE_BUTTON = selenium_webdriver_1.By.xpath('//*[@value="Authorize"]');
|
|
53
|
+
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.xpath('//input[@value="Deny"]');
|
|
53
54
|
}
|
|
54
55
|
break;
|
|
55
56
|
case FactoryTestConstants_1.GitProviderType.GITHUB:
|
|
56
57
|
{
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.id('login_field');
|
|
59
|
+
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.id('password');
|
|
60
|
+
OauthPage_1.APPROVE_BUTTON = selenium_webdriver_1.By.xpath('//*[@id="js-oauth-authorize-btn"]');
|
|
61
|
+
OauthPage_1.SUBMIT_BUTTON = selenium_webdriver_1.By.xpath('//*[@value="Sign in"]');
|
|
62
|
+
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.xpath('//button[contains(., "Cancel")]');
|
|
63
|
+
}
|
|
64
|
+
break;
|
|
65
|
+
case FactoryTestConstants_1.GitProviderType.AZURE:
|
|
66
|
+
{
|
|
67
|
+
OauthPage_1.LOGIN_FORM = selenium_webdriver_1.By.xpath('//input[@type="email"]');
|
|
68
|
+
OauthPage_1.PASSWORD_FORM = selenium_webdriver_1.By.xpath('//input[@type="password"]');
|
|
69
|
+
OauthPage_1.APPROVE_BUTTON = selenium_webdriver_1.By.id('accept-button');
|
|
70
|
+
OauthPage_1.SUBMIT_BUTTON = selenium_webdriver_1.By.xpath('//input[@type="submit"]');
|
|
71
|
+
OauthPage_1.DENY_SAVE_CREDENTIALS_BUTTON = selenium_webdriver_1.By.xpath('//input[@type="button"]');
|
|
72
|
+
OauthPage_1.DENY_ACCESS_BUTTON = selenium_webdriver_1.By.id('deny-button');
|
|
62
73
|
}
|
|
63
74
|
break;
|
|
64
75
|
default: {
|
|
65
|
-
throw new Error(`Invalid git provider. The value should be ${FactoryTestConstants_1.GitProviderType.GITHUB}, ${FactoryTestConstants_1.GitProviderType.GITLAB} or ${FactoryTestConstants_1.GitProviderType.BITBUCKET}`);
|
|
76
|
+
throw new Error(`Invalid git provider. The value should be ${FactoryTestConstants_1.GitProviderType.GITHUB}, ${FactoryTestConstants_1.GitProviderType.GITLAB}, ${FactoryTestConstants_1.GitProviderType.AZURE} or ${FactoryTestConstants_1.GitProviderType.BITBUCKET}`);
|
|
66
77
|
}
|
|
67
78
|
}
|
|
68
79
|
}
|
|
69
80
|
async waitLoginPage() {
|
|
70
81
|
Logger_1.Logger.debug('OauthPage.waitLoginPage');
|
|
71
|
-
await this.driverHelper.waitVisibility(
|
|
82
|
+
await this.driverHelper.waitVisibility(OauthPage_1.LOGIN_FORM, TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3);
|
|
72
83
|
}
|
|
73
84
|
async enterUserName(userName) {
|
|
74
85
|
Logger_1.Logger.debug(`this.enterUserName "${userName}"`);
|
|
75
|
-
await this.driverHelper.enterValue(
|
|
86
|
+
await this.driverHelper.enterValue(OauthPage_1.LOGIN_FORM, userName);
|
|
76
87
|
}
|
|
77
88
|
async enterPassword(password) {
|
|
78
89
|
Logger_1.Logger.debug(`OauthPage.enterPassword`);
|
|
79
|
-
await this.driverHelper.enterValue(
|
|
90
|
+
await this.driverHelper.enterValue(OauthPage_1.PASSWORD_FORM, password);
|
|
80
91
|
}
|
|
81
|
-
async
|
|
92
|
+
async clickOnSubmitButton() {
|
|
82
93
|
Logger_1.Logger.debug('OauthPage.clickOnLoginButton');
|
|
83
|
-
await this.driverHelper.waitAndClick(
|
|
94
|
+
await this.driverHelper.waitAndClick(OauthPage_1.SUBMIT_BUTTON);
|
|
95
|
+
}
|
|
96
|
+
async clickOnNotRememberCredentialsButton() {
|
|
97
|
+
Logger_1.Logger.debug('OauthPage.clickOnNotRememberCredentialsButton');
|
|
98
|
+
await this.driverHelper.waitAndClick(OauthPage_1.DENY_SAVE_CREDENTIALS_BUTTON);
|
|
84
99
|
}
|
|
85
100
|
async waitClosingLoginPage() {
|
|
86
101
|
Logger_1.Logger.debug('OauthPage.waitClosingLoginPage');
|
|
87
|
-
await this.driverHelper.waitDisappearance(
|
|
102
|
+
await this.driverHelper.waitDisappearance(OauthPage_1.PASSWORD_FORM);
|
|
88
103
|
}
|
|
89
104
|
async waitOauthPage() {
|
|
90
105
|
Logger_1.Logger.debug('OauthPage.waitOauthPage');
|
|
91
|
-
await this.driverHelper.waitVisibility(
|
|
106
|
+
await this.driverHelper.waitVisibility(OauthPage_1.APPROVE_BUTTON);
|
|
92
107
|
}
|
|
93
108
|
async clickOnApproveButton() {
|
|
94
109
|
Logger_1.Logger.debug('OauthPage.clickOnApproveButton');
|
|
95
|
-
await this.driverHelper.waitAndClick(
|
|
110
|
+
await this.driverHelper.waitAndClick(OauthPage_1.APPROVE_BUTTON);
|
|
96
111
|
}
|
|
97
112
|
async clickOnDenyAccessButton() {
|
|
98
113
|
Logger_1.Logger.debug('OauthPage.clickOnDenyAccessButton');
|
|
99
|
-
await this.driverHelper.waitAndClick(
|
|
114
|
+
await this.driverHelper.waitAndClick(OauthPage_1.DENY_ACCESS_BUTTON);
|
|
100
115
|
}
|
|
101
116
|
async waitDisappearanceOauthPage() {
|
|
102
117
|
Logger_1.Logger.debug('OauthPage.waitDisappearanceOauthPage');
|
|
103
|
-
await this.driverHelper.waitDisappearance(
|
|
118
|
+
await this.driverHelper.waitDisappearance(OauthPage_1.APPROVE_BUTTON);
|
|
104
119
|
}
|
|
105
120
|
async login() {
|
|
106
121
|
Logger_1.Logger.debug('OauthPage.login');
|
|
107
122
|
await this.waitLoginPage();
|
|
108
123
|
await this.enterUserName(OAuthConstants_1.OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
|
|
124
|
+
if (FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === FactoryTestConstants_1.GitProviderType.AZURE) {
|
|
125
|
+
await this.clickOnSubmitButton();
|
|
126
|
+
}
|
|
109
127
|
await this.enterPassword(OAuthConstants_1.OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
|
|
110
|
-
await this.
|
|
128
|
+
await this.clickOnSubmitButton();
|
|
129
|
+
if (FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === FactoryTestConstants_1.GitProviderType.AZURE) {
|
|
130
|
+
await this.clickOnNotRememberCredentialsButton();
|
|
131
|
+
}
|
|
111
132
|
await this.waitClosingLoginPage();
|
|
112
133
|
}
|
|
113
134
|
async confirmAccess() {
|
|
@@ -118,10 +139,10 @@ let OauthPage = class OauthPage {
|
|
|
118
139
|
}
|
|
119
140
|
catch (e) {
|
|
120
141
|
Logger_1.Logger.debug('OauthPage.confirmAccess - access was not confirmed, retrying to click conformation button');
|
|
121
|
-
// workaround for github oauth conformation page (bot security)
|
|
142
|
+
// workaround for github, azure oauth conformation page (bot security)
|
|
122
143
|
await this.driverHelper.getAction()
|
|
123
144
|
.move({
|
|
124
|
-
origin: await this.driverHelper.waitPresence(
|
|
145
|
+
origin: await this.driverHelper.waitPresence(OauthPage_1.APPROVE_BUTTON)
|
|
125
146
|
})
|
|
126
147
|
.click()
|
|
127
148
|
.perform();
|
|
@@ -130,11 +151,24 @@ let OauthPage = class OauthPage {
|
|
|
130
151
|
}
|
|
131
152
|
async denyAccess() {
|
|
132
153
|
Logger_1.Logger.debug('OauthPage.denyAccess');
|
|
133
|
-
|
|
134
|
-
|
|
154
|
+
try {
|
|
155
|
+
await this.clickOnDenyAccessButton();
|
|
156
|
+
await this.waitDisappearanceOauthPage();
|
|
157
|
+
}
|
|
158
|
+
catch (e) {
|
|
159
|
+
Logger_1.Logger.debug('OauthPage.denyAccess - deny access was not confirmed, retrying to click conformation button');
|
|
160
|
+
// workaround for github, azure oauth conformation page (bot security)
|
|
161
|
+
await this.driverHelper.getAction()
|
|
162
|
+
.move({
|
|
163
|
+
origin: await this.driverHelper.waitPresence(OauthPage_1.DENY_ACCESS_BUTTON)
|
|
164
|
+
})
|
|
165
|
+
.click()
|
|
166
|
+
.perform();
|
|
167
|
+
await this.waitDisappearanceOauthPage();
|
|
168
|
+
}
|
|
135
169
|
}
|
|
136
170
|
};
|
|
137
|
-
OauthPage = __decorate([
|
|
171
|
+
OauthPage = OauthPage_1 = __decorate([
|
|
138
172
|
inversify_1.injectable(),
|
|
139
173
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
140
174
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OauthPage.js","sourceRoot":"","sources":["../../../pageobjects/git-providers/OauthPage.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
51
51
|
test(`Navigate to the ${isPrivateRepo} repository factory URL`, async function () {
|
|
52
52
|
await browserTabsUtil.navigateTo(FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_URL());
|
|
53
53
|
});
|
|
54
|
-
if (
|
|
54
|
+
if (OAuthConstants_1.OAuthConstants.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
|
|
55
55
|
test(`Authorize with a ${FactoryTestConstants_1.FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function () {
|
|
56
56
|
await oauthPage.login();
|
|
57
57
|
await oauthPage.waitOauthPage();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefusedOAuthFactory.spec.js","sourceRoot":"","sources":["../../../specs/factory/RefusedOAuthFactory.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;AAExE,4BAA0B;AAC1B,qEAA8D;AAC9D,6DAe6B;AAC7B,+BAA8B;AAC9B,IAAO,cAAc,GAAG,2BAAK,CAAC,cAAc,CAAC;AAC7C,8CAAyD;AAEzD,mEAAwD;AACxD,uFAAoF;AACpF,qFAAkF;AAGlF,yEAAsE;AACtE,uDAAoD;AACpD,+CAA4C;AAC5C,uEAAoE;AAEpE,mEAAgE;AAChE,yEAAsE;AACtE,+EAA6F;AAE7F,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AACnF,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,mBAAmB,GAAwB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/F,MAAM,kBAAkB,GAAa,IAAI,2CAAoB,EAAE,CAAC,kBAAkB,CAAC;AACnF,MAAM,YAAY,GAAiB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAC;AAC1E,MAAM,UAAU,GAAe,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,UAAU,CAAC,CAAC;AAEpE,KAAK,CAAC,uDAAuD,2CAAoB,CAAC,gCAAgC,iCAAiC,EAAE,KAAK;IACtJ,MAAM,SAAS,GAAc,IAAI,qBAAS,CAAC,YAAY,CAAC,CAAC;IAEzD,IAAI,cAA2B,CAAC;IAChC,IAAI,WAA8B,CAAC;IACnC,IAAI,IAAyB,CAAC;IAC9B,IAAI,cAA2B,CAAC;IAEhC,qBAAqB;IACrB,MAAM,aAAa,GAAW,IAAI,CAAC;IACnC,MAAM,eAAe,GAAW,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;IAClE,MAAM,YAAY,GAAW,UAAU,CAAC;IACxC,MAAM,wBAAwB,GAAW,sBAAsB,2CAAoB,CAAC,mCAAmC,GAAG,CAAC;IAC3H,MAAM,kBAAkB,GAAW,SAAS,CAAC;IAC7C,MAAM,aAAa,GAAW,MAAM,CAAC;IACrC,MAAM,KAAK,GAAW,qCAAiB,CAAC,kCAAkC,CAAC;IAC3E,IAAI,mBAA2B,CAAC;IAChC,MAAM,aAAa,GAAW,2CAAoB,CAAC,uCAAuC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAElH,UAAU,CAAC,YAAY,EAAE,CAAC;IAE1B,IAAI,CAAC,mBAAmB,aAAa,yBAAyB,EAAE,KAAK;QACjE,MAAM,eAAe,CAAC,UAAU,CAAC,2CAAoB,CAAC,uBAAuB,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,IAAI,
|
|
1
|
+
{"version":3,"file":"RefusedOAuthFactory.spec.js","sourceRoot":"","sources":["../../../specs/factory/RefusedOAuthFactory.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,8 +49,8 @@ class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
|
|
|
49
49
|
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: User already logged`);
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
52
|
-
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${
|
|
53
|
-
shelljs_1.exec(`oc login --server=${url} -u=${
|
|
52
|
+
Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME}`);
|
|
53
|
+
shelljs_1.exec(`oc login --server=${url} -u=${OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_USERNAME} -p=${OAuthConstants_1.OAuthConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
@@ -72,7 +72,7 @@ class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
|
|
|
72
72
|
Logger_1.Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
|
|
73
73
|
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
|
|
74
74
|
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
|
|
75
|
-
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${
|
|
75
|
+
ShellExecutor_1.ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${BaseTestConstants_1.BaseTestConstants.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
|
|
76
76
|
}
|
|
77
77
|
applyAndWaitDevWorkspace(yamlConfiguration) {
|
|
78
78
|
if (this.KUBERNETES_COMMAND_LINE_TOOL === APITestConstants_1.KubernetesCommandLineTool.KUBECTL) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkD;AAClD,qCAAkC;AAClC,mDAAgD;AAChD,2CAA6B;AAC7B,oEAA4F;AAC5F,sEAAmE;AACnE,gEAA6D;AAE7D,MAAa,kCAAmC,SAAQ,6BAAa;IAOjE,YAAY,cAAuB,EAAE,UAAmB;QACpD,KAAK,EAAE,CAAC;QAHK,iCAA4B,GAAW,mCAAgB,CAAC,wCAAwC,CAAC;QAI9G,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAe,IAAI,CAAC,aAAa,CAAC;IACtC,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,wDAAwD;IACxD,UAAU;QACN,IAAI,IAAI,CAAC,4BAA4B,KAAK,4CAAyB,CAAC,EAAE,EAAE;YACpE,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACxF,MAAM,GAAG,GAAW,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;gBACvB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;aACrF;iBAAM;gBACH,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-che/che-e2e",
|
|
3
|
-
"version": "7.72.0-dev-
|
|
3
|
+
"version": "7.72.0-dev-4dc1021",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@types/shelljs": "^0.8.11",
|
|
28
28
|
"axios": "^0.25.0",
|
|
29
29
|
"chai": "^4.3.4",
|
|
30
|
-
"chromedriver": "^
|
|
30
|
+
"chromedriver": "^114.0.2",
|
|
31
31
|
"clone-deep": "^4.0.1",
|
|
32
32
|
"mocha": "^9.1.3",
|
|
33
33
|
"monaco-page-objects": "3.1.0",
|
|
@@ -18,40 +18,50 @@ import { OAuthConstants } from '../../constants/OAuthConstants';
|
|
|
18
18
|
|
|
19
19
|
@injectable()
|
|
20
20
|
export class OauthPage {
|
|
21
|
-
private
|
|
22
|
-
private
|
|
23
|
-
private
|
|
24
|
-
private
|
|
25
|
-
private
|
|
21
|
+
private static LOGIN_FORM: By;
|
|
22
|
+
private static PASSWORD_FORM: By;
|
|
23
|
+
private static SUBMIT_BUTTON: By;
|
|
24
|
+
private static APPROVE_BUTTON: By;
|
|
25
|
+
private static DENY_ACCESS_BUTTON: By;
|
|
26
|
+
private static DENY_SAVE_CREDENTIALS_BUTTON: By;
|
|
26
27
|
|
|
27
28
|
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {
|
|
28
29
|
switch (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER) {
|
|
29
30
|
case GitProviderType.BITBUCKET : {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
OauthPage.LOGIN_FORM = By.id('j_username');
|
|
32
|
+
OauthPage.PASSWORD_FORM = By.id('j_password');
|
|
33
|
+
OauthPage.APPROVE_BUTTON = By.id('approve');
|
|
34
|
+
OauthPage.SUBMIT_BUTTON = By.id('submit');
|
|
35
|
+
OauthPage.DENY_ACCESS_BUTTON = By.id('deny');
|
|
35
36
|
}
|
|
36
37
|
break;
|
|
37
38
|
case GitProviderType.GITLAB: {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
OauthPage.LOGIN_FORM = By.id('user_login');
|
|
40
|
+
OauthPage.PASSWORD_FORM = By.id('user_password');
|
|
41
|
+
OauthPage.SUBMIT_BUTTON = By.xpath('//button[@data-qa-selector="sign_in_button"]');
|
|
42
|
+
OauthPage.APPROVE_BUTTON = By.xpath('//*[@value="Authorize"]');
|
|
43
|
+
OauthPage.DENY_ACCESS_BUTTON = By.xpath('//input[@value="Deny"]');
|
|
43
44
|
}
|
|
44
45
|
break;
|
|
45
46
|
case GitProviderType.GITHUB: {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
OauthPage.LOGIN_FORM = By.id('login_field');
|
|
48
|
+
OauthPage.PASSWORD_FORM = By.id('password');
|
|
49
|
+
OauthPage.APPROVE_BUTTON = By.xpath('//*[@id="js-oauth-authorize-btn"]');
|
|
50
|
+
OauthPage.SUBMIT_BUTTON = By.xpath('//*[@value="Sign in"]');
|
|
51
|
+
OauthPage.DENY_ACCESS_BUTTON = By.xpath('//button[contains(., "Cancel")]');
|
|
52
|
+
}
|
|
53
|
+
break;
|
|
54
|
+
case GitProviderType.AZURE: {
|
|
55
|
+
OauthPage.LOGIN_FORM = By.xpath('//input[@type="email"]');
|
|
56
|
+
OauthPage.PASSWORD_FORM = By.xpath('//input[@type="password"]');
|
|
57
|
+
OauthPage.APPROVE_BUTTON = By.id('accept-button');
|
|
58
|
+
OauthPage.SUBMIT_BUTTON = By.xpath('//input[@type="submit"]');
|
|
59
|
+
OauthPage.DENY_SAVE_CREDENTIALS_BUTTON = By.xpath('//input[@type="button"]');
|
|
60
|
+
OauthPage.DENY_ACCESS_BUTTON = By.id('deny-button');
|
|
51
61
|
}
|
|
52
62
|
break;
|
|
53
63
|
default: {
|
|
54
|
-
throw new Error(`Invalid git provider. The value should be ${GitProviderType.GITHUB}, ${GitProviderType.GITLAB} or ${GitProviderType.BITBUCKET}`);
|
|
64
|
+
throw new Error(`Invalid git provider. The value should be ${GitProviderType.GITHUB}, ${GitProviderType.GITLAB}, ${GitProviderType.AZURE} or ${GitProviderType.BITBUCKET}`);
|
|
55
65
|
}
|
|
56
66
|
}
|
|
57
67
|
}
|
|
@@ -59,55 +69,61 @@ export class OauthPage {
|
|
|
59
69
|
async waitLoginPage(): Promise<void> {
|
|
60
70
|
Logger.debug('OauthPage.waitLoginPage');
|
|
61
71
|
|
|
62
|
-
await this.driverHelper.waitVisibility(
|
|
72
|
+
await this.driverHelper.waitVisibility(OauthPage.LOGIN_FORM, TimeoutConstants.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM * 3);
|
|
63
73
|
}
|
|
64
74
|
|
|
65
75
|
async enterUserName(userName: string): Promise<void> {
|
|
66
76
|
Logger.debug(`this.enterUserName "${userName}"`);
|
|
67
77
|
|
|
68
|
-
await this.driverHelper.enterValue(
|
|
78
|
+
await this.driverHelper.enterValue(OauthPage.LOGIN_FORM, userName);
|
|
69
79
|
}
|
|
70
80
|
|
|
71
81
|
async enterPassword(password: string): Promise<void> {
|
|
72
82
|
Logger.debug(`OauthPage.enterPassword`);
|
|
73
83
|
|
|
74
|
-
await this.driverHelper.enterValue(
|
|
84
|
+
await this.driverHelper.enterValue(OauthPage.PASSWORD_FORM, password);
|
|
75
85
|
}
|
|
76
86
|
|
|
77
|
-
async
|
|
87
|
+
async clickOnSubmitButton(): Promise<void> {
|
|
78
88
|
Logger.debug('OauthPage.clickOnLoginButton');
|
|
79
89
|
|
|
80
|
-
await this.driverHelper.waitAndClick(
|
|
90
|
+
await this.driverHelper.waitAndClick(OauthPage.SUBMIT_BUTTON);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
async clickOnNotRememberCredentialsButton(): Promise<void> {
|
|
94
|
+
Logger.debug('OauthPage.clickOnNotRememberCredentialsButton');
|
|
95
|
+
|
|
96
|
+
await this.driverHelper.waitAndClick(OauthPage.DENY_SAVE_CREDENTIALS_BUTTON);
|
|
81
97
|
}
|
|
82
98
|
|
|
83
99
|
async waitClosingLoginPage(): Promise<void> {
|
|
84
100
|
Logger.debug('OauthPage.waitClosingLoginPage');
|
|
85
101
|
|
|
86
|
-
await this.driverHelper.waitDisappearance(
|
|
102
|
+
await this.driverHelper.waitDisappearance(OauthPage.PASSWORD_FORM);
|
|
87
103
|
}
|
|
88
104
|
|
|
89
105
|
async waitOauthPage(): Promise<void> {
|
|
90
106
|
Logger.debug('OauthPage.waitOauthPage');
|
|
91
107
|
|
|
92
|
-
await this.driverHelper.waitVisibility(
|
|
108
|
+
await this.driverHelper.waitVisibility(OauthPage.APPROVE_BUTTON);
|
|
93
109
|
}
|
|
94
110
|
|
|
95
111
|
async clickOnApproveButton(): Promise<void> {
|
|
96
112
|
Logger.debug('OauthPage.clickOnApproveButton');
|
|
97
113
|
|
|
98
|
-
await this.driverHelper.waitAndClick(
|
|
114
|
+
await this.driverHelper.waitAndClick(OauthPage.APPROVE_BUTTON);
|
|
99
115
|
}
|
|
100
116
|
|
|
101
117
|
async clickOnDenyAccessButton(): Promise<void> {
|
|
102
118
|
Logger.debug('OauthPage.clickOnDenyAccessButton');
|
|
103
119
|
|
|
104
|
-
await this.driverHelper.waitAndClick(
|
|
120
|
+
await this.driverHelper.waitAndClick(OauthPage.DENY_ACCESS_BUTTON);
|
|
105
121
|
}
|
|
106
122
|
|
|
107
123
|
async waitDisappearanceOauthPage(): Promise<void> {
|
|
108
124
|
Logger.debug('OauthPage.waitDisappearanceOauthPage');
|
|
109
125
|
|
|
110
|
-
await this.driverHelper.waitDisappearance(
|
|
126
|
+
await this.driverHelper.waitDisappearance(OauthPage.APPROVE_BUTTON);
|
|
111
127
|
}
|
|
112
128
|
|
|
113
129
|
async login(): Promise<void> {
|
|
@@ -115,8 +131,14 @@ export class OauthPage {
|
|
|
115
131
|
|
|
116
132
|
await this.waitLoginPage();
|
|
117
133
|
await this.enterUserName(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_USERNAME);
|
|
134
|
+
if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.AZURE) {
|
|
135
|
+
await this.clickOnSubmitButton();
|
|
136
|
+
}
|
|
118
137
|
await this.enterPassword(OAuthConstants.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
|
|
119
|
-
await this.
|
|
138
|
+
await this.clickOnSubmitButton();
|
|
139
|
+
if (FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.AZURE) {
|
|
140
|
+
await this.clickOnNotRememberCredentialsButton();
|
|
141
|
+
}
|
|
120
142
|
await this.waitClosingLoginPage();
|
|
121
143
|
}
|
|
122
144
|
|
|
@@ -128,10 +150,10 @@ export class OauthPage {
|
|
|
128
150
|
await this.waitDisappearanceOauthPage();
|
|
129
151
|
} catch (e) {
|
|
130
152
|
Logger.debug('OauthPage.confirmAccess - access was not confirmed, retrying to click conformation button');
|
|
131
|
-
// workaround for github oauth conformation page (bot security)
|
|
153
|
+
// workaround for github, azure oauth conformation page (bot security)
|
|
132
154
|
await this.driverHelper.getAction()
|
|
133
155
|
.move({
|
|
134
|
-
origin: await this.driverHelper.waitPresence(
|
|
156
|
+
origin: await this.driverHelper.waitPresence(OauthPage.APPROVE_BUTTON)
|
|
135
157
|
})
|
|
136
158
|
.click()
|
|
137
159
|
.perform();
|
|
@@ -142,7 +164,19 @@ export class OauthPage {
|
|
|
142
164
|
async denyAccess(): Promise<void> {
|
|
143
165
|
Logger.debug('OauthPage.denyAccess');
|
|
144
166
|
|
|
145
|
-
|
|
146
|
-
|
|
167
|
+
try {
|
|
168
|
+
await this.clickOnDenyAccessButton();
|
|
169
|
+
await this.waitDisappearanceOauthPage();
|
|
170
|
+
} catch (e) {
|
|
171
|
+
Logger.debug('OauthPage.denyAccess - deny access was not confirmed, retrying to click conformation button');
|
|
172
|
+
// workaround for github, azure oauth conformation page (bot security)
|
|
173
|
+
await this.driverHelper.getAction()
|
|
174
|
+
.move({
|
|
175
|
+
origin: await this.driverHelper.waitPresence(OauthPage.DENY_ACCESS_BUTTON)
|
|
176
|
+
})
|
|
177
|
+
.click()
|
|
178
|
+
.perform();
|
|
179
|
+
await this.waitDisappearanceOauthPage();
|
|
180
|
+
}
|
|
147
181
|
}
|
|
148
182
|
}
|
|
@@ -76,7 +76,7 @@ suite(`Create a workspace via launching a factory from the ${FactoryTestConstant
|
|
|
76
76
|
await browserTabsUtil.navigateTo(FactoryTestConstants.TS_SELENIUM_FACTORY_URL());
|
|
77
77
|
});
|
|
78
78
|
|
|
79
|
-
if (
|
|
79
|
+
if (OAuthConstants.TS_SELENIUM_GIT_PROVIDER_OAUTH) {
|
|
80
80
|
test(`Authorize with a ${FactoryTestConstants.TS_SELENIUM_FACTORY_GIT_PROVIDER} OAuth and deny access`, async function (): Promise<void> {
|
|
81
81
|
await oauthPage.login();
|
|
82
82
|
await oauthPage.waitOauthPage();
|
|
@@ -35,8 +35,8 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
|
|
|
35
35
|
if (this.isUserLoggedIn()) {
|
|
36
36
|
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: User already logged`);
|
|
37
37
|
} else {
|
|
38
|
-
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${
|
|
39
|
-
exec(`oc login --server=${url} -u=${
|
|
38
|
+
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login ${url}, ${OAuthConstants.TS_SELENIUM_OCP_USERNAME}`);
|
|
39
|
+
exec(`oc login --server=${url} -u=${OAuthConstants.TS_SELENIUM_OCP_USERNAME} -p=${OAuthConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
|
|
40
40
|
}
|
|
41
41
|
} else {
|
|
42
42
|
Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: doesn't support login command`);
|
|
@@ -60,7 +60,7 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
|
|
|
60
60
|
Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
|
|
61
61
|
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
|
|
62
62
|
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
|
|
63
|
-
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${
|
|
63
|
+
ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dwt ${BaseTestConstants.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true`);
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
|