Skip to content
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.

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

Bump django-tinymce from 3.5.0 to 4.1.0 #4210

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 1 addition & 12 deletions cypress/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion cypress/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"dependencies": {
"@foreachbe/cypress-tinymce": "^1.0.0",
"cypress": "^9.5.1"
}
}
14 changes: 14 additions & 0 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,18 @@ Cypress.Commands.add('loginByCSRF', (username, password) => {

Cypress.Commands.add('mockTiles', (username, password) => {
cy.intercept("https://*.tile.opentopomap.org/*/*/*.png", {fixture: "images/tile.png"}).as("tiles");
});

Cypress.Commands.add('setTinyMceContent', (tinyMceId, content) => {
cy.window().then((win) => {
const editor = win.tinymce.get(tinyMceId);
editor.setContent(content);
});
});

Cypress.Commands.add('getTinyMceContent', (tinyMceId, content) => {
cy.window().then((win) => {
const editor = win.tinymce.get(tinyMceId);
return editor.getContent();
});
});
3 changes: 1 addition & 2 deletions cypress/support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@
import './commands'

// Alternatively you can use CommonJS syntax:
// require('./commands')
import '@foreachbe/cypress-tinymce'
// require('./commands')
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ django==4.2.16
# django-leaflet
# django-modelcluster
# django-modeltranslation
# django-tinymce
# django-treebeard
# django-weasyprint
# djangorestframework
Expand Down Expand Up @@ -158,7 +159,7 @@ django-modeltranslation==0.18.11
# via mapentity
django-mptt==0.14.0
# via geotrek (setup.py)
django-tinymce==3.5.0
django-tinymce==4.1.0
# via mapentity
django-treebeard==4.7.1
# via geotrek (setup.py)
Expand Down