Fix unstable 2E2 tests (#68)

* Added workaround

* fixed yolo format test

* applied comment

* removed logout intercept
main
Kirill Lakhov 4 years ago committed by GitHub
parent 164c2c34df
commit 7a33fc0339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -310,6 +310,8 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
formatsInitialized, formatsInitialized,
modelsInitialized, modelsInitialized,
organizationsInitialized, organizationsInitialized,
userAgreementsInitialized,
authActionsInitialized,
switchShortcutsDialog, switchShortcutsDialog,
switchSettingsDialog, switchSettingsDialog,
user, user,
@ -318,14 +320,18 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
isModelPluginActive, isModelPluginActive,
} = this.props; } = this.props;
const readyForRender = const notRegisteredUserInitialized = (userInitialized && (user == null || !user.isVerified));
(userInitialized && (user == null || !user.isVerified)) || let readyForRender = userAgreementsInitialized && authActionsInitialized;
(userInitialized && readyForRender = readyForRender && (notRegisteredUserInitialized ||
(
userInitialized &&
formatsInitialized && formatsInitialized &&
pluginsInitialized && pluginsInitialized &&
aboutInitialized && aboutInitialized &&
organizationsInitialized && organizationsInitialized &&
(!isModelPluginActive || modelsInitialized)); (!isModelPluginActive || modelsInitialized)
)
);
const subKeyMap = { const subKeyMap = {
SWITCH_SHORTCUTS: keyMap.SWITCH_SHORTCUTS, SWITCH_SHORTCUTS: keyMap.SWITCH_SHORTCUTS,

@ -114,7 +114,7 @@ function ExportDatasetModal(): JSX.Element {
label='Export format' label='Export format'
rules={[{ required: true, message: 'Format must be selected' }]} rules={[{ required: true, message: 'Format must be selected' }]}
> >
<Select placeholder='Select dataset format' className='cvat-modal-export-select'> <Select virtual={false} placeholder='Select dataset format' className='cvat-modal-export-select'>
{dumpers {dumpers
.sort((a: any, b: any) => a.name.localeCompare(b.name)) .sort((a: any, b: any) => a.name.localeCompare(b.name))
.filter((dumper: any): boolean => dumper.dimension === instance?.dimension) .filter((dumper: any): boolean => dumper.dimension === instance?.dimension)

@ -102,10 +102,6 @@ context('New organization pipeline.', () => {
cy.logout(); cy.logout();
for (const user of Object.values(users)) { for (const user of Object.values(users)) {
// When we continuously register users, elements on login/register page become detached from DOM
// because of our re-renders after additional requests, waiting is workaround for this issue
// https://github.com/cypress-io/cypress/issues/7306
cy.wait(1000);
cy.goToRegisterPage(); cy.goToRegisterPage();
cy.userRegistration( cy.userRegistration(
user.firstName, user.firstName,

@ -72,9 +72,8 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox
.not('.ant-select-dropdown-hidden') .not('.ant-select-dropdown-hidden')
.within(() => { .within(() => {
cy.get('.rc-virtual-list-holder') cy.get('.rc-virtual-list-holder')
.trigger('wheel', { deltaY: 1000 })
.trigger('wheel', { deltaY: 1000 })
.contains('.cvat-modal-export-option-item', dumpType) .contains('.cvat-modal-export-option-item', dumpType)
.scrollIntoView()
.should('be.visible') .should('be.visible')
.click(); .click();
}); });

@ -35,9 +35,9 @@ Cypress.Commands.add('logout', (username = Cypress.env('user')) => {
}); });
cy.get('span[aria-label="logout"]').click(); cy.get('span[aria-label="logout"]').click();
cy.url().should('include', '/auth/login'); cy.url().should('include', '/auth/login');
cy.intercept('/auth/login').as('login'); cy.visit('/auth/login');
cy.visit('/auth/login'); // clear query parameter "next" cy.url().should('not.include', '?next=');
cy.wait('@login').then(() => cy.contains('Login').should('exist')); cy.contains('Login').should('exist');
}); });
Cypress.Commands.add('userRegistration', (firstName, lastName, userName, emailAddr, password) => { Cypress.Commands.add('userRegistration', (firstName, lastName, userName, emailAddr, password) => {

Loading…
Cancel
Save