Skip to content

Commit

Permalink
cypress: fix writer/file_properties_spec.js
Browse files Browse the repository at this point in the history 
avoid unreliable waits and be sure we don't use
initial temporary window

Signed-off-by: Szymon Kłos <[email protected]>
Change-Id: If966236df712dd4e6334a401e1426c805769c461
  • Loading branch information
@eszkadev
eszkadev committed Mar 7, 2025
1 parent 61ec240 commit a7f00ac
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 37 deletions.
12 changes: 12 additions & 0 deletions cypress_test/integration_tests/common/writer_helper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,25 @@ function selectAllTextOfDoc() {
function openFileProperties() {
cy.log('>> openFileProperties - start');

cy.cGet('.jsdialog-window').should('not.exist');

cy.cGet('#File-tab-label').then(function(element) {
if (!element.hasClass('selected'))
element.click();

cy.cGet('#File-container .unoSetDocumentProperties').click();
});

// file properties dialog appears 2 times due to embedded tab pages
// do not use it just after first one appears
cy.cGet('.jsdialog-window')
.should('exist')
.then(dialog => {
dialog.remove();
});

cy.cGet('.jsdialog-window').should('exist');

cy.log('<< openFileProperties - end');
}

Expand Down
61 changes: 24 additions & 37 deletions cypress_test/integration_tests/desktop/writer/file_properties_spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,67 +7,58 @@ const desktopHelper = require('../../common/desktop_helper');
describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', function() {

beforeEach(function() {
cy.viewport(1400, 1000);
helper.setupAndLoadDocument('writer/file_properties.odt');
desktopHelper.switchUIToNotebookbar();
});

it('Add File Description.', function() {
writerHelper.openFileProperties();
// Too early click on the 'Description' button would have no effect.
cy.wait(500);

cy.cGet('#tabcontrol-2').click();
helper.waitUntilIdle('#title-input.ui-edit');
cy.cGet('#title-input.ui-edit').type('New Title');
// sometimes it doesn't finish typing
helper.waitUntilIdle('#title-input.ui-edit');

cy.cGet('#title-input.ui-edit').should('be.visible');;
cy.cGet('#title-input.ui-edit').type('New Title');
cy.cGet('#comments.ui-textarea').type('New');

helper.waitUntilIdle('#comments.ui-textarea');
cy.cGet('#ok.ui-pushbutton').click();

writerHelper.openFileProperties();

cy.wait(500);
cy.cGet('#tabcontrol-2').click();
cy.cGet('#title-input.ui-edit').should('have.value', 'New Title');
cy.cGet('#comments.ui-textarea').should('have.value', 'New');

cy.cGet('#cancel.ui-pushbutton').click();
});

it.skip('Add Custom Property.', function() {
it('Add Custom Property.', function() {
writerHelper.openFileProperties();
cy.cGet('#customprops-tab-label').click();
cy.wait(200);
cy.cGet('#tabcontrol-3').click();

// Add property
cy.cGet('.ui-pushbutton', 'Add Property').click();
helper.waitUntilIdle('#namebox');
cy.cGet('#namebox select').select('Mailstop');
cy.cGet('#add.ui-pushbutton').click();
cy.cGet('#namebox-input').type('Mailstop');

helper.waitUntilIdle('#value-input');
cy.cGet('#valueedit-input').type('123 Address');
cy.cGet('#ok.ui-pushbutton').click();

// Check property saved
writerHelper.openFileProperties();
cy.cGet('#customprops-tab-label').click();
cy.cGet('#valueedit-input.ui-edit').should('have.value', '123 Address');
cy.cGet('#tabcontrol-3').click();
cy.cGet('#valueedit-input').should('have.value', '123 Address');

cy.cGet('#cancel.ui-pushbutton').click();
});

it.skip('Add Custom Duration Property.', function() {
it('Add Custom Duration Property.', function() {
writerHelper.openFileProperties();
cy.cGet('#customprops-tab-label').click();
cy.wait(200);
cy.cGet('#tabcontrol-3').click();

// Add property
cy.cGet('.ui-pushbutton', 'Add Property').click();
helper.waitUntilIdle('#namebox');
cy.cGet('#namebox select').select('Received from');
helper.waitUntilIdle('#typebox');
cy.cGet('#typebox select').select('Duration');
cy.cGet('#add.ui-pushbutton').click();
cy.cGet('#namebox-input').type('Received from');
cy.cGet('#typebox-input').select('Duration');
cy.cGet('#durationbutton').click();
cy.cGet('#negative-input').check();
cy.cGet('#years-input').type('1');
Expand All @@ -80,29 +71,25 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', func

// Check property saved
writerHelper.openFileProperties();
cy.cGet('#customprops-tab-label').click();
cy.cGet('#duration-input.ui-edit').should('have.value', '- Y: 1 M: 0 D: 2 H: 0 M: 0 S: 3');
cy.cGet('#tabcontrol-3').click();
cy.cGet('#duration-input').should('have.value', '- Y: 1 M: 0 D: 2 H: 0 M: 0 S: 3');
cy.cGet('#cancel.ui-pushbutton').click();
});

it.skip('Add Custom Yes/No Property.', function() {
it('Add Custom Yes/No Property.', function() {
writerHelper.openFileProperties();
cy.cGet('#customprops-tab-label').click();
cy.wait(200);
cy.cGet('#tabcontrol-3').click();

// Add property
cy.cGet('.ui-pushbutton', 'Add Property').click();
helper.waitUntilIdle('#namebox');
cy.cGet('#namebox select').select('Telephone number');
helper.waitUntilIdle('#typebox');
cy.cGet('#typebox-input select').select('Yes or no');
helper.waitUntilIdle('#yes-input');
cy.cGet('#add.ui-pushbutton').click();
cy.cGet('#namebox-input').type('Telephone number');
cy.cGet('#typebox-input').select('Yes or no');
cy.cGet('#yes-input').check();
cy.cGet('#ok.ui-pushbutton').click();

// Check property saved
writerHelper.openFileProperties();
cy.cGet('#customprops-tab-label').click();
cy.cGet('#tabcontrol-3').click();
cy.cGet('#yes-input').should('be.checked');
cy.cGet('#cancel.ui-pushbutton').click();
});
Expand Down

0 comments on commit a7f00ac

Please sign in to comment.