Skip to content

Commit

Permalink
Upgrade to Jest 23
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
thibaudcolas authored and lb- committed May 17, 2020
1 parent b5f5ac1 commit 471823f
Show file tree
Hide file tree
Showing 5 changed files with 7,429 additions and 6,356 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 9 additions & 5 deletions client/src/components/Draftail/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand All @@ -81,22 +83,24 @@ 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();
});

it('uses fallback document.body when currentScript context is wrong', () => {
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();
});
});
Expand Down
2 changes: 1 addition & 1 deletion docs/releases/2.10.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 471823f

Please sign in to comment.