Merge f72bfa0 into 7e34d79

GeotrekCE · Nov 29, 2024 · 3013e83 · 3013e83
2 parents 7e34d79 + f72bfa0
commit 3013e83
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/cypress/package-lock.json b/cypress/package-lock.json
diff --git a/cypress/package.json b/cypress/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "@foreachbe/cypress-tinymce": "^1.0.0",
     "cypress": "^9.5.1"
   }
 }
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -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();
+  });
 });
diff --git a/cypress/support/index.js b/cypress/support/index.js
@@ -17,5 +17,4 @@
 import './commands'
 
 // Alternatively you can use CommonJS syntax:
-// require('./commands')
-import '@foreachbe/cypress-tinymce'
+// require('./commands')
diff --git a/requirements.txt b/requirements.txt
@@ -114,6 +114,7 @@ django==4.2.16
     #   django-leaflet
     #   django-modelcluster
     #   django-modeltranslation
+    #   django-tinymce
     #   django-treebeard
     #   django-weasyprint
     #   djangorestframework
@@ -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)