deps: Update for for jest 29

CaptainFact · Jan 17, 2024 · 6c57416 · 6c57416
1 parent 130e141
commit 6c57416
Show file tree

Hide file tree

Showing 12 changed files with 867 additions and 70 deletions.
diff --git a/app/components/Utils/__tests__/ReputationGuardTooltip.spec.jsx b/app/components/Utils/__tests__/ReputationGuardTooltip.spec.jsx
@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { t } from 'react-i18next'
 
 import { ReputationGuardTooltip } from '../ReputationGuardTooltip'

diff --git a/app/config.js b/app/config.js
@@ -12,7 +12,7 @@ function boolFromConfig(value) {
 }
 
 // Get the CF global config
-const globals = window.CF_GLOBALS || {}
+const globals = (typeof window !== 'undefined' && window.CF_GLOBALS) || {}
 
 // Raw env export
 export const JS_ENV = globals['JS_ENV'] || process.env.JS_ENV

diff --git a/app/i18n/browser_locale.js b/app/i18n/browser_locale.js
@@ -2,6 +2,10 @@ import { SUPPORTED_LOCALES } from '../constants'
 
 // Util to get browser locale
 const navigatorLocale = () => {
+  if (typeof window === 'undefined') {
+    return 'en'
+  }
+
   return window.navigator.userLanguage || window.navigator.language || 'en'
 }
 

diff --git a/app/lib/__tests__/url_utils.js b/app/lib/__tests__/url_utils.js
@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { isExternal, optionsToQueryString, youtubeRegex } from '../url_utils'
 
 describe('Youtube regex', () => {

diff --git a/app/state/index.js b/app/state/index.js
@@ -37,7 +37,11 @@ const middlewares = [thunk, promiseMiddleware]
 
 // If running in dev and browser has redux devtools extension activated, use it
 const getComposer = () => {
-  if (JS_ENV === 'prod' || !window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) {
+  if (
+    JS_ENV === 'prod' ||
+    typeof window === 'undefined' ||
+    !window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+  ) {
     return compose
   }
   return window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({

diff --git a/app/state/modals/__tests__/__snapshots__/reducer.spec.js.snap b/app/state/modals/__tests__/__snapshots__/reducer.spec.js.snap
@@ -4,14 +4,14 @@ exports[`should be able to add and remove modals 1`] = `Immutable.Stack []`;
 
 exports[`should be able to add and remove modals 2`] = `
 Immutable.Stack [
-  Object {
-    "Modal": Object {
+  {
+    "Modal": {
       "$$typeof": Symbol(react.memo),
       "WrappedComponent": [Function],
       "compare": null,
       "type": [Function],
     },
-    "props": Object {
+    "props": {
       "hello": "world",
       "id": 1,
     },
@@ -21,26 +21,26 @@ Immutable.Stack [
 
 exports[`should be able to add and remove modals 3`] = `
 Immutable.Stack [
-  Object {
-    "Modal": Object {
+  {
+    "Modal": {
       "$$typeof": Symbol(react.memo),
       "WrappedComponent": [Function],
       "compare": null,
       "type": [Function],
     },
-    "props": Object {
+    "props": {
       "hello": "world",
       "id": 2,
     },
   },
-  Object {
-    "Modal": Object {
+  {
+    "Modal": {
       "$$typeof": Symbol(react.memo),
       "WrappedComponent": [Function],
       "compare": null,
       "type": [Function],
     },
-    "props": Object {
+    "props": {
       "hello": "world",
       "id": 1,
     },
@@ -50,14 +50,14 @@ Immutable.Stack [
 
 exports[`should be able to add and remove modals 4`] = `
 Immutable.Stack [
-  Object {
-    "Modal": Object {
+  {
+    "Modal": {
       "$$typeof": Symbol(react.memo),
       "WrappedComponent": [Function],
       "compare": null,
       "type": [Function],
     },
-    "props": Object {
+    "props": {
       "hello": "world",
       "id": 1,
     },

diff --git a/app/state/user_preferences/reducer.js b/app/state/user_preferences/reducer.js
@@ -15,7 +15,7 @@ export const setVideosFilter = createAction('USER_PREFERENCES/SET_VIDEOS_FILTER'
 export const toggleAutoscroll = createAction('STATEMENTS/TOGGLE_AUTOSCROLL')
 export const toggleBackgroundSound = createAction('STATEMENTS/TOGGLE_BACKGROUND_SOUND')
 
-const isMobile = window.innerWidth <= MOBILE_WIDTH_THRESHOLD
+const isMobile = typeof window !== 'undefined' && window.innerWidth <= MOBILE_WIDTH_THRESHOLD
 
 const Preferences = new Record({
   // Disable autoscroll and sidebar expended by default on mobile

diff --git a/app/state/video_debate/comments/__tests__/__snapshots__/reducer.spec.js.snap b/app/state/video_debate/comments/__tests__/__snapshots__/reducer.spec.js.snap
@@ -84,8 +84,8 @@ Immutable.Record {
         "id": 739,
         "reply_to_id": null,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             4,
             3,
             6,
@@ -101,7 +101,7 @@ Immutable.Record {
           "speaker_id": null,
           "username": "Betree",
         },
-        "source": Object {
+        "source": {
           "language": null,
           "site_name": "www.lejdc.fr",
           "title": "Sur décision de justice - Alexandre Bain retrouve l'appellation pouilly-fumé",
@@ -117,8 +117,8 @@ Immutable.Record {
         "id": 737,
         "reply_to_id": null,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             4,
             3,
             6,
@@ -134,14 +134,14 @@ Immutable.Record {
           "speaker_id": null,
           "username": "Betree",
         },
-        "source": Object {
+        "source": {
           "language": "fr",
           "site_name": "FIGARO",
           "title": "La justice rend son AOC pouilly-fumé à un vigneron abusivement sanctionné",
           "url": "http://www.lefigaro.fr/societes/2017/05/28/20005-20170528ARTFIG00185-la-justice-rend-son-aoc-pouilly-fume-a-un-vigneron-abusivement-sanctionne.php",
         },
         "statement_id": 297,
-        "text": "Si l'AOC lui avait bien été retirée (et rendue depuis) la raison invoquée par le Figaro qui cite l'INAO est ailleurs : \\"plusieurs rendez-vous manqués, mais pour des raisons justifiées, avec l'Organisme d'inspection des vins du Centre\\"",
+        "text": "Si l'AOC lui avait bien été retirée (et rendue depuis) la raison invoquée par le Figaro qui cite l'INAO est ailleurs : "plusieurs rendez-vous manqués, mais pour des raisons justifiées, avec l'Organisme d'inspection des vins du Centre"",
         "approve": false,
         "inserted_at": 2018-03-13T16:55:07.288Z,
         "score": 2,
@@ -150,8 +150,8 @@ Immutable.Record {
         "id": 917,
         "reply_to_id": null,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             4,
             3,
             6,
@@ -180,8 +180,8 @@ Immutable.Record {
         "id": 774,
         "reply_to_id": null,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             6,
             3,
             8,
@@ -200,7 +200,7 @@ Immutable.Record {
           "speaker_id": null,
           "username": "tad2018",
         },
-        "source": Object {
+        "source": {
           "language": null,
           "site_name": null,
           "title": "Planetoscope - Statistiques : Consommation de pesticides phytosanitaires en France",
@@ -220,8 +220,8 @@ Immutable.Record {
         "id": 738,
         "reply_to_id": 737,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             4,
             3,
             6,
@@ -239,7 +239,7 @@ Immutable.Record {
         },
         "source": null,
         "statement_id": 297,
-        "text": "\\"l'Inao (Institut national de l'origine et de la qualité) a considéré que le viticulteur refusait de se soumettre à un contrôle obligatoire et a décidé, en 2015, de lui retirer son AOC.\\"",
+        "text": ""l'Inao (Institut national de l'origine et de la qualité) a considéré que le viticulteur refusait de se soumettre à un contrôle obligatoire et a décidé, en 2015, de lui retirer son AOC."",
         "approve": null,
         "inserted_at": 2018-03-13T16:55:49.045Z,
         "score": 2,
@@ -250,8 +250,8 @@ Immutable.Record {
         "id": 778,
         "reply_to_id": 775,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             4,
             3,
             6,
@@ -280,8 +280,8 @@ Immutable.Record {
         "id": 775,
         "reply_to_id": 739,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             6,
             3,
             8,
@@ -313,8 +313,8 @@ Immutable.Record {
         "id": 809,
         "reply_to_id": 778,
         "is_reported": false,
-        "user": Object {
-          "achievements": Array [
+        "user": {
+          "achievements": [
             6,
             3,
             8,

diff --git a/app/state/video_debate/presence/__tests__/__snapshots__/reducer.spec.js.snap b/app/state/video_debate/presence/__tests__/__snapshots__/reducer.spec.js.snap
@@ -57,10 +57,10 @@ Immutable.Record {
 
 exports[`set presence 2`] = `
 Immutable.Record {
-  "viewers": Object {
+  "viewers": {
     "count": 42,
   },
-  "users": Object {
+  "users": {
     "count": 5,
   },
 }

diff --git a/app/state/video_debate/video/__tests__/__snapshots__/reducer.spec.js.snap b/app/state/video_debate/video/__tests__/__snapshots__/reducer.spec.js.snap
@@ -211,17 +211,17 @@ Immutable.Record {
   "player": "youtube",
   "offset": 0,
   "playback": Immutable.Record {
-    "position": Object {
-      "forcedPosition": Object {
+    "position": {
+      "forcedPosition": {
         "requestId": 1,
         "time": 0,
       },
       "position": 4,
     },
     "forcedPosition": Immutable.Record {
       "requestId": "A-UNIQUE-UUID",
-      "time": Object {
-        "forcedPosition": Object {
+      "time": {
+        "forcedPosition": {
           "requestId": 1,
           "time": 0,
         },