@form8ion/javascript 15.6.1 → 15.7.0

package/lib/index.js

@@ -43,8 +43,8 @@ const questionNames$1 = {
   DIALECT: 'dialect'
 };
 
-async function scaffoldCoverage({projectRoot, vcs, visibility, pathWithinParent}) {
-  return deepmerge(await scaffold({projectRoot}), await scaffold$1({vcs, visibility, pathWithinParent}));
+async function scaffoldCoverage({projectRoot}) {
+  return deepmerge(await scaffold({projectRoot}), await scaffold$1({projectRoot}));
 }
 
 function nyvInUse({projectRoot}) {
@@ -120,20 +120,12 @@ async function gatherUnitTestingInput({frameworks, decisions}) {
 
 const pluginsSchema = joi.object().pattern(/^/, optionsSchemas.form8ionPlugin).default({});
 
-async function scaffoldUnitTesting({
-  projectRoot,
-  frameworks,
-  decisions,
-  visibility,
-  vcs,
-  pathWithinParent,
-  dialect
-}) {
+async function scaffoldUnitTesting({projectRoot, frameworks, decisions, dialect}) {
   const validatedFrameworks = validateOptions(pluginsSchema, frameworks);
   const [framework, coverage] = await Promise.all([
     gatherUnitTestingInput({frameworks: validatedFrameworks, decisions})
       .then(chosenFramework => scaffoldChoice(validatedFrameworks, chosenFramework, {projectRoot, dialect})),
-    scaffoldCoverage({projectRoot, vcs, visibility, pathWithinParent})
+    scaffoldCoverage({projectRoot})
   ]);
 
   return deepmerge.all([
@@ -183,6 +175,7 @@ function validate(options) {
     }).default({registries: {}}),
     plugins: {
       unitTestFrameworks: pluginsSchema,
+      integrationTestFrameworks: pluginsSchema,
       packageBundlers: pluginsSchema,
       applicationTypes: pluginsSchema,
       packageTypes: pluginsSchema,
@@ -1511,32 +1504,30 @@ async function scaffoldProjectTypePlugin({
   );
 }
 
+function scaffoldIntegrationTesting() {
+  return {};
+}
+
 async function scaffoldTesting({
   projectRoot,
-  visibility,
   tests: {unit, integration},
-  vcs,
   unitTestFrameworks,
+  integrationTestFrameworks,
   decisions,
-  dialect,
-  pathWithinParent
+  dialect
 }) {
-  const unitResults = unit
-    ? await scaffoldUnitTesting({
-      projectRoot,
-      visibility,
-      vcs,
-      frameworks: unitTestFrameworks,
-      decisions,
-      dialect,
-      pathWithinParent
-    })
-    : {};
+  const [unitResults, integrationResults] = await Promise.all([
+    unit ? scaffoldUnitTesting({projectRoot, frameworks: unitTestFrameworks, decisions, dialect}) : {},
+    integration
+      ? scaffoldIntegrationTesting()
+      : {}
+  ]);
 
-  return deepmerge(
+  return deepmerge.all([
     {dependencies: {javascript: {development: [...(unit || integration) ? ['@travi/any'] : []]}}, eslint: {}},
-    unitResults
-  );
+    unitResults,
+    integrationResults
+  ]);
 }
 
 function buildAllowedHosts({packageManager, registries = {}}) {
@@ -1599,26 +1590,17 @@ async function scaffoldLinting({projectRoot, packageManager, registries}) {
 async function scaffoldVerification({
   projectRoot,
   dialect,
-  visibility,
   packageManager,
   vcs,
   registries,
   tests,
   unitTestFrameworks,
+  integrationTestFrameworks,
   decisions,
   pathWithinParent
 }) {
   const [testingResults, lintingResults, huskyResults] = await Promise.all([
-    scaffoldTesting({
-      projectRoot,
-      tests,
-      visibility,
-      vcs,
-      unitTestFrameworks,
-      decisions,
-      dialect,
-      pathWithinParent
-    }),
+    scaffoldTesting({projectRoot, tests, unitTestFrameworks, integrationTestFrameworks, decisions, dialect}),
     scaffoldLinting({projectRoot, packageManager, registries}),
     scaffold$2({projectRoot, packageManager, pathWithinParent})
   ]);
@@ -1715,6 +1697,7 @@ async function scaffoldJavascript(options) {
       monorepoTypes,
       packageBundlers,
       unitTestFrameworks,
+      integrationTestFrameworks,
       hosts,
       ciServices
     }
@@ -1762,12 +1745,12 @@ async function scaffoldJavascript(options) {
   const verificationResults = await scaffoldVerification({
     projectRoot,
     dialect,
-    visibility,
     packageManager,
     vcs,
     registries: configs.registries,
     tests,
     unitTestFrameworks,
+    integrationTestFrameworks,
     decisions,
     pathWithinParent
   });