fix(coverage): pass the appropriate input to the codecov scaffolder

Author: travi

src/coverage/scaffolder.js

@@ -2,6 +2,6 @@ import deepmerge from 'deepmerge';
 import {scaffold as scaffoldCodecov} from '@form8ion/codecov';
 import {scaffold as scaffoldC8} from '@form8ion/c8';
 
-export default async function scaffoldCoverage({projectRoot, vcs, visibility, pathWithinParent}) {
-  return deepmerge(await scaffoldC8({projectRoot}), await scaffoldCodecov({vcs, visibility, pathWithinParent}));
+export default async function scaffoldCoverage({projectRoot}) {
+  return deepmerge(await scaffoldC8({projectRoot}), await scaffoldCodecov({projectRoot}));
 }

src/coverage/scaffolder.test.js

@@ -1,7 +1,7 @@
 import {scaffold as scaffoldCodecov} from '@form8ion/codecov';
 import {scaffold as scaffoldC8} from '@form8ion/c8';
 
-import {describe, vi, it, expect, afterEach} from 'vitest';
+import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
@@ -11,21 +11,14 @@ vi.mock('@form8ion/codecov');
 vi.mock('@form8ion/c8');
 
 describe('coverage scaffolder', () => {
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
   it('should scaffold coverage measurement and reporting', async () => {
-    const vcs = any.simpleObject();
-    const visibility = any.word();
     const projectRoot = any.string();
     const c8Results = any.simpleObject();
     const codecovResults = any.simpleObject();
-    const pathWithinParent = any.string();
     when(scaffoldC8).calledWith({projectRoot}).thenResolve(c8Results);
-    when(scaffoldCodecov).calledWith({vcs, visibility, pathWithinParent}).thenResolve(codecovResults);
+    when(scaffoldCodecov).calledWith({projectRoot}).thenResolve(codecovResults);
 
-    const results = await scaffold({vcs, visibility, projectRoot, pathWithinParent});
+    const results = await scaffold({projectRoot});
 
     expect(results).toEqual({...c8Results, ...codecovResults});
   });

src/scaffolder.js

@@ -89,7 +89,6 @@ export default async function scaffoldJavascript(options) {
   const verificationResults = await scaffoldVerification({
     projectRoot,
     dialect,
-    visibility,
     packageManager,
     vcs,
     registries: configs.registries,

src/scaffolder.test.js

@@ -155,7 +155,6 @@ describe('javascript project scaffolder', () => {
       .calledWith({
         projectRoot,
         dialect,
-        visibility,
         packageManager,
         vcs,
         registries,

src/testing/scaffolder.js

@@ -4,24 +4,13 @@ import {scaffold as scaffoldUnitTesting} from './unit/index.js';
 
 export default async function scaffoldTesting({
   projectRoot,
-  visibility,
   tests: {unit, integration},
-  vcs,
   unitTestFrameworks,
   decisions,
-  dialect,
-  pathWithinParent
+  dialect
 }) {
   const unitResults = unit
-    ? await scaffoldUnitTesting({
-      projectRoot,
-      visibility,
-      vcs,
-      frameworks: unitTestFrameworks,
-      decisions,
-      dialect,
-      pathWithinParent
-    })
+    ? await scaffoldUnitTesting({projectRoot, frameworks: unitTestFrameworks, decisions, dialect})
     : {};
 
   return deepmerge(

src/testing/scaffolder.test.js

@@ -9,21 +9,18 @@ vi.mock('./unit/index.js');
 
 describe('testing scaffolder', () => {
   const projectRoot = any.string();
-  const visibility = any.word();
   const dialect = any.word();
   const unitTestingDevDependencies = any.listOf(any.string);
   const unitTestNextSteps = any.listOf(any.simpleObject);
   const unitTestScripts = any.simpleObject();
   const unitTestFilesToIgnoreFromVcs = any.listOf(any.string);
   const unitTestDirectoriesToIgnoreFromVcs = any.listOf(any.string);
-  const vcs = any.simpleObject();
   const unitTestFrameworks = any.simpleObject();
   const decisions = any.simpleObject();
-  const pathWithinParent = any.string();
 
   beforeEach(() => {
     when(scaffoldUnitTesting)
-      .calledWith({projectRoot, visibility, vcs, frameworks: unitTestFrameworks, decisions, dialect, pathWithinParent})
+      .calledWith({projectRoot, frameworks: unitTestFrameworks, decisions, dialect})
       .thenResolve({
         dependencies: {javascript: {development: unitTestingDevDependencies}},
         scripts: unitTestScripts,
@@ -35,13 +32,10 @@ describe('testing scaffolder', () => {
   it('should scaffold unit testing if the project will be unit test', async () => {
     expect(await scaffoldTesting({
       projectRoot,
-      visibility,
       tests: {unit: true},
-      vcs,
       unitTestFrameworks,
       decisions,
-      dialect,
-      pathWithinParent
+      dialect
     })).toEqual({
       dependencies: {javascript: {development: ['@travi/any', ...unitTestingDevDependencies]}},
       scripts: unitTestScripts,
@@ -52,12 +46,12 @@ describe('testing scaffolder', () => {
   });
 
   it('should not scaffold unit testing if the project will not be unit tested', async () => {
-    expect(await scaffoldTesting({projectRoot, visibility, tests: {unit: false, integration: true}, pathWithinParent}))
+    expect(await scaffoldTesting({projectRoot, tests: {unit: false, integration: true}}))
       .toEqual({dependencies: {javascript: {development: ['@travi/any']}}, eslint: {}});
   });
 
   it('should not scaffold testing if the project will not be tested', async () => {
-    expect(await scaffoldTesting({projectRoot, visibility, tests: {unit: false, integration: false}, pathWithinParent}))
+    expect(await scaffoldTesting({projectRoot, tests: {unit: false, integration: false}}))
       .toEqual({dependencies: {javascript: {development: []}}, eslint: {}});
   });
 });

src/testing/unit/scaffolder.js

@@ -6,20 +6,12 @@ import {scaffold as scaffoldCoverage} from '../../coverage/index.js';
 import chooseFramework from './prompt.js';
 import {pluginsSchema} from '../../plugins-schemas.js';
 
-export default async function scaffoldUnitTesting({
-  projectRoot,
-  frameworks,
-  decisions,
-  visibility,
-  vcs,
-  pathWithinParent,
-  dialect
-}) {
+export default async function scaffoldUnitTesting({projectRoot, frameworks, decisions, dialect}) {
   const validatedFrameworks = validateOptions(pluginsSchema, frameworks);
   const [framework, coverage] = await Promise.all([
     chooseFramework({frameworks: validatedFrameworks, decisions})
       .then(chosenFramework => scaffoldFrameworkChoice(validatedFrameworks, chosenFramework, {projectRoot, dialect})),
-    scaffoldCoverage({projectRoot, vcs, visibility, pathWithinParent})
+    scaffoldCoverage({projectRoot})
   ]);
 
   return deepmerge.all([

src/testing/unit/scaffolder.test.js

@@ -19,27 +19,22 @@ vi.mock('./prompt.js');
 
 describe('unit testing scaffolder', () => {
   const projectRoot = any.string();
-  const vcs = any.simpleObject();
   const frameworks = any.simpleObject();
   const decisions = any.simpleObject();
   const chosenFramework = any.word();
   const dialect = any.word();
-  const pathWithinParent = any.string();
   const coverageResults = any.simpleObject();
   const unitTestFrameworkResults = any.simpleObject();
   const mergedResults = any.simpleObject();
 
   it('should scaffold the chosen framework', async () => {
-    const visibility = any.word();
     const validatedFrameworks = any.simpleObject();
     when(validateOptions).calledWith(pluginsSchema, frameworks).thenReturn(validatedFrameworks);
     when(prompt).calledWith({frameworks: validatedFrameworks, decisions}).thenResolve(chosenFramework);
     when(scaffoldChoice)
       .calledWith(validatedFrameworks, chosenFramework, {projectRoot, dialect})
       .thenResolve(unitTestFrameworkResults);
-    when(scaffoldCoverage)
-      .calledWith({projectRoot, vcs, visibility, pathWithinParent})
-      .thenResolve(coverageResults);
+    when(scaffoldCoverage).calledWith({projectRoot}).thenResolve(coverageResults);
     when(deepmerge.all)
       .calledWith([
         {scripts: {'test:unit': 'cross-env NODE_ENV=test c8 run-s test:unit:base'}},
@@ -48,7 +43,6 @@ describe('unit testing scaffolder', () => {
       ])
       .thenReturn(mergedResults);
 
-    expect(await scaffoldUnitTesting({projectRoot, frameworks, decisions, vcs, visibility, pathWithinParent, dialect}))
-      .toEqual(mergedResults);
+    expect(await scaffoldUnitTesting({projectRoot, frameworks, decisions, dialect})).toEqual(mergedResults);
   });
 });

src/verification/scaffolder.js

@@ -7,7 +7,6 @@ import {scaffold as scaffoldLinting} from '../linting/index.js';
 export async function scaffoldVerification({
   projectRoot,
   dialect,
-  visibility,
   packageManager,
   vcs,
   registries,
@@ -17,16 +16,7 @@ export async function scaffoldVerification({
   pathWithinParent
 }) {
   const [testingResults, lintingResults, huskyResults] = await Promise.all([
-    scaffoldTesting({
-      projectRoot,
-      tests,
-      visibility,
-      vcs,
-      unitTestFrameworks,
-      decisions,
-      dialect,
-      pathWithinParent
-    }),
+    scaffoldTesting({projectRoot, tests, unitTestFrameworks, decisions, dialect}),
     scaffoldLinting({projectRoot, packageManager, registries, vcs, pathWithinParent}),
     scaffoldHusky({projectRoot, packageManager, pathWithinParent})
   ]);

src/verification/scaffolder.test.js

@@ -17,7 +17,6 @@ vi.mock('../linting/index.js');
 describe('verification scaffolder', () => {
   it('should scaffold linting and testing', async () => {
     const projectRoot = any.string();
-    const visibility = any.string();
     const packageManager = any.string();
     const dialect = any.word();
     const vcs = any.simpleObject();
@@ -35,7 +34,7 @@ describe('verification scaffolder', () => {
       .calledWith({projectRoot, vcs, packageManager, registries, pathWithinParent})
       .thenResolve(lintingResults);
     when(scaffoldTesting)
-      .calledWith({projectRoot, tests, visibility, vcs, unitTestFrameworks, decisions, dialect, pathWithinParent})
+      .calledWith({projectRoot, tests, unitTestFrameworks, decisions, dialect})
       .thenResolve(testingResults);
     when(scaffoldHusky).calledWith({projectRoot, packageManager, pathWithinParent}).thenResolve(huskyResults);
     when(deepmerge.all).calledWith([testingResults, lintingResults, huskyResults]).thenReturn(mergedResults);
@@ -45,7 +44,6 @@ describe('verification scaffolder', () => {
       vcs,
       dialect,
       tests,
-      visibility,
       decisions,
       unitTestFrameworks,
       packageManager,