Skip to content

[Test] Fix up 'factory' E2E tests when use public repository #23617

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.

Sign up for GitHub

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

Merged
artaleks9 merged 22 commits into from
Oct 29, 2025
Merged

[Test] Fix up 'factory' E2E tests when use public repository #23617

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bf09f3f
Fix up 'factory' E2E tests
artaleks9 Oct 13, 2025
ef57f7e
Merge branch 'main' of github.com:eclipse/che into che#22597
artaleks9 Oct 15, 2025
b434011
Update test scenario 'NoSetupRepoFactory'
artaleks9 Oct 16, 2025
6e72220
Fix up package.json
artaleks9 Oct 16, 2025
671a2f6
Merge branch 'main' of github.com:eclipse/che into che#22597
artaleks9 Oct 16, 2025
f9af7e3
Update 'RefusedOAuthFactory' E2E test
artaleks9 Oct 17, 2025
44e5b7b
Do formatting
artaleks9 Oct 17, 2025
13a1bc7
Fix up
artaleks9 Oct 17, 2025
2dbdc3c
Fix up: remove redundant step
artaleks9 Oct 19, 2025
796552c
Fix up
artaleks9 Oct 19, 2025
ff9ccb0
Create 'SourceControlModule' pageobject
artaleks9 Oct 26, 2025
be35281
Updates 'factory' components
artaleks9 Oct 26, 2025
d9a7653
Fix up
artaleks9 Oct 26, 2025
5d0edba
Create 'DialogBoxGitHubExtension' pageobject
artaleks9 Oct 27, 2025
f0e8d2d
Add comment to method
artaleks9 Oct 27, 2025
93ab60d
Fix up locator
artaleks9 Oct 27, 2025
603c2b9
Update 'factory' E2E tests
artaleks9 Oct 27, 2025
12e94e8
Fix up
artaleks9 Oct 28, 2025
e4972dd
Fix up method
artaleks9 Oct 28, 2025
61d567f
Rename pageobjects
artaleks9 Oct 29, 2025
f34f922
Update 'factory' tests
artaleks9 Oct 29, 2025
a3c9433
Fix merge conflicts
artaleks9 Oct 29, 2025
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
77 changes: 7 additions & 70 deletions tests/e2e/specs/factory/NoSetupRepoFactory.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { e2eContainer } from '../../configs/inversify.config';
import {
ActivityBar,
ContextMenu,
InputBox,
Key,
Locators,
ModalDialog,
Expand All @@ -34,8 +33,7 @@ import { DriverHelper } from '../../utils/DriverHelper';
import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
import { Logger } from '../../utils/Logger';
import { LoginTests } from '../../tests-library/LoginTests';
import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
import { CreateWorkspace } from '../../pageobjects/dashboard/CreateWorkspace';
Expand Down Expand Up @@ -65,8 +63,7 @@ suite(
const timeToRefresh: number = 1500;
const changesToCommit: string = new Date().getTime().toString();
const fileToChange: string = 'Date.txt';
const pushItemLabel: string = 'Push';
const commitChangesButtonLabel: string = `Commit Changes on "${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
const dialogText: string = 'Make sure you configure your "user.name" and "user.email" in git.';
const refreshButtonLabel: string = 'Refresh';
const label: string = BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
let testRepoProjectName: string;
Expand Down Expand Up @@ -191,71 +188,11 @@ suite(
Logger.debug('Press Enter to commit the changes');
await driverHelper.getDriver().actions().keyDown(Key.CONTROL).sendKeys(Key.ENTER).keyUp(Key.CONTROL).perform();
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
await driverHelper.wait(timeToRefresh);
Comment thread
dmytro-ndp marked this conversation as resolved.
Resolved
Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
// wait while changes counter will be refreshed
await driverHelper.wait(timeToRefresh);
const changes: number = await scmProvider.getChangeCount();
Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
expect(changes).eql(0);
});

test('Push the changes', async function (): Promise<void> {
await driverHelper.waitVisibility(
webCheCodeLocators.ScmView.actionConstructor(
`Push 1 commits to origin/${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`
)
);
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
Logger.debug('scmProvider.openMoreActions');
scmContextMenu = await scmProvider.openMoreActions();
await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.itemConstructor(pushItemLabel));
Logger.debug(`scmContextMenu.select: "${pushItemLabel}"`);
await scmContextMenu.select(pushItemLabel);
});

if (FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER === GitProviderType.GITHUB) {
test('Decline GitHub Extension', async function (): Promise<void> {
await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details);
const gitHaExtensionDialog: ModalDialog = new ModalDialog();
await gitHaExtensionDialog.pushButton('Cancel');
});
}

test('Insert git credentials which were asked after push', async function (): Promise<void> {
try {
await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
} catch (e) {
Logger.info(`Workspace did not ask credentials before push - ${e};
Known issue for github.com - https://issues.redhat.com/browse/CRW-4066, please check if not other git provider. `);
expect(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
}
const input: InputBox = new InputBox();
await input.setText(OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_USERNAME);
await input.confirm();
await driverHelper.wait(timeToRefresh);
await input.setText(OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
await input.confirm();
await driverHelper.wait(timeToRefresh);
});

test('Check if the changes were pushed', async function (): Promise<void> {
try {
Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
} catch (e) {
Logger.info(
'Check you use correct credentials.' +
'For bitbucket.org ensure you use an app password: https://support.atlassian.com/bitbucket-cloud/docs/using-app-passwords/;' +
'For github.com - personal access token instead of password.'
);
}
const isCommitButtonDisabled: string = await driverHelper.waitAndGetElementAttribute(
webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel),
'aria-disabled'
);
expect(isCommitButtonDisabled).to.be.true;
Comment thread
dmytro-ndp marked this conversation as resolved.
Resolved
await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details);
const modalDialog: ModalDialog = new ModalDialog();
const messageDetails: string = await modalDialog.getDetails();
Logger.debug(`modalDialog.getDetails: "${messageDetails}"`);
expect(messageDetails).to.contain(dialogText);
});
}

Expand Down
70 changes: 8 additions & 62 deletions tests/e2e/specs/factory/RefusedOAuthFactory.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { e2eContainer } from '../../configs/inversify.config';
import {
ActivityBar,
ContextMenu,
InputBox,
Key,
Locators,
ModalDialog,
NewScmView,
SingleScmProvider,
ViewControl,
Expand All @@ -33,9 +33,8 @@ import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
import { StringUtil } from '../../utils/StringUtil';
import { Logger } from '../../utils/Logger';
import { LoginTests } from '../../tests-library/LoginTests';
import { OAUTH_CONSTANTS } from '../../constants/OAUTH_CONSTANTS';
import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
import { FACTORY_TEST_CONSTANTS, GitProviderType } from '../../constants/FACTORY_TEST_CONSTANTS';
import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
import { CreateWorkspace } from '../../pageobjects/dashboard/CreateWorkspace';
Expand Down Expand Up @@ -67,9 +66,8 @@ suite(
const timeToRefresh: number = 1500;
const changesToCommit: string = new Date().getTime().toString();
const fileToChange: string = 'Date.txt';
const commitChangesButtonLabel: string = `Commit Changes on "${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}"`;
const dialogText: string = 'Make sure you configure your "user.name" and "user.email" in git.';
Comment thread
dmytro-ndp marked this conversation as resolved.
Resolved
const refreshButtonLabel: string = 'Refresh';
const pushItemLabel: string = 'Push';
const label: string = BASE_TEST_CONSTANTS.TS_SELENIUM_PROJECT_ROOT_FILE_NAME;
let testRepoProjectName: string;
const isPrivateRepo: string = FACTORY_TEST_CONSTANTS.TS_SELENIUM_IS_PRIVATE_FACTORY_GIT_REPO ? 'private' : 'public';
Expand Down Expand Up @@ -197,63 +195,11 @@ suite(
Logger.debug('Press Enter to commit the changes');
await driverHelper.getDriver().actions().keyDown(Key.CONTROL).sendKeys(Key.ENTER).keyUp(Key.CONTROL).perform();
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
await driverHelper.wait(timeToRefresh);
Comment thread
dmytro-ndp marked this conversation as resolved.
Resolved
Logger.debug(`wait and click on: "${refreshButtonLabel}"`);
await driverHelper.waitAndClick(webCheCodeLocators.ScmView.actionConstructor(refreshButtonLabel));
// wait while changes counter will be refreshed
await driverHelper.wait(timeToRefresh);
const changes: number = await scmProvider.getChangeCount();
Logger.debug(`scmProvider.getChangeCount: number of changes is "${changes}"`);
expect(changes).eql(0);
});

test('Push the changes', async function (): Promise<void> {
await driverHelper.waitVisibility(
webCheCodeLocators.ScmView.actionConstructor(
`Push 1 commits to origin/${FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_BRANCH}`
)
);
await driverHelper.waitVisibility(webCheCodeLocators.ScmView.more);
Logger.debug('scmProvider.openMoreActions');
scmContextMenu = await scmProvider.openMoreActions();
await driverHelper.waitVisibility(webCheCodeLocators.ContextMenu.itemConstructor(pushItemLabel));
Logger.debug(`scmContextMenu.select: "${pushItemLabel}"`);
await scmContextMenu.select(pushItemLabel);
});

test('Insert git credentials which were asked after push', async function (): Promise<void> {
try {
await driverHelper.waitVisibility(webCheCodeLocators.InputBox.message);
} catch (e) {
Logger.info(`Workspace did not ask credentials before push - ${e};
Known issue for github.com - https://issues.redhat.com/browse/CRW-4066, please check if not other git provider. `);
expect(FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_PROVIDER).eqls(GitProviderType.GITHUB);
}
const input: InputBox = new InputBox();
await input.setText(OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_USERNAME);
await input.confirm();
await driverHelper.wait(timeToRefresh);
await input.setText(OAUTH_CONSTANTS.TS_SELENIUM_GIT_PROVIDER_PASSWORD);
await input.confirm();
await driverHelper.wait(timeToRefresh);
});

test('Check if the changes were pushed', async function (): Promise<void> {
try {
Logger.debug(`scmProvider.takeAction: "${refreshButtonLabel}"`);
await scmProvider.takeAction(refreshButtonLabel);
} catch (e) {
Logger.info(
'Check you use correct credentials.' +
'For bitbucket.org ensure you use an app password: https://support.atlassian.com/bitbucket-cloud/docs/using-app-passwords/;' +
'For github.com - personal access token instead of password.'
);
}
const isCommitButtonDisabled: string = await driverHelper.waitAndGetElementAttribute(
webCheCodeLocators.ScmView.actionConstructor(commitChangesButtonLabel),
'aria-disabled'
);
expect(isCommitButtonDisabled).to.be.true;
Comment thread
dmytro-ndp marked this conversation as resolved.
Resolved
await driverHelper.waitVisibility(webCheCodeLocators.Dialog.details);
const modalDialog: ModalDialog = new ModalDialog();
const messageDetails: string = await modalDialog.getDetails();
Logger.debug(`modalDialog.getDetails: "${messageDetails}"`);
expect(messageDetails).to.contain(dialogText);
});
}

Expand Down