Skip to content

Commit

Permalink
chore: Release 7.79.0
Browse files Browse the repository at this point in the history
Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
  • Loading branch information
mkuznyetsov committed Dec 21, 2023
1 parent 93348b5 commit b33d988
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 62 deletions.
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.79.0
18 changes: 9 additions & 9 deletions tests/e2e/configs/mocharc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ module.exports = {
BASE_TEST_CONSTANTS.TEST_ENVIRONMENT !== ''
? `dist/suites/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_SUITE}.suite.js`
: // variable MOCHA_DIRECTORY uses in command "test-all-devfiles" and sets up automatically.
// you can set it up to run files from specific directory with export environmental variable.
MOCHA_CONSTANTS.MOCHA_DIRECTORY
? // to run one file (name without extension). uses in "test", "test-all-devfiles".
MOCHA_CONSTANTS.MOCHA_USERSTORY
? `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`
: `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/**.spec.js`
: MOCHA_CONSTANTS.MOCHA_USERSTORY
? [`dist/specs/**/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`, `dist/specs/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`]
: ['dist/specs/**/**.spec.js', 'dist/specs/**.spec.js'],
// you can set it up to run files from specific directory with export environmental variable.
MOCHA_CONSTANTS.MOCHA_DIRECTORY
? // to run one file (name without extension). uses in "test", "test-all-devfiles".
MOCHA_CONSTANTS.MOCHA_USERSTORY
? `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`
: `dist/specs/${MOCHA_CONSTANTS.MOCHA_DIRECTORY}/**.spec.js`
: MOCHA_CONSTANTS.MOCHA_USERSTORY
? [`dist/specs/**/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`, `dist/specs/${MOCHA_CONSTANTS.MOCHA_USERSTORY}.spec.js`]
: ['dist/specs/**/**.spec.js', 'dist/specs/**.spec.js'],
retries: MOCHA_CONSTANTS.MOCHA_RETRIES,
grep: MOCHA_CONSTANTS.MOCHA_GREP
};
4 changes: 2 additions & 2 deletions tests/e2e/constants/BASE_TEST_CONSTANTS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export const BASE_TEST_CONSTANTS: {
return BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('devspaces')
? 'devspaces'
: BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('che')
? 'che'
: 'default';
? 'che'
: 'default';
},
/**
* testing application version
Expand Down
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.

5 changes: 3 additions & 2 deletions 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.79.0",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand Down Expand Up @@ -65,7 +65,8 @@
"dependencies": {
"@eclipse-che/api": "latest",
"inversify": "6.0.1",
"reflect-metadata": "0.1.13"
"reflect-metadata": "0.1.13",
"@eclipse-che/che-devworkspace-generator": "7.79.0"
},
"resolutions": {
"minimist": "^1.2.5"
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: 1 addition & 1 deletion tests/e2e/specs/MochaHooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function registerRunningWorkspace(workspaceName: string): void {
: ((): void => {
Logger.debug('delete workspace name');
WorkspaceHandlingTests.clearWorkspaceName();
})();
})();

latestWorkspace = workspaceName;
}
Expand Down
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();
});

});
8 changes: 4 additions & 4 deletions tests/e2e/utils/DevWorkspaceConfigurationHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ export class DevWorkspaceConfigurationHelper {
e.kind === 'DevWorkspace'
? (content.DevWorkspace = e)
: e.kind === 'DevWorkspaceTemplate'
? (content.DevWorkspaceTemplate = e)
: Logger.error(
'Problems with configuration parsing, string should be in format "DevWorkspace\\n---\\nDevWorkspaceTemplate"'
);
? (content.DevWorkspaceTemplate = e)
: Logger.error(
'Problems with configuration parsing, string should be in format "DevWorkspace\\n---\\nDevWorkspaceTemplate"'
);
});

return content;
Expand Down

0 comments on commit b33d988

Please sign in to comment.