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

Reenable screenshots on cypress failure 

Also remove SCREENSHOT_FOLDER environment variable, this
information is available from Cypress.config(), and if it needs
to change it should be set there.

Signed-off-by: Neil Guertin <neil.guertin@collabora.com>
Change-Id: Idbfb627fa818a6864da355a990dbac2589f8df37
pull/9099/head
Neil Guertin 2024-05-15 09:26:41 -04:00 committed by Michael Meeks
parent a4e84db5b7
commit 36a58aa7ef
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cypress_test/Makefile.am
View File

@ -341,7 +341,7 @@ DESKTOP_CONFIG = \
specPattern=$(DESKTOP_TEST_FOLDER)/**/*_spec.js,supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT)
DESKTOP_ENV = \
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(DESKTOP_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER=$(COOLWSD_SERVER),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),SCREENSHOT_FOLDER=$(abs_srcdir)/cypress/screenshots,IMAGES_FOLDER=$(abs_top_srcdir)/browser/images/help/en/
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),DATA_WORKDIR=$(DESKTOP_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER=$(COOLWSD_SERVER),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),IMAGES_FOLDER=$(abs_top_srcdir)/browser/images/help/en/
DESKTOP_INCLUDE_TAGS = \
tagdesktop,$(A11Y_TAG)
@ -406,7 +406,7 @@ IDLE_CONFIG = \
specPattern=$(IDLE_TEST_FOLDER)/**/*_spec.js,supportFile=$(SUPPORT_FILE),userAgent=$(IDLE_USER_AGENT)
IDLE_ENV = \
DATA_FOLDER=$(IDLE_DATA_FOLDER),DATA_WORKDIR=$(IDLE_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER=$(COOLWSD_SERVER),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),SCREENSHOT_FOLDER=$(abs_srcdir)/cypress/screenshots,IMAGES_FOLDER=$(abs_top_srcdir)/browser/images/help/en/
DATA_FOLDER=$(IDLE_DATA_FOLDER),DATA_WORKDIR=$(IDLE_DATA_WORKDIR),WSD_VERSION_HASH=$(COOLWSD_VERSION_HASH),SERVER=$(COOLWSD_SERVER),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)",INTEGRATION=$(CYPRESS_INTEGRATION),IMAGES_FOLDER=$(abs_top_srcdir)/browser/images/help/en/
IDLE_INCLUDE_TAGS = \
tagdesktop,$(A11Y_TAG)

2
cypress_test/cypress.config.ts
View File

@ -10,7 +10,7 @@ export default defineConfig({
modifyObstructiveCode: false,
fixturesFolder: 'data',
chromeWebSecurity: false,
screenshotOnRunFailure: false,
screenshotOnRunFailure: true,
env: { USER_INTERFACE: process.env.USER_INTERFACE },
retries: {
runMode: 1,

2
cypress_test/integration_tests/desktop/calc/help_dialog_update_spec.js
View File

@ -34,7 +34,7 @@ describe(['tagscreenshot'], 'Help dialog update', function() {
cy.cGet('#main-document-content').screenshot('chart-wizard');
cy.task('copyFile', {
sourceDir: Cypress.env('SCREENSHOT_FOLDER')+ '/calc/help_dialog_update_spec.js/',
sourceDir: Cypress.config('screenshotsFolder') + '/calc/help_dialog_update_spec.js/',
destDir: Cypress.env('IMAGES_FOLDER'),
fileName: 'chart-wizard.png',
});

4
cypress_test/integration_tests/desktop/writer/help_dialog_update_spec.js
View File

@ -16,7 +16,7 @@ describe(['tagscreenshot'], 'Help dialog screenshot updation', function() {
function copyScreenshot(fileName) {
cy.task('copyFile', {
sourceDir: Cypress.env('SCREENSHOT_FOLDER')+ '/writer/help_dialog_update_spec.js/',
sourceDir: Cypress.config('screenshotsFolder') + '/writer/help_dialog_update_spec.js/',
destDir: Cypress.env('IMAGES_FOLDER'),
fileName: fileName,
});
@ -31,7 +31,7 @@ describe(['tagscreenshot'], 'Help dialog screenshot updation', function() {
var width = w2 - w1;
cy.log('w1 w2 ' + w1 + ' ' + w2);
cy.cGet('#toolbar-down').screenshot('status-bar', { clip: { x: 0, y: 0, height: 300, width: width } });
cy.log(Cypress.env('SCREENSHOT_FOLDER'), Cypress.env('IMAGES_FOLDER'));
cy.log(Cypress.config('screenshotsFolder'), Cypress.env('IMAGES_FOLDER'));
copyScreenshot('status-bar.png');
});
});