Skip to content

Version support and iframe refactoring #3152

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
juliusknorr merged 7 commits into from
Sep 8, 2023
Merged

Version support and iframe refactoring #3152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba45233
chore: refactor iframes to load collabora directly
juliusknorr Jun 11, 2023
2fe5c83
tests(cypress): Avoid wrapped iframe
juliusknorr Aug 31, 2023
33d12bd
fix: Do not reuse query builder
juliusknorr Aug 31, 2023
1d2245e
ci(cypress): Avoid failing on upstream console errors
juliusknorr Aug 31, 2023
360ea4e
test(cypress): Cover some postmessage integrations with cypress tests
juliusknorr Aug 31, 2023
eb70dc1
fix: Cleanup
juliusknorr Aug 31, 2023
e34a607
chore: Fix psalm
juliusknorr Sep 8, 2023
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
Prev Previous commit
Next Next commit
tests(cypress): Avoid wrapped iframe 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Sep 8, 2023
commit 2fe5c837e5bd08a23e863de59e62ea896c74a160
2 changes: 1 addition & 1 deletion cypress/support/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Cypress.Commands.add('waitForViewer', () => {
.and('have.class', 'modal-mask')
.and('not.have.class', 'icon-loading')
})
Cypress.Commands.add('waitForCollabora', (wrapped = true) => {
Cypress.Commands.add('waitForCollabora', (wrapped = false) => {
if (wrapped) {
cy.get('[data-cy="documentframe"]', { timeout: 30000 })
.its('0.contentDocument')
Expand Down
2 changes: 1 addition & 1 deletion src/view/Office.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<iframe :id="iframeId"
ref="documentFrame"
:name="iframeId"
data-cy="documentframe"
data-cy="coolframe"
scrolling="no"
allowfullscreen
class="office-viewer__iframe"
Expand Down