@eclipse-che/che-e2e 7.41.0-dev-0a9cb74 → 7.41.0-dev-aed762b
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/ide/Terminal.js +22 -42
- package/dist/pageobjects/ide/Terminal.js.map +1 -1
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js +3 -3
- package/dist/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.js.map +1 -1
- package/dist/tests/plugins/VscodeValePlugin.spec.js.map +1 -1
- package/dist/utils/VCS/github/GitHubUtil.js +20 -0
- package/dist/utils/VCS/github/GitHubUtil.js.map +1 -1
- package/package.json +1 -1
- package/pageobjects/ide/Terminal.ts +20 -46
- package/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts +3 -3
- package/tests/plugins/VscodeValePlugin.spec.ts +1 -1
- package/utils/VCS/github/GitHubUtil.ts +19 -0
|
@@ -20,7 +20,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
20
20
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
21
21
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
22
22
|
};
|
|
23
|
-
var Terminal_1;
|
|
24
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
24
|
exports.Terminal = void 0;
|
|
26
25
|
const inversify_1 = require("inversify");
|
|
@@ -30,7 +29,7 @@ const selenium_webdriver_1 = require("selenium-webdriver");
|
|
|
30
29
|
const Logger_1 = require("../../utils/Logger");
|
|
31
30
|
const TimeoutConstants_1 = require("../../TimeoutConstants");
|
|
32
31
|
const TestConstants_1 = require("../../TestConstants");
|
|
33
|
-
let Terminal =
|
|
32
|
+
let Terminal = class Terminal {
|
|
34
33
|
constructor(driverHelper) {
|
|
35
34
|
this.driverHelper = driverHelper;
|
|
36
35
|
}
|
|
@@ -71,8 +70,8 @@ let Terminal = Terminal_1 = class Terminal {
|
|
|
71
70
|
}
|
|
72
71
|
async type(terminalTabTitle, text) {
|
|
73
72
|
Logger_1.Logger.debug(`Terminal.type "${terminalTabTitle}"`);
|
|
74
|
-
const
|
|
75
|
-
const terminalInteractionContainer = this.getTerminalEditorInteractionEditorLocator(
|
|
73
|
+
const terminalID = await this.getTerminalID(terminalTabTitle);
|
|
74
|
+
const terminalInteractionContainer = this.getTerminalEditorInteractionEditorLocator(terminalID);
|
|
76
75
|
await this.driverHelper.typeToInvisible(terminalInteractionContainer, text);
|
|
77
76
|
}
|
|
78
77
|
async rejectTerminalProcess(tabTitle, timeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_TERMINAL_DEFAULT_TIMEOUT) {
|
|
@@ -82,9 +81,10 @@ let Terminal = Terminal_1 = class Terminal {
|
|
|
82
81
|
}
|
|
83
82
|
async getText(terminalTab, timeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_TERMINAL_DEFAULT_TIMEOUT) {
|
|
84
83
|
Logger_1.Logger.debug(`Terminal.getText tab: ${terminalTab}`);
|
|
85
|
-
const
|
|
84
|
+
const terminalID = await this.getTerminalID(terminalTab);
|
|
85
|
+
const terminalRowsLocator = this.getTerminalEditorTerminalRowsLocator(terminalID);
|
|
86
86
|
await this.selectTerminalTab(terminalTab, timeout);
|
|
87
|
-
return await this.driverHelper.waitAndGetText(
|
|
87
|
+
return await this.driverHelper.waitAndGetText(terminalRowsLocator, timeout);
|
|
88
88
|
}
|
|
89
89
|
async getTextFromProblemsTab(timeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_TERMINAL_DEFAULT_TIMEOUT) {
|
|
90
90
|
Logger_1.Logger.debug(`Terminal.getTextFromProblemsTab`);
|
|
@@ -94,10 +94,11 @@ let Terminal = Terminal_1 = class Terminal {
|
|
|
94
94
|
async selectTabByPrefixAndWaitText(terminalTab, expectedText, timeout = TimeoutConstants_1.TimeoutConstants.TS_SELENIUM_TERMINAL_DEFAULT_TIMEOUT) {
|
|
95
95
|
Logger_1.Logger.debug(`Terminal.selectTabByPrefixAndWaitText tab: ${terminalTab} text: ${expectedText}`);
|
|
96
96
|
const terminalTabLocatorWithPreffix = `//li[contains(@title, '${terminalTab}')]`;
|
|
97
|
-
const
|
|
97
|
+
const terminalID = await this.getTerminalID(terminalTab);
|
|
98
|
+
const terminalRowsLocator = this.getTerminalEditorTerminalRowsLocator(terminalID);
|
|
98
99
|
await this.driverHelper.waitAndClick(selenium_webdriver_1.By.xpath(terminalTabLocatorWithPreffix), timeout);
|
|
99
100
|
await this.driverHelper.waitUntilTrue(async () => {
|
|
100
|
-
const terminalText = await this.driverHelper.waitAndGetText(
|
|
101
|
+
const terminalText = await this.driverHelper.waitAndGetText(terminalRowsLocator, timeout);
|
|
101
102
|
return terminalText.includes(expectedText);
|
|
102
103
|
}, timeout);
|
|
103
104
|
}
|
|
@@ -156,46 +157,25 @@ let Terminal = Terminal_1 = class Terminal {
|
|
|
156
157
|
getFocusedTerminalTabLocator(tabTitle) {
|
|
157
158
|
return selenium_webdriver_1.By.css(`li[title='${tabTitle}'].p-mod-current.theia-mod-active`);
|
|
158
159
|
}
|
|
159
|
-
async
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
}
|
|
168
|
-
if ((err instanceof selenium_webdriver_1.error.NoSuchElementError) && (i === 9)) {
|
|
169
|
-
throw err;
|
|
170
|
-
}
|
|
171
|
-
await this.driverHelper.wait(2000);
|
|
172
|
-
}
|
|
160
|
+
async getTerminalID(terminalTitle) {
|
|
161
|
+
const terminalTabXpathLocator = `//div[@id='theia-bottom-content-panel']//li[contains(@title, '${terminalTitle}')]`;
|
|
162
|
+
const terminalTabs = await this.driverHelper.waitAllPresence(selenium_webdriver_1.By.xpath(terminalTabXpathLocator));
|
|
163
|
+
if (terminalTabs.length > 1) {
|
|
164
|
+
throw new selenium_webdriver_1.error.InvalidSelectorError(`Terminal.getTerminalID Selector is too generic, found more than one terminal with title:${terminalTitle}`);
|
|
165
|
+
}
|
|
166
|
+
if (terminalTabs.length === 1) {
|
|
167
|
+
return await (await terminalTabs[0].getAttribute('id')).replace('shell-tab-', '');
|
|
173
168
|
}
|
|
174
169
|
throw new selenium_webdriver_1.error.NoSuchElementError(`The terminal with title '${terminalTitle}' has not been found.`);
|
|
175
170
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
`//li[contains(@id, 'shell-tab-terminal') or contains(@id, 'shell-tab-plugin')]` +
|
|
179
|
-
`//div[@class='p-TabBar-tabLabel']`;
|
|
180
|
-
const terminalTabs = await this.driverHelper.waitAllPresence(selenium_webdriver_1.By.xpath(terminalTabTitleXpathLocator));
|
|
181
|
-
let terminalTitles = [];
|
|
182
|
-
for (let i = 1; i <= terminalTabs.length; i++) {
|
|
183
|
-
const terminalTabLocator = selenium_webdriver_1.By.xpath(`(${terminalTabTitleXpathLocator})[${i}]`);
|
|
184
|
-
const currentTerminalTitle = await this.driverHelper.waitAndGetText(terminalTabLocator);
|
|
185
|
-
if (currentTerminalTitle.search(terminalTitle) > -1) {
|
|
186
|
-
return i;
|
|
187
|
-
}
|
|
188
|
-
terminalTitles.push(currentTerminalTitle);
|
|
189
|
-
}
|
|
190
|
-
throw new selenium_webdriver_1.error.NoSuchElementError(`The terminal with title '${terminalTitle}' has not been found.\n` +
|
|
191
|
-
` > List of the tabs:\n > ${terminalTitles}`);
|
|
171
|
+
getTerminalEditorInteractionEditorLocator(terminalID) {
|
|
172
|
+
return selenium_webdriver_1.By.xpath(`//div[@id='${terminalID}']//textarea[@aria-label='Terminal input']`);
|
|
192
173
|
}
|
|
193
|
-
|
|
194
|
-
return selenium_webdriver_1.By.xpath(
|
|
174
|
+
getTerminalEditorTerminalRowsLocator(terminalID) {
|
|
175
|
+
return selenium_webdriver_1.By.xpath(`//div[@id='${terminalID}']//div[@class='xterm-rows xterm-focus']`);
|
|
195
176
|
}
|
|
196
177
|
};
|
|
197
|
-
Terminal
|
|
198
|
-
Terminal = Terminal_1 = __decorate([
|
|
178
|
+
Terminal = __decorate([
|
|
199
179
|
inversify_1.injectable(),
|
|
200
180
|
__param(0, inversify_1.inject(inversify_types_1.CLASSES.DriverHelper)),
|
|
201
181
|
__metadata("design:paramtypes", [DriverHelper_1.DriverHelper])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../pageobjects/ide/Terminal.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE
|
|
1
|
+
{"version":3,"file":"Terminal.js","sourceRoot":"","sources":["../../../pageobjects/ide/Terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,7 +141,7 @@ suite('Validation of workspace build and run', async () => {
|
|
|
141
141
|
await terminal.waitIconSuccess(taskName, 500000);
|
|
142
142
|
});
|
|
143
143
|
test('Run application', async () => {
|
|
144
|
-
const taskName = 'run';
|
|
144
|
+
const taskName = 'run-with-hsqldb';
|
|
145
145
|
await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
|
|
146
146
|
await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120000);
|
|
147
147
|
// devWs specific. After running test application we can open it just in the new window.
|
|
@@ -153,8 +153,8 @@ suite('Validation of workspace build and run', async () => {
|
|
|
153
153
|
await switchAppWindowAndCheck(SpringAppLocators.springTitleLocator);
|
|
154
154
|
});
|
|
155
155
|
test('Close the terminal running tasks', async () => {
|
|
156
|
-
await terminal.rejectTerminalProcess('run');
|
|
157
|
-
await terminal.closeTerminalTab('run');
|
|
156
|
+
await terminal.rejectTerminalProcess('run-with-hsqldb');
|
|
157
|
+
await terminal.closeTerminalTab('run-with-hsqldb');
|
|
158
158
|
await warningDialog.waitAndCloseIfAppear();
|
|
159
159
|
await terminal.closeTerminalTab('build');
|
|
160
160
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DevWorkspaceHappyPath.spec.js","sourceRoot":"","sources":["../../../tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VscodeValePlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeValePlugin.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;AAExE,2DAAyC;AACzC,6DAAsD;AACtD,2DAAgD;AAIhD,uDAAoD;AACpD,6DAA0D;AAG1D,+CAA4C;AAE5C,2EAAmD;AAGnD,MAAM,GAAG,GAAQ,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,WAAW,GAAgB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,WAAW,CAAC,CAAC;AACvE,MAAM,MAAM,GAAW,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,MAAM,CAAC,CAAC;AACxD,MAAM,eAAe,GAAoB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,eAAe,CAAC,CAAC;AACnF,MAAM,QAAQ,GAAa,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,QAAQ,CAAC,CAAC;AAC9D,MAAM,sBAAsB,GAA2B,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,sBAAsB,CAAC,CAAC;AACxG,MAAM,oBAAoB,GAAyB,+BAAY,CAAC,GAAG,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAC;AAElG,MAAM,UAAU,GAAW,2GAA2G,CAAC;AACvI,MAAM,UAAU,GAAW,GAAG,6BAAa,CAAC,oBAAoB,UAAU,UAAU,EAAE,CAAC;AACvF,MAAM,WAAW,GAAW,UAAU,CAAC;AACvC,MAAM,UAAU,GAAW,GAAG,WAAW,wCAAwC,CAAC;AAClF,MAAM,WAAW,GAAW,oCAAoC,CAAC;AACjE,IAAI,aAAa,GAAW,EAAE,CAAC;AAE/B,KAAK,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;IACjD,KAAK,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QACjC,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,GAAG,CAAC,uBAAuB,EAAE,CAAC;YACpC,aAAa,GAAG,MAAM,oBAAoB,CAAC,cAAc,EAAE,CAAC;YAC5D,qBAAW,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YAEpD,MAAM,GAAG,CAAC,OAAO,CAAC,mCAAgB,CAAC,mCAAmC,CAAC,CAAC;YACxE,MAAM,GAAG,CAAC,gCAAgC,CAAC,6BAA6B,EAAE,cAAc,EAAE,KAAM,CAAC,CAAC;QACtG,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QAClD,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,WAAW,CAAC,wBAAwB,EAAE,CAAC;YAC7C,MAAM,WAAW,CAAC,mBAAmB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACxC,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YACtD,MAAM,WAAW,CAAC,qBAAqB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YACjE,MAAM,MAAM,CAAC,cAAc,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"VscodeValePlugin.spec.js","sourceRoot":"","sources":["../../../tests/plugins/VscodeValePlugin.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,6 +84,26 @@ let GitHubUtil = GitHubUtil_1 = class GitHubUtil {
|
|
|
84
84
|
throw error;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
+
async deletePublicSshKeyByName(authToken, keyName) {
|
|
88
|
+
const gitHubApiSshURL = GitHubUtil_1.GITHUB_API_ENTRIPOINT_URL + 'user/keys';
|
|
89
|
+
const authHeader = { headers: { 'Authorization': 'token ' + authToken, 'Content-Type': 'application/json' } };
|
|
90
|
+
try {
|
|
91
|
+
const response = await axios_1.default.get(gitHubApiSshURL, authHeader);
|
|
92
|
+
const stringified = JSON.stringify(response.data);
|
|
93
|
+
const arrayOfPublicKeys = JSON.parse(stringified);
|
|
94
|
+
for (let entry of arrayOfPublicKeys) {
|
|
95
|
+
if (entry.title === keyName) {
|
|
96
|
+
this.removePublicSshKey(authToken, entry.id);
|
|
97
|
+
break;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
console.error('Cannot delete the ' + keyName + ' public key from the GitHub account');
|
|
103
|
+
console.error(error);
|
|
104
|
+
throw error;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
87
107
|
async removeAllPublicSshKeys(authToken) {
|
|
88
108
|
try {
|
|
89
109
|
const idList = await this.getPublicSshKeys(authToken);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GitHubUtil.js","sourceRoot":"","sources":["../../../../utils/VCS/github/GitHubUtil.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GitHubUtil.js","sourceRoot":"","sources":["../../../../utils/VCS/github/GitHubUtil.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -18,7 +18,6 @@ import { TestConstants } from '../../TestConstants';
|
|
|
18
18
|
|
|
19
19
|
@injectable()
|
|
20
20
|
export class Terminal {
|
|
21
|
-
private static readonly TERMINAL_ROWS_XPATH_LOCATOR_PREFFIX = '(//div[contains(@class, \'terminal-container\')]//div[contains(@class, \'terminal\')]//div[contains(@class, \'xterm-rows\')])';
|
|
22
21
|
constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
|
|
23
22
|
|
|
24
23
|
async waitTab(tabTitle: string, timeout: number = TimeoutConstants.TS_SELENIUM_TERMINAL_DEFAULT_TIMEOUT) {
|
|
@@ -79,8 +78,8 @@ export class Terminal {
|
|
|
79
78
|
async type(terminalTabTitle: string, text: string) {
|
|
80
79
|
Logger.debug(`Terminal.type "${terminalTabTitle}"`);
|
|
81
80
|
|
|
82
|
-
const
|
|
83
|
-
const terminalInteractionContainer: By = this.getTerminalEditorInteractionEditorLocator(
|
|
81
|
+
const terminalID: string = await this.getTerminalID(terminalTabTitle);
|
|
82
|
+
const terminalInteractionContainer: By = this.getTerminalEditorInteractionEditorLocator(terminalID);
|
|
84
83
|
|
|
85
84
|
await this.driverHelper.typeToInvisible(terminalInteractionContainer, text);
|
|
86
85
|
}
|
|
@@ -95,9 +94,10 @@ export class Terminal {
|
|
|
95
94
|
async getText(terminalTab: string, timeout: number = TimeoutConstants.TS_SELENIUM_TERMINAL_DEFAULT_TIMEOUT): Promise<string> {
|
|
96
95
|
Logger.debug(`Terminal.getText tab: ${terminalTab}`);
|
|
97
96
|
|
|
98
|
-
const
|
|
97
|
+
const terminalID: string = await this.getTerminalID(terminalTab);
|
|
98
|
+
const terminalRowsLocator: By = this.getTerminalEditorTerminalRowsLocator(terminalID);
|
|
99
99
|
await this.selectTerminalTab(terminalTab, timeout);
|
|
100
|
-
return await this.driverHelper.waitAndGetText(
|
|
100
|
+
return await this.driverHelper.waitAndGetText(terminalRowsLocator, timeout);
|
|
101
101
|
}
|
|
102
102
|
|
|
103
103
|
async getTextFromProblemsTab(timeout: number = TimeoutConstants.TS_SELENIUM_TERMINAL_DEFAULT_TIMEOUT): Promise<string> {
|
|
@@ -112,13 +112,13 @@ export class Terminal {
|
|
|
112
112
|
Logger.debug(`Terminal.selectTabByPrefixAndWaitText tab: ${terminalTab} text: ${expectedText}`);
|
|
113
113
|
|
|
114
114
|
const terminalTabLocatorWithPreffix: string = `//li[contains(@title, '${terminalTab}')]`;
|
|
115
|
-
const
|
|
115
|
+
const terminalID: string = await this.getTerminalID(terminalTab);
|
|
116
|
+
const terminalRowsLocator: By = this.getTerminalEditorTerminalRowsLocator(terminalID);
|
|
116
117
|
|
|
117
118
|
await this.driverHelper.waitAndClick(By.xpath(terminalTabLocatorWithPreffix), timeout);
|
|
118
119
|
await this.driverHelper.waitUntilTrue(async () => {
|
|
119
|
-
const terminalText: string = await this.driverHelper.waitAndGetText(
|
|
120
|
+
const terminalText: string = await this.driverHelper.waitAndGetText(terminalRowsLocator, timeout);
|
|
120
121
|
return terminalText.includes(expectedText);
|
|
121
|
-
|
|
122
122
|
}, timeout);
|
|
123
123
|
}
|
|
124
124
|
|
|
@@ -193,53 +193,27 @@ export class Terminal {
|
|
|
193
193
|
return By.css(`li[title='${tabTitle}'].p-mod-current.theia-mod-active`);
|
|
194
194
|
}
|
|
195
195
|
|
|
196
|
-
private async
|
|
197
|
-
|
|
198
|
-
try {
|
|
199
|
-
return await this.searchTerminalIndex(terminalTitle);
|
|
200
|
-
} catch (err) {
|
|
201
|
-
if (!(err instanceof error.NoSuchElementError)) {
|
|
202
|
-
throw err;
|
|
203
|
-
}
|
|
196
|
+
private async getTerminalID(terminalTitle: string): Promise<string> {
|
|
197
|
+
const terminalTabXpathLocator: string = `//div[@id='theia-bottom-content-panel']//li[contains(@title, '${terminalTitle}')]`;
|
|
204
198
|
|
|
205
|
-
|
|
206
|
-
throw err;
|
|
207
|
-
}
|
|
199
|
+
const terminalTabs: WebElement[] = await this.driverHelper.waitAllPresence(By.xpath(terminalTabXpathLocator));
|
|
208
200
|
|
|
209
|
-
|
|
210
|
-
}
|
|
201
|
+
if (terminalTabs.length > 1) {
|
|
202
|
+
throw new error.InvalidSelectorError(`Terminal.getTerminalID Selector is too generic, found more than one terminal with title:${terminalTitle}`);
|
|
203
|
+
}
|
|
204
|
+
if (terminalTabs.length === 1) {
|
|
205
|
+
return await (await terminalTabs[0].getAttribute('id')).replace('shell-tab-', '');
|
|
211
206
|
}
|
|
212
207
|
|
|
213
208
|
throw new error.NoSuchElementError(`The terminal with title '${terminalTitle}' has not been found.`);
|
|
214
209
|
}
|
|
215
210
|
|
|
216
|
-
private
|
|
217
|
-
|
|
218
|
-
`//li[contains(@id, 'shell-tab-terminal') or contains(@id, 'shell-tab-plugin')]` +
|
|
219
|
-
`//div[@class='p-TabBar-tabLabel']`;
|
|
220
|
-
|
|
221
|
-
const terminalTabs: WebElement[] = await this.driverHelper.waitAllPresence(By.xpath(terminalTabTitleXpathLocator));
|
|
222
|
-
let terminalTitles: string[] = [];
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
for (let i: number = 1; i <= terminalTabs.length; i++) {
|
|
226
|
-
const terminalTabLocator: By = By.xpath(`(${terminalTabTitleXpathLocator})[${i}]`);
|
|
227
|
-
const currentTerminalTitle: string = await this.driverHelper.waitAndGetText(terminalTabLocator);
|
|
228
|
-
|
|
229
|
-
if (currentTerminalTitle.search(terminalTitle) > -1) {
|
|
230
|
-
return i;
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
terminalTitles.push(currentTerminalTitle);
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
throw new error.NoSuchElementError(`The terminal with title '${terminalTitle}' has not been found.\n` +
|
|
237
|
-
` > List of the tabs:\n > ${terminalTitles}`);
|
|
238
|
-
|
|
211
|
+
private getTerminalEditorInteractionEditorLocator(terminalID: string): By {
|
|
212
|
+
return By.xpath(`//div[@id='${terminalID}']//textarea[@aria-label='Terminal input']`);
|
|
239
213
|
}
|
|
240
214
|
|
|
241
|
-
private
|
|
242
|
-
return By.xpath(
|
|
215
|
+
private getTerminalEditorTerminalRowsLocator(terminalID: string): By {
|
|
216
|
+
return By.xpath(`//div[@id='${terminalID}']//div[@class='xterm-rows xterm-focus']`);
|
|
243
217
|
}
|
|
244
218
|
|
|
245
219
|
}
|
|
@@ -141,7 +141,7 @@ suite('Workspace creation via factory url', async () => {
|
|
|
141
141
|
});
|
|
142
142
|
|
|
143
143
|
test('Run application', async () => {
|
|
144
|
-
const taskName: string = 'run';
|
|
144
|
+
const taskName: string = 'run-with-hsqldb';
|
|
145
145
|
await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
|
|
146
146
|
await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120_000);
|
|
147
147
|
// devWs specific. After running test application we can open it just in the new window.
|
|
@@ -154,8 +154,8 @@ suite('Workspace creation via factory url', async () => {
|
|
|
154
154
|
});
|
|
155
155
|
|
|
156
156
|
test('Close the terminal running tasks', async () => {
|
|
157
|
-
await terminal.rejectTerminalProcess('run');
|
|
158
|
-
await terminal.closeTerminalTab('run');
|
|
157
|
+
await terminal.rejectTerminalProcess('run-with-hsqldb');
|
|
158
|
+
await terminal.closeTerminalTab('run-with-hsqldb');
|
|
159
159
|
await warningDialog.waitAndCloseIfAppear();
|
|
160
160
|
await terminal.closeTerminalTab('build');
|
|
161
161
|
});
|
|
@@ -64,7 +64,7 @@ suite('The "VscodeValePlugin" userstory', async () => {
|
|
|
64
64
|
suite('Check the "vale" plugin', async () => {
|
|
65
65
|
test('Check warning in the editor appearance', async () => {
|
|
66
66
|
await projectTree.expandPathAndOpenFile(pathToFile, docFileName);
|
|
67
|
-
await editor.waitInfoInLine(16,docFileName);
|
|
67
|
+
await editor.waitInfoInLine(16, docFileName);
|
|
68
68
|
});
|
|
69
69
|
|
|
70
70
|
test('Open the "Problems" terminal tab', async () => {
|
|
@@ -73,6 +73,25 @@ export class GitHubUtil {
|
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
+
async deletePublicSshKeyByName(authToken: string, keyName: string) {
|
|
77
|
+
const gitHubApiSshURL: string = GitHubUtil.GITHUB_API_ENTRIPOINT_URL + 'user/keys';
|
|
78
|
+
const authHeader = { headers: { 'Authorization': 'token ' + authToken, 'Content-Type': 'application/json' } };
|
|
79
|
+
try {
|
|
80
|
+
const response = await axios.get(gitHubApiSshURL, authHeader);
|
|
81
|
+
const stringified = JSON.stringify(response.data);
|
|
82
|
+
const arrayOfPublicKeys = JSON.parse(stringified);
|
|
83
|
+
for (let entry of arrayOfPublicKeys) {
|
|
84
|
+
if (entry.title === keyName) {
|
|
85
|
+
this.removePublicSshKey(authToken, entry.id);
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
} catch (error) {
|
|
90
|
+
console.error('Cannot delete the ' + keyName + ' public key from the GitHub account');
|
|
91
|
+
console.error(error);
|
|
92
|
+
throw error;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
76
95
|
|
|
77
96
|
async removeAllPublicSshKeys(authToken: string) {
|
|
78
97
|
try {
|