test: tests fix

WebPurple · Oct 21, 2021 · 9aafe86 · 9aafe86
1 parent a3b6740
commit 9aafe86
Show file tree

Hide file tree

Showing 7 changed files with 27,755 additions and 20,432 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+14
diff --git a/jestPreprocess.js b/jestPreprocess.js
@@ -1,11 +1,11 @@
-module.exports = require('babel-jest').createTransformer({
+module.exports = require('babel-jest').default.createTransformer({
   presets: [
     '@babel/preset-flow',
     [
       '@babel/env',
       {
         targets: {
-          node: '8',
+          node: '14',
         },
       },
     ],

diff --git a/netlify.toml b/netlify.toml
@@ -1,6 +1,7 @@
 [build]
   publish = "public"
   command = "npm run build"
+  NPM_VERSION = "7"
 [build.environment]
   YARN_VERSION = "1.3.2"
   YARN_FLAGS = "--no-ignore-optional"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -95,7 +95,7 @@
     "jsxBracketSameLine": true
   },
   "jest": {
-    "setupTestFrameworkScriptFile": "./setupTests.js",
+    "setupFilesAfterEnv": ["./setupTests.js"],
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/.cache/"
@@ -106,14 +106,14 @@
   },
   "devDependencies": {
     "all-contributors-cli": "^5.4.0",
-    "babel-jest": "^23.2.0",
+    "babel-jest": "^27.3.1",
     "dotenv": "^6.1.0",
-    "enzyme": "^3.5.1",
+    "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.4.0",
     "flow-bin": "^0.162.1",
     "flow-typed": "^3.3.1",
-    "jest": "^23.2.0",
-    "jest-enzyme": "^7.0.1",
+    "jest": "^27.3.1",
+    "jest-enzyme": "^7.1.2",
     "pre-commit": "^1.2.2",
     "prettier": "^1.13.5"
   },

diff --git a/src/components/__tests__/__snapshots__/speaker-page.test.jsx.snap b/src/components/__tests__/__snapshots__/speaker-page.test.jsx.snap
@@ -1,45 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<SpeakerPage> should match snapshot 1`] = `
-<Flex
-  blacklist={
-    Array [
-      "css",
-      "flexWrap",
-      "flexDirection",
-      "alignItems",
-      "justifyContent",
-      "css",
-      "width",
-      "m",
-      "mt",
-      "mr",
-      "mb",
-      "ml",
-      "mx",
-      "my",
-      "p",
-      "pt",
-      "pr",
-      "pb",
-      "pl",
-      "px",
-      "py",
-      "fontSize",
-      "color",
-      "bg",
-      "flex",
-      "order",
-      "alignSelf",
-    ]
-  }
+<Styled(styled.div)
   flexDirection={
     Array [
       "column",
       "row",
     ]
   }
-  is={[Function]}
   m={
     Array [
       "2rem 2rem",
@@ -49,69 +17,11 @@ exports[`<SpeakerPage> should match snapshot 1`] = `
     ]
   }
 >
-  <Flex
+  <Styled(styled.div)
     alignItems="center"
-    blacklist={
-      Array [
-        "css",
-        "flexWrap",
-        "flexDirection",
-        "alignItems",
-        "justifyContent",
-        "css",
-        "width",
-        "m",
-        "mt",
-        "mr",
-        "mb",
-        "ml",
-        "mx",
-        "my",
-        "p",
-        "pt",
-        "pr",
-        "pb",
-        "pl",
-        "px",
-        "py",
-        "fontSize",
-        "color",
-        "bg",
-        "flex",
-        "order",
-        "alignSelf",
-      ]
-    }
     flexDirection="column"
-    is={[Function]}
   >
-    <Box
-      blacklist={
-        Array [
-          "css",
-          "width",
-          "m",
-          "mt",
-          "mr",
-          "mb",
-          "ml",
-          "mx",
-          "my",
-          "p",
-          "pt",
-          "pr",
-          "pb",
-          "pl",
-          "px",
-          "py",
-          "fontSize",
-          "color",
-          "bg",
-          "flex",
-          "order",
-          "alignSelf",
-        ]
-      }
+    <styled.div
       mb="16px"
       style={
         Object {
@@ -122,7 +32,7 @@ exports[`<SpeakerPage> should match snapshot 1`] = `
       <Avatar
         avatar={null}
       />
-    </Box>
+    </styled.div>
     <SpeakerContacts
       speaker={
         Object {
@@ -138,34 +48,8 @@ exports[`<SpeakerPage> should match snapshot 1`] = `
         }
       }
     />
-  </Flex>
-  <Box
-    blacklist={
-      Array [
-        "css",
-        "width",
-        "m",
-        "mt",
-        "mr",
-        "mb",
-        "ml",
-        "mx",
-        "my",
-        "p",
-        "pt",
-        "pr",
-        "pb",
-        "pl",
-        "px",
-        "py",
-        "fontSize",
-        "color",
-        "bg",
-        "flex",
-        "order",
-        "alignSelf",
-      ]
-    }
+  </Styled(styled.div)>
+  <styled.div
     ml={
       Array [
         0,
@@ -174,44 +58,39 @@ exports[`<SpeakerPage> should match snapshot 1`] = `
     }
   >
     <styled.h1 />
-    <Flex
-      blacklist={
-        Array [
-          "css",
-          "flexWrap",
-          "flexDirection",
-          "alignItems",
-          "justifyContent",
-          "css",
-          "width",
-          "m",
-          "mt",
-          "mr",
-          "mb",
-          "ml",
-          "mx",
-          "my",
-          "p",
-          "pt",
-          "pr",
-          "pb",
-          "pl",
-          "px",
-          "py",
-          "fontSize",
-          "color",
-          "bg",
-          "flex",
-          "order",
-          "alignSelf",
-        ]
+    <Styled(styled.div)
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": e {
+            "baseHash": -1550948005,
+            "baseStyle": undefined,
+            "componentId": "sc-iwjdpV",
+            "isStatic": false,
+            "rules": Array [
+              "
+  list-style: none;
+",
+            ],
+            "staticRulesId": "",
+          },
+          "displayName": "styled.ul",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "shouldForwardProp": undefined,
+          "styledComponentId": "sc-iwjdpV",
+          "target": "ul",
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
       }
       flexDirection="column"
-      as={[Function]}
       m={0}
       mt="72px"
       p={0}
     />
-  </Box>
-</Flex>
+  </styled.div>
+</Styled(styled.div)>
 `;
diff --git a/src/templates/blog-post.template.js b/src/templates/blog-post.template.js
@@ -22,7 +22,7 @@ const getCorrectTimeToReadNoun = getNoun('минута', 'минуты', 'мин
 let Header = styled.header`
   background-blend-mode: overlay;
   background: #c788fe
-    url(${({ cover }) => cover || '/img/social-thumbnail-bg.png'}); // todo cover тут не прокинулся теперь
+    url(${({ cover }) => cover || '/img/social-thumbnail-bg.png'});
   background-size: cover;
 `