seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TS_SELENIUM] Implement workaround for issue #14660 (Unexpected list of suggestions when use Java languageserver) in the "HappyPath" test. (#14672) 

Signed-off-by: Ihor Okhrimenko <iokhrime@redhat.com>
7.20.x
Igor Ohrimenko 2019-09-26 16:30:40 +03:00 committed by GitHub
parent 87611541b3
commit fd6f7ad1ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/driver/ChromeDriver.ts
View File

@ -55,7 +55,7 @@ export class ChromeDriver implements IDriver {
if (TestConstants.TS_SELENIUM_REMOTE_DRIVER_URL) {
builder = builder.usingServer(TestConstants.TS_SELENIUM_REMOTE_DRIVER_URL);
}
return builder;
}

34
e2e/index.ts
View File

@ -3,37 +3,37 @@ export { inversifyConfig };
export * from './inversify.types';
export * from './TestConstants';
export * from './driver/ContainerInitializer';
export * from './driver/IDriver';
export * from './driver/ChromeDriver';
export * from './driver/IDriver';
export * from './driver/ContainerInitializer';
export * from './utils/ScreenCatcher';
export * from './utils/DriverHelper';
export * from './utils/NameGenerator';
export * from './utils/workspace/ITestWorkspaceUtil';
export * from './utils/workspace/WorkspaceStatus';
export * from './utils/workspace/TestWorkspaceUtil';
export * from './pageobjects/openshift/OcpLoginPage';
export * from './pageobjects/openshift/OcpWebConsolePage';
export * from './pageobjects/login/OcpLoginByTempAdmin';
export * from './pageobjects/login/ICheLoginPage';
export * from './pageobjects/login/MultiUserLoginPage';
export * from './pageobjects/login/IOcpLoginPage';
export * from './pageobjects/login/ICheLoginPage';
export * from './pageobjects/login/SingleUserLoginPage';
export * from './pageobjects/dashboard/NewWorkspace';
export * from './pageobjects/dashboard/Workspaces';
export * from './pageobjects/dashboard/workspace-details/WorkspaceDetails';
export * from './pageobjects/dashboard/workspace-details/WorkspaceDetailsPlugins';
export * from './pageobjects/dashboard/Workspaces';
export * from './pageobjects/dashboard/Dashboard';
export * from './pageobjects/dashboard/NewWorkspace';
export * from './pageobjects/ide/Terminal';
export * from './pageobjects/ide/Editor';
export * from './pageobjects/ide/OpenWorkspaceWidget';
export * from './pageobjects/ide/ProjectTree';
export * from './pageobjects/ide/QuickOpenContainer';
export * from './pageobjects/ide/RightToolbar';
export * from './pageobjects/ide/ContextMenu';
export * from './pageobjects/ide/Ide';
export * from './pageobjects/ide/DebugView';
export * from './pageobjects/ide/GitHubPlugin';
export * from './pageobjects/ide/TopMenu';
export * from './pageobjects/ide/WarningDialog';
export * from './pageobjects/ide/RightToolbar';
export * from './pageobjects/ide/OpenWorkspaceWidget';
export * from './pageobjects/ide/Ide';
export * from './pageobjects/ide/Editor';
export * from './pageobjects/ide/ProjectTree';
export * from './pageobjects/ide/PreviewWidget';
export * from './pageobjects/ide/GitHubPlugin';
export * from './pageobjects/ide/DebugView';
export * from './pageobjects/ide/ContextMenu';
export * from './pageobjects/ide/WarningDialog';
export * from './pageobjects/ide/QuickOpenContainer';
export * from './pageobjects/openshift/OcpWebConsolePage';
export * from './pageobjects/openshift/OcpLoginPage';

14
e2e/pageobjects/ide/Editor.ts
View File

@ -35,6 +35,17 @@ export class Editor {
await this.driverHelper.waitDisappearanceWithTimeout(By.css(Editor.SUGGESTION_WIDGET_BODY_CSS));
}
public async scrollAndSearchSuggestion(editorTabTitle: string, suggestionLocator: By, timeout: number = 10000) {
await this.driverHelper.getDriver().wait(async () => {
await this.waitSuggestionContainer();
if (await this.driverHelper.isVisible(suggestionLocator)) {
return true;
}
await this.performKeyCombination(editorTabTitle, Key.ARROW_DOWN);
}, timeout);
}
public async waitSuggestion(editorTabTitle: string,
suggestionText: string,
timeout: number = TestConstants.TS_SELENIUM_DEFAULT_TIMEOUT) {
@ -42,9 +53,8 @@ export class Editor {
const suggestionLocator: By = this.getSuggestionLineXpathLocator(suggestionText);
await this.driverHelper.getDriver().wait(async () => {
await this.waitSuggestionContainer();
try {
await this.driverHelper.waitVisibility(suggestionLocator, 5000);
await this.scrollAndSearchSuggestion(editorTabTitle, suggestionLocator);
return true;
} catch (err) {
if (!(err instanceof error.TimeoutError)) {

4
e2e/tests/e2e_happy_path/HappyPath.spec.ts
View File

@ -125,9 +125,7 @@ suite('Language server validation', async () => {
try {
await editor.performKeyCombination(javaFileName, Key.chord(Key.CONTROL, Key.F12));
await editor.waitEditorAvailable(codeNavigationClassName);
}
// workaround for issue: https://github.com/eclipse/che/issues/14520
catch (err) {
} catch (err) {
if (err instanceof error.TimeoutError) {
checkCodeNavigationWithContextMenu();
}