Skip to content

Refactor version comparison #2878

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
mejo- merged 9 commits into from
Oct 22, 2026
Merged

Refactor version comparison #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5e7755e
refactor(versions): compare page versions in the viewer
mejo- Oct 19, 2026
09cb539
feat(versions): select two versions to compare
mejo- Oct 19, 2026
8550875
test(versions): migrate page versions tests to Playwright
mejo- Oct 19, 2026
42608be
fix(viewer): pass decoded sources of page versions to the viewer
mejo- Oct 19, 2026
5fba96e
fix(viewer): keep the sidebar tab when the viewer shows a file next t…
mejo- Oct 19, 2026
6f9ac3b
fix(versions): close the viewer before comparing other versions
mejo- Oct 19, 2026
1946346
feat(versions): name the compared versions in the viewer
mejo- Oct 20, 2026
45491ce
fix(versions): save the page before comparing the current version
mejo- Oct 22, 2026
ead8273
fix(versions): resolve attachments when comparing in the Viewer app
mejo- Oct 22, 2026
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
8 changes: 0 additions & 8 deletions .github/workflows/cypress-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,8 @@ jobs:
include:
- server-versions: 'stable33'
server-major: '33'
semantic-e2e: '0'
- server-versions: 'master'
server-major: ''
semantic-e2e: '1'

env:
PUPPETEER_SKIP_DOWNLOAD: true
Expand Down Expand Up @@ -188,11 +186,6 @@ jobs:
php-versions: ['8.4']
databases: ['sqlite']
server-versions: ['stable33', 'master']
include:
- server-versions: 'stable33'
semantic-e2e: '0'
- server-versions: 'master'
semantic-e2e: '1'

name: runner ${{ matrix.containers }} (${{ matrix.server-versions }})

Expand Down Expand Up @@ -275,7 +268,6 @@ jobs:
npx cypress run --record false --config defaultCommandTimeout=20000,video=false
env:
CYPRESS_ncVersion: ${{ matrix.server-versions }}
CYPRESS_semanticE2E: ${{ matrix.semantic-e2e }}
# `SPLIT` needs to match count of `containers` in the matrix above
SPLIT: 4
SPLIT_INDEX: ${{ env.container_index }}
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/playwright.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ jobs:
server-branch: ['stable33', 'master']
shardIndex: [1, 2, 3, 4]
shardTotal: [4]
include:
- server-branch: 'stable33'
project-args: '--project=chromium --project=comparison-viewer-chromium'
semantic-e2e: '0'
- server-branch: 'master'
project-args: '--project=chromium --project=comparison-chromium'
semantic-e2e: '1'
steps:
- name: Checkout app
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -63,12 +56,11 @@ jobs:
npm run build --if-present

- name: Install Playwright Browsers
run: npx playwright install --with-deps chromium
run: npx playwright install chromium --only-shell

- name: Run Playwright tests
run: npx playwright test ${{ matrix.project-args }} --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
env:
COLLECTIVES_SEMANTIC_E2E: ${{ matrix.semantic-e2e }}
PLAYWRIGHT_NC_SERVER_BRANCH: ${{ matrix.server-branch }}

- name: Upload results
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ css/*

# Cypress test artifacts
cypress/downloads/
cypress/results/
cypress/screenshots/
cypress/videos/

Expand Down
8 changes: 1 addition & 7 deletions cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,23 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import vue from '@vitejs/plugin-vue'
import { defineConfig } from 'cypress'
import cypressSplit from 'cypress-split'
import vitePreprocessor from 'cypress-vite'

const SEMANTIC_E2E = process.env.CYPRESS_semanticE2E === '1'

export default defineConfig({
viewportWidth: 1280,
viewportHeight: 900,
e2e: {
setupNodeEvents(on, config) {
on('file:preprocessor', vitePreprocessor({ configFile: false, plugins: [vue()] }))
on('file:preprocessor', vitePreprocessor({ configFile: false }))
cypressSplit(on, config)
return config
},

baseUrl: 'http://localhost:8081/index.php/',
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
},
expose: {
semanticE2E: SEMANTIC_E2E,
},
defaultCommandTimeout: 7000,
retries: {
runMode: 2,
Expand Down
Loading
Loading