Enable Flow types on tests (#140)

* enable flow types on tests

* add ava.babel = "inherit" config

Author: Sebastian McKenzie

package.json

@@ -67,6 +67,7 @@
     "test": "make test"
   },
   "ava": {
+    "babel": "inherit",
     "require": [
       "./test/_register.js"
     ]

src/fetchers/_base.js

@@ -20,12 +20,12 @@ import * as fs from "../util/fs.js";
 let path = require("path");
 
 export default class BaseFetcher {
-  constructor(remote: PackageRemote, config: Config, saveForOffline: boolean) {
+  constructor(remote: PackageRemote, config: Config, saveForOffline?: boolean) {
     this.reference      = remote.reference;
     this.registry       = remote.registry;
     this.hash           = remote.hash;
     this.config         = config;
-    this.saveForOffline = saveForOffline;
+    this.saveForOffline = !!saveForOffline;
   }
 
   registry: RegistryNames;

src/fetchers/index.js

@@ -9,6 +9,7 @@
  * @flow
  */
 
-export { default as git } from "./git";
-export { default as copy } from "./copy";
-export { default as tarball } from "./tarball";
+export { default as base } from "./_base.js";
+export { default as git } from "./git.js";
+export { default as copy } from "./copy.js";
+export { default as tarball } from "./tarball.js";

src/types.js

@@ -31,7 +31,7 @@ export type PersonObject = {
 
 // package remote that's used to store how to fetch a package
 export type PackageRemote = {
-  type: "tarball" | "git" | "copy",
+  type: "tarball" | "git" | "copy" | "base",
   registry: RegistryNames,
   reference: string,
   resolved?: ?string,

src/util/normalise-manifest/util.js

@@ -61,7 +61,7 @@ export function normalisePerson(person: mixed): mixed | PersonObject {
   return parsePerson(stringifyPerson(person));
 }
 
-export function extractDescription(readme: string): ?string {
+export function extractDescription(readme: ?string): ?string {
   if (!readme) return;
 
   // split into lines

test/_temp.js

@@ -5,11 +5,13 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 let temp = require("temp").track();
 
-export default function (filename: string): Promise<string> {
+export default function (filename?: string): Promise<string> {
   return new Promise((resolve, reject) => {
     temp.mkdir(filename, function (err, path) {
       if (err) {

test/commands/install.js

@@ -5,8 +5,11 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
+import { Reporter } from "../../src/reporters/index.js";
 import * as reporters from "../../src/reporters/index.js";
 import * as constants from "../../src/constants.js";
 import { default as Lockfile, parse } from "../../src/lockfile/index.js";
@@ -18,8 +21,8 @@ import assert from "assert";
 import semver from "semver";
 
 let stream = require("stream");
-let test   = require("ava");
-let path   = require("path");
+let test = require("ava");
+let path = require("path");
 
 let fixturesLoc = path.join(__dirname, "..", "fixtures", "install");
 
@@ -41,7 +44,13 @@ async function createLockfile(dir, strict, save) {
   return new Lockfile(lockfile, strict, save);
 }
 
-async function run(flags, args, name, checkInstalled, beforeInstall) {
+async function run(
+  flags: Object,
+  args: Array<string>,
+  name: string,
+  checkInstalled: ?(config: Config, reporter: Reporter) => ?Promise<void>,
+  beforeInstall: ?(cwd: string) => ?Promise<void>
+) {
   let out = "";
   let stdout = new stream.Writable({
     write(data) {
@@ -117,7 +126,6 @@ test("[network] install with arg that has binaries", () => {
 test("[network] install with --save and offline mirror", () => {
   let mirrorPath = "mirror-for-offline";
   return run({save: true}, ["is-array@1.0.1"], "install-with-save-offline-mirror", async (config) => {
-
     let allFiles = await fs.walk(config.cwd);
 
     assert(allFiles.findIndex((file) => {
@@ -131,7 +139,6 @@ test("[network] install with --save and offline mirror", () => {
 
     await fs.unlink(path.join(config.cwd, mirrorPath));
     await fs.unlink(path.join(config.cwd, "package.json"));
-    return allFiles;
   });
 });
 
@@ -152,7 +159,6 @@ test("[network] install with --save and without offline mirror", () => {
 
     await fs.unlink(path.join(config.cwd, mirrorPath));
     await fs.unlink(path.join(config.cwd, "package.json"));
-    return allFiles;
   });
 });
 
@@ -164,8 +170,6 @@ test("install from offline mirror", () => {
     assert(allFiles.findIndex((file) => {
       return file.relative === "node_modules/fake-fbkpm-dependency/package.json";
     }) !== -1);
-
-    return allFiles;
   });
 });
 

test/constants.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 import { getPathKey } from "../src/constants.js";

test/fetchers.js

@@ -5,30 +5,33 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 /* eslint max-len: 0 */
 
-import TarballFetcher from "../src/fetchers/tarball";
-import BaseFetcher from "../src/fetchers/_base";
-import CopyFetcher from "../src/fetchers/copy";
-import GitFetcher from "../src/fetchers/git";
-import Config from "../src/config";
+import TarballFetcher from "../src/fetchers/tarball.js";
+import BaseFetcher from "../src/fetchers/_base.js";
+import CopyFetcher from "../src/fetchers/copy.js";
+import GitFetcher from "../src/fetchers/git.js";
+import { NoopReporter } from "../src/reporters/index.js";
+import Config from "../src/config.js";
 import mkdir from "./_temp.js";
 import * as fs from "../src/util/fs.js";
 
 let path = require("path");
 let test = require("ava");
 
 async function createConfig() {
-  let config = new Config;
+  let config = new Config(new NoopReporter);
   await config.init();
   return config;
 }
 
 test("BaseFetcher.fetch", async (t) => {
   let dir = await mkdir("base-fetcher");
   let fetcher = new BaseFetcher({
-    type: "",
+    type: "base",
     registry: "npm",
     reference: ""
   }, await createConfig());

test/lockfile.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 /* eslint quotes: 0 */
 
@@ -140,7 +142,9 @@ test("Lockfile.getLockfile", (t) => {
         resolved: "http://example.com/barfoo",
         registry: "bower"
       }
-    }
+    },
+
+    foobar2: {}
   };
 
   patterns.foobar2 = patterns.foobar;
@@ -194,6 +198,8 @@ test("Lockfile.getLockfile (sorting)", (t) => {
         registry: "npm"
       }
     },
+
+    foobar1: {}
   };
 
   patterns.foobar1 = patterns.foobar2;

test/normalise-manifest.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 /* eslint max-len: 0 */
 

test/package-resolver.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 /* eslint max-len: 0 */
 

test/reporters/_mock.js

@@ -5,25 +5,34 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 let Stdin = require("mock-stdin").stdin.Class;
 let { Writable } = require("stream");
 
 export default function (Reporter: Function, interceptor: Function) {
-  return async function (callback) {
+  return async function (
+    callback: (reporter: Reporter, opts: Object) => ?Promise<void>
+  ) {
     let data = {
       stderr: "",
       stdout: ""
     };
 
     let buildStream = (key) => {
       let stream = new Writable;
+
+      // $FlowFixMe: TODO add to flow definition
       stream.columns = 1000;
+
+      // $FlowFixMe: TODO ditto
       stream.write = (msg) => {
         stream.emit("data", msg);
         data[key] += msg;
       };
+
       return stream;
     };
 

test/reporters/base.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 import BaseReporter from "../../lib/reporters/_base.js";

test/reporters/buffer.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 import BufferReporter from "../../lib/reporters/buffer.js";

test/reporters/console.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 import ProgressBar from "../../lib/reporters/console/progress-bar.js";

test/reporters/json.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 /* eslint quotes: 0 */
 

test/util/blocking-queue.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 import BlockingQueue from "../../src/util/blocking-queue.js";
@@ -18,7 +20,7 @@ test("max concurrency", async function () {
   let running = 0;
 
   function create() {
-    return queue.push(++i, async function () {
+    return queue.push(++i + "", async function () {
       running++;
       await wait(100);
 

test/util/promise.js

@@ -5,6 +5,8 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @flow
  */
 
 import * as promise from "../../src/util/promise.js";