Upgrade to Jest 23

* Jest 24 is out but upgrading to it would require us to also update our Webpack tooling to Babel 7, which is quite significant work.
* Rewrite Draftail initialisation tests to stop relying on jsdom script parsing

CHANGELOG.txt

@@ -13,7 +13,7 @@ Changelog
  * `AbstractEmailForm` now has a separate method (`render_email`) to build up email content on submission emails (Haydn Greatnews)
  * Add `pre_page_move` and `post_page_move` signals (Andy Babic)
  * Add ability to sort search promotions on listing page (Chris Ranjana, LB (Ben Johnston))
- * Upgrade internal JS tooling to Gulp v4 & Node v10 (Jim Jazwiecki, Kim LaRocca)
+ * Upgrade internal JS tooling; Node v10, Gulp v4 & Jest v23 (Jim Jazwiecki, Kim LaRocca, Thibaud Colas)
  * Add `after_publish_page`, `before_publish_page`, `after_unpublish_page` & `before_unpublish_page` hooks (Jonatas Baldin, Coen van der Kamp)
  * Add convenience `page_url` shortcut to improve how page URLs can be accessed from site settings in Django templates (Andy Babic)
  * Show more granular error messages from Pillow when uploading images (Rick van Hattem)

client/src/components/Draftail/index.test.js

@@ -68,10 +68,12 @@ describe('Draftail', () => {
           <input name="first" id="description" value="null" />
           <div>
             <input name="last" id="description" value="null" />
-            <script>window.draftail.initEditor('#description', {});</script>
+            <script data-draftail-script></script>
           </div>
         `;
 
+        draftail.initEditor('#description', {});
+
         expect(document.querySelector('[name="last"]').draftailEditor).not.toBeDefined();
       });
 
@@ -81,10 +83,12 @@ describe('Draftail', () => {
           <input name="first" id="description" value="null" />
           <div>
             <input name="last" id="description" value="null" />
-            <script>window.draftail.initEditor('#description', {}, document.currentScript);</script>
+            <script data-draftail-script></script>
           </div>
         `;
 
+        draftail.initEditor('#description', {}, document.querySelector('[data-draftail-script]'));
+
         expect(document.querySelector('[name="last"]').draftailEditor).toBeDefined();
       });
 
@@ -92,11 +96,11 @@ describe('Draftail', () => {
         window.draftail = draftail;
         document.body.innerHTML = `
         <input id="description" value="null" />
-          <div>
-          <script>window.draftail.initEditor('#description', {}, document.currentScript);</script>
-          </div>
+          <div><script data-draftail-script></script></div>
         `;
 
+        draftail.initEditor('#description', {}, document.querySelector('[data-draftail-script]'));
+
         expect(document.querySelector('#description').draftailEditor).toBeDefined();
       });
     });

docs/releases/2.10.rst

@@ -22,7 +22,7 @@ Other features
  * ``AbstractEmailForm`` now has a separate method (``render_email``) to build up email content on submission emails. See :ref:`form_builder_render_email`. (Haydn Greatnews)
  * Add ``pre_page_move`` and ``post_page_move`` signals. (Andy Babic)
  * Add ability to sort search promotions on listing page (Chris Ranjana, LB (Ben Johnston))
- * Upgrade internal JS tooling to Gulp v4 & Node v10 (Jim Jazwiecki, Kim LaRocca)
+ * Upgrade internal JS tooling; Node v10, Gulp v4 & Jest v23 (Jim Jazwiecki, Kim LaRocca, Thibaud Colas)
  * Add ``after_publish_page``, ``before_publish_page``, ``after_unpublish_page`` & ``before_unpublish_page`` hooks (Jonatas Baldin, Coen van der Kamp)
  * Add convenience ``page_url`` shortcut to improve how page URLs can be accessed from site settings in Django templates (Andy Babic)
  * Show more granular error messages from Pillow when uploading images (Rick van Hattem)

package.json

@@ -56,7 +56,7 @@
   "devDependencies": {
     "@wagtail/stylelint-config-wagtail": "^0.1.0",
     "babel-core": "^6.26.3",
-    "babel-jest": "^22.0.3",
+    "babel-jest": "^23.6.0",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.12",
     "babel-preset-es2015": "^6.24.1",
@@ -79,7 +79,7 @@
     "gulp-size": "^2.1.0",
     "gulp-sourcemaps": "~2.6.1",
     "gulp-util": "~3.0.8",
-    "jest": "^22.0.3",
+    "jest": "^23.6.0",
     "npm-run-all": "^4.1.5",
     "react-axe": "^3.1.0",
     "react-test-renderer": "^16.2.0",