From d608b7ba28b42671b67c6935c68139b0bd697dc4 Mon Sep 17 00:00:00 2001
From: Brian Ng <bng412@gmail.com>
Date: Mon, 22 May 2017 17:31:53 -0500
Subject: [PATCH] Bump Babylon and enable additional tests (#1668)

---
 package.json                                   |  2 +-
 tests/flow/declare_export/jsfmt.spec.js        |  2 +-
 .../es_declare_module/flow-typed/jsfmt.spec.js |  4 ++++
 tests/flow/es_declare_module/jsfmt.spec.js     |  2 +-
 .../getters_and_setters_disabled/jsfmt.spec.js |  2 +-
 .../getters_and_setters_enabled/jsfmt.spec.js  |  6 +-----
 tests/flow/refinements/jsfmt.spec.js           |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap           | 18 ++++++++++++++++++
 tests/flow_generic/generic.js                  |  2 ++
 tests/unicode/jsfmt.spec.js                    |  2 +-
 yarn.lock                                      |  4 ++++
 11 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 tests/flow_generic/generic.js

diff --git a/package.json b/package.json
index d16eadfdd..b440fc7a8 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "ast-types": "0.9.8",
     "babel-code-frame": "6.22.0",
-    "babylon": "7.0.0-beta.8",
+    "babylon": "7.0.0-beta.10",
     "chalk": "1.1.3",
     "esutils": "2.0.2",
     "flow-parser": "0.45.0",
diff --git a/tests/flow/declare_export/jsfmt.spec.js b/tests/flow/declare_export/jsfmt.spec.js
index 989047bcc..1840e9d36 100644
--- a/tests/flow/declare_export/jsfmt.spec.js
+++ b/tests/flow/declare_export/jsfmt.spec.js
@@ -1 +1 @@
-run_spec(__dirname);
+run_spec(__dirname, null, ["babylon"]);
diff --git a/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js b/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js
index 989047bcc..12db41ac7 100644
--- a/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js
+++ b/tests/flow/es_declare_module/flow-typed/jsfmt.spec.js
@@ -1 +1,5 @@
 run_spec(__dirname);
+
+// TODO: While the tests render the same, Flow is dropping the line breaks
+// between each declaration while Babylon preserves them.
+//run_spec(__dirname, null, ["babylon"]);
diff --git a/tests/flow/es_declare_module/jsfmt.spec.js b/tests/flow/es_declare_module/jsfmt.spec.js
index 989047bcc..1840e9d36 100644
--- a/tests/flow/es_declare_module/jsfmt.spec.js
+++ b/tests/flow/es_declare_module/jsfmt.spec.js
@@ -1 +1 @@
-run_spec(__dirname);
+run_spec(__dirname, null, ["babylon"]);
diff --git a/tests/flow/getters_and_setters_disabled/jsfmt.spec.js b/tests/flow/getters_and_setters_disabled/jsfmt.spec.js
index 989047bcc..1840e9d36 100644
--- a/tests/flow/getters_and_setters_disabled/jsfmt.spec.js
+++ b/tests/flow/getters_and_setters_disabled/jsfmt.spec.js
@@ -1 +1 @@
-run_spec(__dirname);
+run_spec(__dirname, null, ["babylon"]);
diff --git a/tests/flow/getters_and_setters_enabled/jsfmt.spec.js b/tests/flow/getters_and_setters_enabled/jsfmt.spec.js
index 21dba9fe1..1840e9d36 100644
--- a/tests/flow/getters_and_setters_enabled/jsfmt.spec.js
+++ b/tests/flow/getters_and_setters_enabled/jsfmt.spec.js
@@ -1,5 +1 @@
-run_spec(__dirname);
-
-// TODO: These tests used to be run in babylon as well, but currently babylon
-// fails to parse them.
-// run_spec(__dirname, null, ["babylon"]);
+run_spec(__dirname, null, ["babylon"]);
diff --git a/tests/flow/refinements/jsfmt.spec.js b/tests/flow/refinements/jsfmt.spec.js
index 989047bcc..1840e9d36 100644
--- a/tests/flow/refinements/jsfmt.spec.js
+++ b/tests/flow/refinements/jsfmt.spec.js
@@ -1 +1 @@
-run_spec(__dirname);
+run_spec(__dirname, null, ["babylon"]);
diff --git a/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap b/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap
index 464cea15c..a3a442a12 100644
--- a/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap
@@ -54,6 +54,24 @@ var X = {
 
 `;
 
+exports[`generic.js 1`] = `
+const identity = <T>(t: T): T => t;
+const a = 1;
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+const identity = <T>(t: T): T => t;
+const a = 1;
+
+`;
+
+exports[`generic.js 2`] = `
+const identity = <T>(t: T): T => t;
+const a = 1;
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+const identity = <T>(t: T): T => t;
+const a = 1;
+
+`;
+
 exports[`nullable.js 1`] = `
 function formatEntireFile(
   fileVersion: FileVersion,
diff --git a/tests/flow_generic/generic.js b/tests/flow_generic/generic.js
new file mode 100644
index 000000000..e3a473924
--- /dev/null
+++ b/tests/flow_generic/generic.js
@@ -0,0 +1,2 @@
+const identity = <T>(t: T): T => t;
+const a = 1;
diff --git a/tests/unicode/jsfmt.spec.js b/tests/unicode/jsfmt.spec.js
index 989047bcc..1840e9d36 100644
--- a/tests/unicode/jsfmt.spec.js
+++ b/tests/unicode/jsfmt.spec.js
@@ -1 +1 @@
-run_spec(__dirname);
+run_spec(__dirname, null, ["babylon"]);
diff --git a/yarn.lock b/yarn.lock
index 2613a31b6..dcfc69b8b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -304,6 +304,10 @@ babel-types@^6.18.0, babel-types@^6.24.1:
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
+babylon@7.0.0-beta.10:
+  version "7.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.10.tgz#07a210ea6a4480c9581794403907a6c72abc607c"
+
 babylon@7.0.0-beta.8:
   version "7.0.0-beta.8"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949"