Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Bump to 7.80.0-next in main #22746

Merged
merged 1 commit into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ body:
label: Che version
description: if workspace is running, version can be obtained with help/about menu
options:
- "7.78@latest"
- "7.79@latest"
- "next (development version)"
- "7.78"
- "7.77"
- "7.75"
- "7.74"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.79.0-next
7.80.0-next
4 changes: 2 additions & 2 deletions tests/e2e/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-che/che-e2e",
"version": "7.79.0-next",
"version": "7.80.0-next",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand Down
76 changes: 38 additions & 38 deletions tests/e2e/pageobjects/dashboard/UserPreferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,70 +20,70 @@ export class UserPreferences {
private static readonly USER_PREFERENCES_BUTTON: By = By.xpath('//button[text()="User Preferences"]');
private static readonly USER_PREFERENCES_PAGE: By = By.xpath('//h1[text()="User Preferences"]');

private static readonly CONTAINER_REGISTRIES_TAB: By = By.xpath('//button[text()="Container Registries"]');
private static readonly GIT_SERVICES_TAB: By = By.xpath('//button[text()="Git Services"]');
private static readonly CONTAINER_REGISTRIES_TAB: By = By.xpath('//button[text()="Container Registries"]');
private static readonly GIT_SERVICES_TAB: By = By.xpath('//button[text()="Git Services"]');

private static readonly PAT_TAB: By = By.xpath('//button[text()="Personal Access Tokens"]');
private static readonly ADD_NEW_PAT_BUTTON: By = By.xpath('//button[text()="Add Personal Access Token"]');
private static readonly PAT_TAB: By = By.xpath('//button[text()="Personal Access Tokens"]');
private static readonly ADD_NEW_PAT_BUTTON: By = By.xpath('//button[text()="Add Personal Access Token"]');

private static readonly GIT_CONFIG_PAGE: By = By.xpath('//button[text()="Gitconfig"]');
private static readonly GIT_CONFIG_PAGE: By = By.xpath('//button[text()="Gitconfig"]');

private static readonly SSH_KEY_TAB: By = By.xpath('//button[text()="SSH Keys"]');
private static readonly ADD_NEW_SSH_KEY_BUTTON: By = By.xpath('//button[text()="Add SSH Key"]');
private static readonly SSH_KEY_TAB: By = By.xpath('//button[text()="SSH Keys"]');
private static readonly ADD_NEW_SSH_KEY_BUTTON: By = By.xpath('//button[text()="Add SSH Key"]');

constructor(
@inject(CLASSES.DriverHelper)
readonly driverHelper: DriverHelper
) {}

async openUserPreferencesPage(): Promise<void> {
Logger.debug();
Logger.debug();

await this.driverHelper.waitAndClick(UserPreferences.USER_SETTINGS_DROPDOWN);
await this.driverHelper.waitAndClick(UserPreferences.USER_PREFERENCES_BUTTON);

await this.driverHelper.waitVisibility(UserPreferences.USER_PREFERENCES_PAGE);
}

async checkTabsAvailability(): Promise<void> {
Logger.debug();
async checkTabsAvailability(): Promise<void> {
Logger.debug();

await this.openContainerRegistriesTab();
await this.openGitServicesTab();
await this.openPatTab();
await this.openGitConfigPage();
await this.openSshKeyTab();
}
await this.openContainerRegistriesTab();
await this.openGitServicesTab();
await this.openPatTab();
await this.openGitConfigPage();
await this.openSshKeyTab();
}

async openContainerRegistriesTab(): Promise<void> {
Logger.debug();
async openContainerRegistriesTab(): Promise<void> {
Logger.debug();

await this.driverHelper.waitAndClick(UserPreferences.CONTAINER_REGISTRIES_TAB);
}
await this.driverHelper.waitAndClick(UserPreferences.CONTAINER_REGISTRIES_TAB);
}

async openGitServicesTab(): Promise<void> {
Logger.debug();
async openGitServicesTab(): Promise<void> {
Logger.debug();

await this.driverHelper.waitAndClick(UserPreferences.GIT_SERVICES_TAB);
}
await this.driverHelper.waitAndClick(UserPreferences.GIT_SERVICES_TAB);
}

async openPatTab(): Promise<void> {
Logger.debug();
async openPatTab(): Promise<void> {
Logger.debug();

await this.driverHelper.waitAndClick(UserPreferences.PAT_TAB);
await this.driverHelper.waitVisibility(UserPreferences.ADD_NEW_PAT_BUTTON);
}
await this.driverHelper.waitAndClick(UserPreferences.PAT_TAB);
await this.driverHelper.waitVisibility(UserPreferences.ADD_NEW_PAT_BUTTON);
}

async openGitConfigPage(): Promise<void> {
Logger.debug();
async openGitConfigPage(): Promise<void> {
Logger.debug();

await this.driverHelper.waitAndClick(UserPreferences.GIT_CONFIG_PAGE);
}
await this.driverHelper.waitAndClick(UserPreferences.GIT_CONFIG_PAGE);
}

async openSshKeyTab(): Promise<void> {
Logger.debug();
async openSshKeyTab(): Promise<void> {
Logger.debug();

await this.driverHelper.waitAndClick(UserPreferences.SSH_KEY_TAB);
await this.driverHelper.waitVisibility(UserPreferences.ADD_NEW_SSH_KEY_BUTTON);
}
await this.driverHelper.waitAndClick(UserPreferences.SSH_KEY_TAB);
await this.driverHelper.waitVisibility(UserPreferences.ADD_NEW_SSH_KEY_BUTTON);
}
}
2 changes: 0 additions & 2 deletions tests/e2e/specs/miscellaneous/UserPreferencesTest.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { LoginTests } from '../../tests-library/LoginTests';
import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
import { UserPreferences } from '../../pageobjects/dashboard/UserPreferences';


suite(`"Check User Preferences page" test ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
const userPreferences: UserPreferences = e2eContainer.get(CLASSES.UserPreferences);
Expand All @@ -26,5 +25,4 @@ suite(`"Check User Preferences page" test ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT
await userPreferences.openUserPreferencesPage();
await userPreferences.checkTabsAvailability();
});

});
Loading