chore: Fixed xo warning on collectFlowCoverageForFile parameters

rpl · Jul 8, 2018 · 4a23f86 · 4a23f86
1 parent 84ef534
commit 4a23f86
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/__tests__/test-flow.js b/src/__tests__/test-flow.js
@@ -172,7 +172,7 @@ it(
     const filename = 'src/fakeFilename.js';
 
     const collectData = await flow.collectFlowCoverageForFile(
-        'flow', '/fake/projectDir/', filename, tmpDirPath
+        {flowCommandPath: 'flow', projectDir: '/fake/projectDir/'}, filename, tmpDirPath
       );
 
     // Expect a flow coverage exception in the collected data.
@@ -214,7 +214,7 @@ it('collectFlowCoverageForFile collects parsing errors', async () => {
   const filename = 'src/fakeFilename.js';
 
   const collectData = await flow.collectFlowCoverageForFile(
-      'flow', '/fake/projectDir/', filename, tmpDirPath
+      {flowCommandPath: 'flow', projectDir: '/fake/projectDir/'}, filename, tmpDirPath
     );
 
   let expectedParsingError;
@@ -262,7 +262,7 @@ it('collectFlowCoverageForFile collects coverage errors', async () => {
   const filename = 'src/fakeFilename.js';
 
   const collectData = await flow.collectFlowCoverageForFile(
-      'flow', '/fake/projectDir/', filename, tmpDirPath
+      {flowCommandPath: 'flow', projectDir: '/fake/projectDir/'}, filename, tmpDirPath
     );
 
   // Expect a flow coverage exception in the collected data.
@@ -316,7 +316,7 @@ it('collectFlowCoverageForFile resolve coverage data', async () => {
   const flow = require(LIB_FLOW);
 
   const res = await flow.collectFlowCoverageForFile(
-    'flow', DEFAULT_FLOW_TIMEOUT, '/fake/projectDir', filename
+    {flowCommandPath: 'flow', flowCommandTimeout: DEFAULT_FLOW_TIMEOUT, projectDir: '/fake/projectDir'}, filename
   );
 
   expect(mockWriteFile.mock.calls.length).toBe(0);

diff --git a/src/lib/flow.js b/src/lib/flow.js
@@ -185,14 +185,25 @@ export type FlowCoverageJSONData = {
   flowCoverageStderr?: string|Buffer
 }
 
-export async function collectFlowCoverageForFile(
+type CollectFlowCoverageForFileOptions = {
   flowCommandPath: string,
   flowCommandTimeout: number,
   projectDir: string,
+  strictCoverage: bool,
+};
+
+export async function collectFlowCoverageForFile(
+  opts: CollectFlowCoverageForFileOptions,
   filename: string,
   tmpDirPath: ?string,
-  strictCoverage: ?boolean,
 ): Promise<FlowCoverageJSONData> {
+  const {
+    flowCommandPath,
+    flowCommandTimeout,
+    projectDir,
+    strictCoverage
+  } = opts;
+
   let tmpFilePath: ?string;
 
   if (process.env.VERBOSE && process.env.VERBOSE === 'DUMP_JSON') {
@@ -372,7 +383,6 @@ export function collectFlowCoverage(
 ): Promise<FlowCoverageSummaryData> {
   const {
     flowCommandPath,
-    flowCommandTimeout,
     projectDir,
     globIncludePatterns,
     globExcludePatterns = [],
@@ -456,9 +466,7 @@ export function collectFlowCoverage(
               console.log(`Queue ${filename} flow coverage data collection`);
             }
 
-            waitForCollectedDataFromFiles.push(collectFlowCoverageForFile(
-              flowCommandPath, flowCommandTimeout, projectDir, filename, tmpDirPath, strictCoverage
-            ).then(data => {
+            waitForCollectedDataFromFiles.push(collectFlowCoverageForFile(opts, filename, tmpDirPath).then(data => {
               /* eslint-disable camelcase */
               coverageSummaryData.covered_count += data.expressions.covered_count;
               coverageSummaryData.uncovered_count += data.expressions.uncovered_count;