From b33d9885bd3adf2b8a26ff5a0a3958b5b25c4578 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Thu, 21 Dec 2023 14:06:30 +0000 Subject: [PATCH] chore: Release 7.79.0 Signed-off-by: Mykhailo Kuznietsov --- .github/ISSUE_TEMPLATE/bug_report.yml | 3 +- VERSION | 2 +- tests/e2e/configs/mocharc.ts | 18 ++--- tests/e2e/constants/BASE_TEST_CONSTANTS.ts | 4 +- tests/e2e/package-lock.json | 4 +- tests/e2e/package.json | 5 +- .../pageobjects/dashboard/UserPreferences.ts | 76 +++++++++---------- tests/e2e/specs/MochaHooks.ts | 2 +- .../miscellaneous/UserPreferencesTest.spec.ts | 2 - .../utils/DevWorkspaceConfigurationHelper.ts | 8 +- 10 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index fa4b4abb690..d8288f1d9c4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -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" diff --git a/VERSION b/VERSION index 12aebec0966..33654fc6887 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.79.0-next +7.79.0 diff --git a/tests/e2e/configs/mocharc.ts b/tests/e2e/configs/mocharc.ts index bb9ef2ce867..7cc86c71074 100644 --- a/tests/e2e/configs/mocharc.ts +++ b/tests/e2e/configs/mocharc.ts @@ -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 }; diff --git a/tests/e2e/constants/BASE_TEST_CONSTANTS.ts b/tests/e2e/constants/BASE_TEST_CONSTANTS.ts index 5f9b320d124..86b38cd0cdb 100644 --- a/tests/e2e/constants/BASE_TEST_CONSTANTS.ts +++ b/tests/e2e/constants/BASE_TEST_CONSTANTS.ts @@ -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 diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json index 30ae8be0df7..4f3f77da54b 100644 --- a/tests/e2e/package-lock.json +++ b/tests/e2e/package-lock.json @@ -1,12 +1,12 @@ { "name": "@eclipse-che/che-e2e", - "version": "7.79.0-next", + "version": "7.79.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@eclipse-che/che-e2e", - "version": "7.79.0-next", + "version": "7.79.0", "license": "ISC", "dependencies": { "@eclipse-che/api": "latest", diff --git a/tests/e2e/package.json b/tests/e2e/package.json index fe2944e1f59..9e8fd5a49f8 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-che/che-e2e", - "version": "7.79.0-next", + "version": "7.79.0", "description": "", "main": "dist/index.js", "scripts": { @@ -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" diff --git a/tests/e2e/pageobjects/dashboard/UserPreferences.ts b/tests/e2e/pageobjects/dashboard/UserPreferences.ts index d0a5c560748..d607508ef5f 100644 --- a/tests/e2e/pageobjects/dashboard/UserPreferences.ts +++ b/tests/e2e/pageobjects/dashboard/UserPreferences.ts @@ -20,16 +20,16 @@ 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) @@ -37,7 +37,7 @@ export class UserPreferences { ) {} async openUserPreferencesPage(): Promise { - Logger.debug(); + Logger.debug(); await this.driverHelper.waitAndClick(UserPreferences.USER_SETTINGS_DROPDOWN); await this.driverHelper.waitAndClick(UserPreferences.USER_PREFERENCES_BUTTON); @@ -45,45 +45,45 @@ export class UserPreferences { await this.driverHelper.waitVisibility(UserPreferences.USER_PREFERENCES_PAGE); } - async checkTabsAvailability(): Promise { - Logger.debug(); + async checkTabsAvailability(): Promise { + 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 { - Logger.debug(); + async openContainerRegistriesTab(): Promise { + Logger.debug(); - await this.driverHelper.waitAndClick(UserPreferences.CONTAINER_REGISTRIES_TAB); - } + await this.driverHelper.waitAndClick(UserPreferences.CONTAINER_REGISTRIES_TAB); + } - async openGitServicesTab(): Promise { - Logger.debug(); + async openGitServicesTab(): Promise { + Logger.debug(); - await this.driverHelper.waitAndClick(UserPreferences.GIT_SERVICES_TAB); - } + await this.driverHelper.waitAndClick(UserPreferences.GIT_SERVICES_TAB); + } - async openPatTab(): Promise { - Logger.debug(); + async openPatTab(): Promise { + 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 { - Logger.debug(); + async openGitConfigPage(): Promise { + Logger.debug(); - await this.driverHelper.waitAndClick(UserPreferences.GIT_CONFIG_PAGE); - } + await this.driverHelper.waitAndClick(UserPreferences.GIT_CONFIG_PAGE); + } - async openSshKeyTab(): Promise { - Logger.debug(); + async openSshKeyTab(): Promise { + 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); + } } diff --git a/tests/e2e/specs/MochaHooks.ts b/tests/e2e/specs/MochaHooks.ts index 2477a518f87..0eb7caca40a 100644 --- a/tests/e2e/specs/MochaHooks.ts +++ b/tests/e2e/specs/MochaHooks.ts @@ -38,7 +38,7 @@ export function registerRunningWorkspace(workspaceName: string): void { : ((): void => { Logger.debug('delete workspace name'); WorkspaceHandlingTests.clearWorkspaceName(); - })(); + })(); latestWorkspace = workspaceName; } diff --git a/tests/e2e/specs/miscellaneous/UserPreferencesTest.spec.ts b/tests/e2e/specs/miscellaneous/UserPreferencesTest.spec.ts index 90344449303..c4f28353760 100644 --- a/tests/e2e/specs/miscellaneous/UserPreferencesTest.spec.ts +++ b/tests/e2e/specs/miscellaneous/UserPreferencesTest.spec.ts @@ -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); @@ -26,5 +25,4 @@ suite(`"Check User Preferences page" test ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT await userPreferences.openUserPreferencesPage(); await userPreferences.checkTabsAvailability(); }); - }); diff --git a/tests/e2e/utils/DevWorkspaceConfigurationHelper.ts b/tests/e2e/utils/DevWorkspaceConfigurationHelper.ts index 54d131eded4..c2289ebd5ba 100644 --- a/tests/e2e/utils/DevWorkspaceConfigurationHelper.ts +++ b/tests/e2e/utils/DevWorkspaceConfigurationHelper.ts @@ -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;