haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failing cypress test multiuser/writer/annotation_spec.js 

Fixes for several sporadic issues, each uncovering the next
Sidebar was not getting hidden because the button was pressed too soon
 - Wait for sidebar to show before hiding it
Comment text area was disabled
 - Wait for disabled attribute to go away
Second half of comment text was getting sent to document instead of comment
 - Wait after typing in document before inserting comment

Also add wrapper describe block to share setup/teardown
 - Fixes copy/paste errors in one block, which was missing
   calls to selectZoomLevel and setActiveFrame

Signed-off-by: Neil Guertin <neil.guertin@collabora.com>
Change-Id: I13ef1189cfacc4beac0b2c3363c70aa1e8583db3
pull/8831/head
Neil Guertin 2024-04-18 17:01:49 -04:00 committed by Neil Guertin
parent 85024eeb99
commit a5e6a81cdd
2 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cypress_test/integration_tests/common/desktop_helper.js
View File

@ -326,6 +326,7 @@ function insertComment(text = 'some text0', save = true) {
}
// Use .last() because there might be multiple comments
cy.cGet('.cool-annotation').last({log: false}).find('#annotation-modify-textarea-new').should('not.have.attr','disabled');
cy.cGet('.cool-annotation').last({log: false}).find('#annotation-modify-textarea-new').type(text);
// Click outside modify area to trigger update
cy.cGet('.cool-annotation').last({log: false}).find('.cool-annotation-table').click();

51
cypress_test/integration_tests/multiuser/writer/annotation_spec.js
View File

@ -4,7 +4,7 @@ var helper = require('../../common/helper');
var { selectZoomLevel } = require('../../common/desktop_helper');
var desktopHelper = require('../../common/desktop_helper');
describe(['tagmultiuser'], 'Multiuser Annotation Test', function () {
describe(['tagmultiuser'], 'Multiuser Annotation Tests', function () {
var origTestFileName = 'annotation.odt';
var testFileName;
@ -13,10 +13,12 @@ describe(['tagmultiuser'], 'Multiuser Annotation Test', function () {
cy.viewport(2400,800);
desktopHelper.switchUIToNotebookbar();
cy.cSetActiveFrame('#iframe1');
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"]').click(); // Hide sidebar.
cy.cGet('#sidebar-dock-wrapper').should('be.visible');
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"] button').click(); // Hide sidebar.
selectZoomLevel('50');
cy.cSetActiveFrame('#iframe2');
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"]').click(); // Hide sidebar.
cy.cGet('#sidebar-dock-wrapper').should('be.visible');
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"] button').click(); // Hide sidebar.
selectZoomLevel('50');
});
@ -24,6 +26,8 @@ describe(['tagmultiuser'], 'Multiuser Annotation Test', function () {
helper.afterAll(testFileName, this.currentTest.state);
});
describe(['tagmultiuser'], 'Annotation Tests', function () {
it('Insert', function() {
cy.cSetActiveFrame('#iframe1');
desktopHelper.insertComment();
@ -83,26 +87,14 @@ describe(['tagmultiuser'], 'Multiuser Annotation Test', function () {
cy.cSetActiveFrame('#iframe2');
cy.cGet('.cool-annotation-content-wrapper').should('not.exist');
});
});
describe(['tagmultiuser'], 'Multiuser Collapsed Annotation Tests', function() {
var testFileName = 'annotation.odt';
beforeEach(function() {
helper.beforeAll(testFileName, 'writer', undefined, true);
desktopHelper.switchUIToNotebookbar();
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"]').click(); // Hide sidebar.
cy.cSetActiveFrame('#iframe2');
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"]').click(); // Hide sidebar.
});
afterEach(function() {
helper.afterAll(testFileName, this.currentTest.state);
});
describe(['tagmultiuser'], 'Collapsed Annotation Tests', function() {
it('Insert', function() {
cy.cSetActiveFrame('#iframe1');
helper.typeIntoDocument('Hello World');
cy.wait(100);
desktopHelper.insertComment();
cy.cGet('.cool-annotation-content-wrapper').should('exist');
@ -116,6 +108,7 @@ describe(['tagmultiuser'], 'Multiuser Collapsed Annotation Tests', function() {
it('Modify', function() {
cy.cSetActiveFrame('#iframe1');
helper.typeIntoDocument('Hello World');
cy.wait(100);
desktopHelper.insertComment();
cy.cGet('.cool-annotation-content-wrapper').should('exist');
@ -136,6 +129,7 @@ describe(['tagmultiuser'], 'Multiuser Collapsed Annotation Tests', function() {
it('Reply', function() {
cy.cSetActiveFrame('#iframe1');
helper.typeIntoDocument('Hello World');
cy.wait(100);
desktopHelper.insertComment();
cy.cGet('.cool-annotation-content-wrapper').should('exist');
@ -156,6 +150,7 @@ describe(['tagmultiuser'], 'Multiuser Collapsed Annotation Tests', function() {
it('Remove', function() {
cy.cSetActiveFrame('#iframe1');
helper.typeIntoDocument('Hello World');
cy.wait(100);
desktopHelper.insertComment();
cy.cGet('.cool-annotation-content-wrapper').should('exist');
@ -169,28 +164,9 @@ describe(['tagmultiuser'], 'Multiuser Collapsed Annotation Tests', function() {
cy.cGet('.cool-annotation-content-wrapper').should('not.exist');
});
});
describe(['tagmultiuser'], 'Multiuser Annotation Autosave Tests', function() {
var origTestFileName = 'annotation.odt';
var testFileName;
beforeEach(function() {
testFileName = helper.beforeAll(origTestFileName, 'writer', undefined, true);
cy.viewport(2400,800);
desktopHelper.switchUIToNotebookbar();
cy.cSetActiveFrame('#iframe1');
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"]').click(); // Hide sidebar.
selectZoomLevel('50');
cy.cSetActiveFrame('#iframe2');
cy.cGet('#optionscontainer div[id$="SidebarDeck.PropertyDeck"]').click(); // Hide sidebar.
selectZoomLevel('50');
});
afterEach(function() {
helper.afterAll(testFileName, this.currentTest.state);
});
describe(['tagmultiuser'], 'Annotation Autosave Tests', function() {
it('Insert autosave', function() {
cy.cSetActiveFrame('#iframe1');
@ -364,4 +340,5 @@ describe(['tagmultiuser'], 'Multiuser Annotation Autosave Tests', function() {
cy.cGet('#annotation-content-area-2').should('not.exist');
});
});
});