test: adjust tests after the bump (#33171)

* just checking * test failures * fix joi.subPlugins in gatsby-plugin-utils plugin options schema tester * Revert "just checking" This reverts commit 4d7a20c. * drop unused arg * add missing dev dep * fix build-utils pages mock * test(data-tracking): mock readFileSync * test(redux/index): mock readFileSync * test(babel-preset-gatsby-package): update snapshot * test(redirects-writer): mock readFileSync * test(gen-mdx): set module on subplugin entry * test(create-pages): add readFileSync mock * fix split tests * test(requires-writer): set default mode on pages * test(get-page-data): set default mode on pages * fix src/redux/__tests__/pages.ts * test(api): update snapshot * test(remark/extend-node-type): add module fields to mocked subplugins in plugin options * fix circle Co-authored-by: Ward Peeters <ward@coding-tech.com> Co-authored-by: Vladimir Razuvaev <vladimir.razuvaev@gmail.com>
gatsbyjs · Sep 14, 2021 · 4712acc · 4712acc
1 parent b622b22
commit 4712acc
Show file tree

Hide file tree

Showing 20 changed files with 126 additions and 46 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -83,7 +83,7 @@ aliases:
             yarn why lmdb-store
       - run:
           name: Run tests
-          command: yarn jest --ci --runInBand $(yarn jest --listTests | sed 's/\/root\/project//g' | circleci tests split --split-by=timings)
+          command: yarn jest --ci --runInBand  $(yarn -s jest --listTests | sed 's/\/home\/circleci\/project\///g' | circleci tests split)
           environment:
             NODE_OPTIONS: --max-old-space-size=2048
             GENERATE_JEST_REPORT: true

diff --git a/packages/babel-preset-gatsby-package/lib/__tests__/__snapshots__/index.js.snap b/packages/babel-preset-gatsby-package/lib/__tests__/__snapshots__/index.js.snap
@@ -90,7 +90,9 @@ Array [
       "availableFlags": Array [
         "GATSBY_MAJOR",
       ],
-      "flags": Object {},
+      "flags": Object {
+        "GATSBY_MAJOR": "4",
+      },
     },
   ],
 ]
@@ -109,7 +111,9 @@ Array [
       "availableFlags": Array [
         "MAJOR",
       ],
-      "flags": Object {},
+      "flags": Object {
+        "GATSBY_MAJOR": "4",
+      },
     },
   ],
 ]
@@ -176,7 +180,9 @@ Array [
       "availableFlags": Array [
         "GATSBY_MAJOR",
       ],
-      "flags": Object {},
+      "flags": Object {
+        "GATSBY_MAJOR": "4",
+      },
     },
   ],
 ]

diff --git a/packages/babel-preset-gatsby-package/package.json b/packages/babel-preset-gatsby-package/package.json
@@ -26,7 +26,8 @@
     "@babel/core": "^7.15.5",
     "@babel/helper-plugin-test-runner": "7.14.5",
     "@babel/plugin-transform-modules-commonjs": "^7.15.4",
-    "@types/babel__core": "^7.1.15"
+    "@types/babel__core": "^7.1.15",
+    "cross-env": "^7.0.3"
   },
   "peerDependencies": {
     "@babel/core": "^7.11.6"

diff --git a/packages/gatsby-cli/src/index.ts b/packages/gatsby-cli/src/index.ts
@@ -23,7 +23,7 @@ if (os.platform() === `win32`) {
 // Check if update is available
 updateNotifier({ pkg }).notify({ isGlobal: true })
 
-const MIN_NODE_VERSION = `12.13.0`
+const MIN_NODE_VERSION = `14.15.0`
 // const NEXT_MIN_NODE_VERSION = `10.13.0`
 
 const { version } = process

diff --git a/packages/gatsby-plugin-mdx/__tests__/gatsby-node.js b/packages/gatsby-plugin-mdx/__tests__/gatsby-node.js
@@ -8,8 +8,8 @@ describe(`pluginOptionsSchema`, () => {
       `"extensions[1]" must be a string`,
       `"extensions[2]" must be a string`,
       `"defaultLayouts" must be of type object`,
-      `"gatsbyRemarkPlugins[0]" does not match any of the allowed types`,
-      `"gatsbyRemarkPlugins[1]" does not match any of the allowed types`,
+      `"gatsbyRemarkPlugins[0]" must be one of [string, object]`,
+      `"gatsbyRemarkPlugins[1].not" is not allowed`,
       `"remarkPlugins" must be an array`,
       `"rehypePlugins" must be an array`,
       `"plugins[0]" does not match any of the allowed types`,

diff --git a/packages/gatsby-plugin-mdx/utils/__tests__/gen-mdx.js b/packages/gatsby-plugin-mdx/utils/__tests__/gen-mdx.js
@@ -16,6 +16,7 @@ console.log('hello world')
 
 describe(`find imports`, () => {
   it(`allows injecting imports via plugins`, async () => {
+    const testPluginModulePath = path.join(__dirname, `fixtures`, `test-plugin`)
     const results = await findImports({
       node: {
         id: `bbffffbb-bfff-bfff-bfff-dededededede`,
@@ -37,7 +38,10 @@ describe(`find imports`, () => {
       options: {
         remarkPlugins: [],
         gatsbyRemarkPlugins: [
-          { resolve: path.join(__dirname, `fixtures`, `test-plugin`) },
+          {
+            resolve: testPluginModulePath,
+            module: require(testPluginModulePath),
+          },
         ],
       },
       getNode: () => null,

diff --git a/packages/gatsby-plugin-utils/src/test-plugin-options-schema.ts b/packages/gatsby-plugin-utils/src/test-plugin-options-schema.ts
@@ -12,7 +12,35 @@ export async function testPluginOptionsSchema(
   pluginSchemaFunction: Exclude<GatsbyNode["pluginOptionsSchema"], undefined>,
   pluginOptions: IPluginInfoOptions
 ): Promise<ITestPluginOptionsSchemaReturnType> {
-  const pluginSchema = pluginSchemaFunction({ Joi })
+  const pluginSchema = pluginSchemaFunction({
+    Joi: Joi.extend(joi => {
+      return {
+        base: joi.any(),
+        type: `subPlugins`,
+        args: (): any =>
+          joi
+            .array()
+            .items(
+              joi
+                .alternatives(
+                  joi.string(),
+                  joi.object({
+                    resolve: Joi.string(),
+                    options: Joi.object({}).unknown(true),
+                  })
+                )
+                .custom(value => {
+                  if (typeof value === `string`) {
+                    value = { resolve: value }
+                  }
+
+                  return value
+                }, `Gatsby specific subplugin validation`)
+            )
+            .default([]),
+      }
+    }),
+  })
 
   try {
     await validateOptionsSchema(pluginSchema, pluginOptions)

diff --git a/packages/gatsby-transformer-remark/src/__tests__/extend-node.js b/packages/gatsby-transformer-remark/src/__tests__/extend-node.js
@@ -1143,6 +1143,7 @@ It's easier than you may imagine`,
               showLineNumbers: false,
               noInlineHighlight: false,
             },
+            module: require(`gatsby-remark-prismjs`),
           },
         ],
       },
@@ -1335,6 +1336,7 @@ describe(`Headings are generated correctly from schema`, () => {
           {
             resolve: require.resolve(`gatsby-remark-autolink-headers/src`),
             pluginOptions: {},
+            module: require(`gatsby-remark-autolink-headers/src`),
           },
         ],
       },

diff --git a/packages/gatsby/scripts/__tests__/api.js b/packages/gatsby/scripts/__tests__/api.js
@@ -44,6 +44,9 @@ it("generates the expected api output", done => {
           "onCreateNode": Object {},
           "onCreatePage": Object {},
           "onCreateWebpackConfig": Object {},
+          "onPluginInit": Object {
+            "version": "3.9.0",
+          },
           "onPostBootstrap": Object {},
           "onPostBuild": Object {},
           "onPreBootstrap": Object {},
@@ -57,9 +60,6 @@ it("generates the expected api output", done => {
           "resolvableExtensions": Object {},
           "setFieldsOnGraphQLNodeType": Object {},
           "sourceNodes": Object {},
-          "onPluginInit": Object {
-            "version": "3.9.0",
-          },
           "unstable_shouldOnCreateNode": Object {
             "version": "2.24.80",
           },

diff --git a/packages/gatsby/src/bootstrap/__tests__/redirects-writer.ts b/packages/gatsby/src/bootstrap/__tests__/redirects-writer.ts
@@ -5,7 +5,7 @@ import { store } from "../../redux"
 import { actions } from "../../redux/actions"
 
 jest.mock(`fs-extra`, () => {
-  return { writeFile: jest.fn() }
+  return { writeFile: jest.fn(), readFileSync: jest.fn(() => `foo`) }
 })
 
 jest.mock(`gatsby-cli/lib/reporter`, () => {

diff --git a/packages/gatsby/src/bootstrap/__tests__/requires-writer.js b/packages/gatsby/src/bootstrap/__tests__/requires-writer.js
@@ -10,6 +10,7 @@ const generatePagesState = pages => {
     state.set(page.path, {
       component: ``,
       componentChunkName: ``,
+      mode: `SSG`,
       ...page,
     })
   })