fix(src): fix fixtureOutputExt being ignored in root options.json (#89)

babel-utils · Oct 9, 2022 · 481be19 · 481be19
1 parent 1f0c78b
commit 481be19
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 20 deletions.
diff --git a/src/__tests__/__snapshots__/plugin-tester.js.snap b/src/__tests__/__snapshots__/plugin-tester.js.snap
@@ -32,6 +32,6 @@ exports[`throws error if fixture provided and code changes 1`] = `Expected outpu
 
 exports[`throws error when error expected but no error thrown 1`] = `Expected to throw error, but it did not.`;
 
-exports[`throws error when function doesn't return true 1`] = `[BABEL] unknown: test message (While processing: "base$0")`;
+exports[`throws error when function doesn't return true 1`] = `[BABEL] unknown file: test message (While processing: "base$0")`;
 
 exports[`throws if output is incorrect 1`] = `Output is incorrect.`;
diff --git a/src/__tests__/fixtures/fixtureOutputExt/fixture/code.ts b/src/__tests__/fixtures/fixtureOutputExt/fixture/code.ts
@@ -0,0 +1 @@
+'use strict';
diff --git a/src/__tests__/fixtures/fixtureOutputExt/fixture/options.json b/src/__tests__/fixtures/fixtureOutputExt/fixture/options.json
@@ -0,0 +1 @@
+{"fixtureOutputExt": ".js"}
diff --git a/src/__tests__/fixtures/fixtureOutputExt/fixture/output.js b/src/__tests__/fixtures/fixtureOutputExt/fixture/output.js
@@ -0,0 +1 @@
+'use strict';
diff --git a/src/__tests__/fixtures/root-fixtureOutputExt/root/fixture/code.ts b/src/__tests__/fixtures/root-fixtureOutputExt/root/fixture/code.ts
@@ -0,0 +1 @@
+'use strict';
diff --git a/src/__tests__/fixtures/root-fixtureOutputExt/root/fixture/output.js b/src/__tests__/fixtures/root-fixtureOutputExt/root/fixture/output.js
@@ -0,0 +1 @@
+'use strict';
diff --git a/src/__tests__/fixtures/root-fixtureOutputExt/root/options.json b/src/__tests__/fixtures/root-fixtureOutputExt/root/options.json
@@ -0,0 +1 @@
+{"fixtureOutputExt": ".js"}
diff --git a/src/__tests__/plugin-tester.js b/src/__tests__/plugin-tester.js
@@ -639,7 +639,7 @@ test('prettier formatter supported', async () => {
   )
 })
 
-test('gets options from options.json files when using fixtures', async () => {
+test('gets options from local and root options.json files when using fixtures', async () => {
   const optionRootFoo = jest.fn()
   const optionFoo = jest.fn()
   const optionBar = jest.fn()
@@ -673,6 +673,40 @@ test('gets options from options.json files when using fixtures', async () => {
   expect(optionBar).toHaveBeenCalledTimes(1)
 })
 
+test('respects fixtureOutputExt from root options.json file when using fixtures', async () => {
+  await runPluginTester(
+    getOptions({
+      fixtures: getFixturePath('root-fixtureOutputExt'),
+      tests: null,
+    }),
+  )
+
+  expect(writeFileSyncSpy).toHaveBeenCalledTimes(0)
+
+  expect(equalSpy).toHaveBeenCalledWith(
+    getFixtureContents('root-fixtureOutputExt/root/fixture/code.ts'),
+    getFixtureContents('root-fixtureOutputExt/root/fixture/output.js'),
+    expect.any(String),
+  )
+})
+
+test('respects fixtureOutputExt from local options.json file when using fixtures', async () => {
+  await runPluginTester(
+    getOptions({
+      fixtures: getFixturePath('fixtureOutputExt'),
+      tests: null,
+    }),
+  )
+
+  expect(writeFileSyncSpy).toHaveBeenCalledTimes(0)
+
+  expect(equalSpy).toHaveBeenCalledWith(
+    getFixtureContents('fixtureOutputExt/fixture/code.ts'),
+    getFixtureContents('fixtureOutputExt/fixture/output.js'),
+    expect.any(String),
+  )
+})
+
 test('appends to root plugins array', async () => {
   const optionRootFoo = jest.fn()
   const optionFoo = jest.fn()

diff --git a/src/plugin-tester.js b/src/plugin-tester.js
@@ -275,20 +275,22 @@ const createFixtureTests = (fixturesDir, options) => {
       (fs.existsSync(tsCodePath) && tsCodePath) ||
       (fs.existsSync(jsxCodePath) && jsxCodePath) ||
       (fs.existsSync(tsxCodePath) && tsxCodePath)
-    let fixturePluginOptions = {}
+    let localFixtureOptions = {}
     if (fs.existsSync(optionsPath)) {
-      fixturePluginOptions = require(optionsPath)
+      localFixtureOptions = require(optionsPath)
+    }
+
+    const mergedFixtureAndPluginOptions = {
+      ...rootFixtureOptions,
+      ...options.pluginOptions,
+      ...localFixtureOptions,
     }
 
     if (!codePath) {
       describe(blockTitle, () => {
         createFixtureTests(fixtureDir, {
           ...options,
-          pluginOptions: {
-            ...rootFixtureOptions,
-            ...options.pluginOptions,
-            ...fixturePluginOptions,
-          },
+          pluginOptions: mergedFixtureAndPluginOptions,
         })
       })
       return
@@ -316,16 +318,7 @@ const createFixtureTests = (fixturesDir, options) => {
         fullDefaultConfig,
         {
           babelOptions: {
-            plugins: [
-              [
-                plugin,
-                {
-                  ...rootFixtureOptions,
-                  ...pluginOptions,
-                  ...fixturePluginOptions,
-                },
-              ],
-            ],
+            plugins: [[plugin, mergedFixtureAndPluginOptions]],
             // if they have a babelrc, then we'll let them use that
             // otherwise, we'll just use our simple config
             babelrc: hasBabelrc,
@@ -352,7 +345,8 @@ const createFixtureTests = (fixturesDir, options) => {
         fixLineEndings(transformed.code, endOfLine, input),
       )
 
-      const {fixtureOutputExt} = fixturePluginOptions
+      const {fixtureOutputExt} = mergedFixtureAndPluginOptions
+
       if (fixtureOutputExt) {
         ext = fixtureOutputExt
       } else {