From 639c5238859e87177dd2f046e4dc743653274f8f Mon Sep 17 00:00:00 2001
From: Lucas Duailibe <lucasds@gmail.com>
Date: Tue, 5 Dec 2017 15:59:01 -0200
Subject: [PATCH 1/3] Skip folders in CLI pattern

---
 src/cli-util.js                                      |  2 +-
 .../__tests__/__snapshots__/skip-folders.js.snap     |  9 +++++++++
 tests_integration/__tests__/skip-folders.js          | 12 ++++++++++++
 tests_integration/cli/skip-folders/a/file.js         |  1 +
 tests_integration/cli/skip-folders/b/file.js         |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 tests_integration/__tests__/__snapshots__/skip-folders.js.snap
 create mode 100644 tests_integration/__tests__/skip-folders.js
 create mode 100644 tests_integration/cli/skip-folders/a/file.js
 create mode 100644 tests_integration/cli/skip-folders/b/file.js

diff --git a/src/cli-util.js b/src/cli-util.js
index 50e401b95..27c0494d2 100644
--- a/src/cli-util.js
+++ b/src/cli-util.js
@@ -281,7 +281,7 @@ function eachFilename(argv, patterns, callback) {
 
   try {
     const filePaths = globby
-      .sync(patterns, { dot: true })
+      .sync(patterns, { dot: true, nodir: true })
       .map(filePath => path.relative(process.cwd(), filePath));
 
     if (filePaths.length === 0) {
diff --git a/tests_integration/__tests__/__snapshots__/skip-folders.js.snap b/tests_integration/__tests__/__snapshots__/skip-folders.js.snap
new file mode 100644
index 000000000..8c967ae7b
--- /dev/null
+++ b/tests_integration/__tests__/__snapshots__/skip-folders.js.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`skips folders (stdout) 1`] = `
+"skip-folders/a/file.js
+skip-folders/b/file.js
+"
+`;
+
+exports[`skips folders (write) 1`] = `Array []`;
diff --git a/tests_integration/__tests__/skip-folders.js b/tests_integration/__tests__/skip-folders.js
new file mode 100644
index 000000000..f8d8c422a
--- /dev/null
+++ b/tests_integration/__tests__/skip-folders.js
@@ -0,0 +1,12 @@
+"use strict";
+
+const runPrettier = require("../runPrettier");
+
+expect.addSnapshotSerializer(require("../path-serializer"));
+
+describe("skips folders", () => {
+  runPrettier("cli", ["skip-folders/**/*", "-l"]).test({
+    status: 1,
+    stderr: ""
+  });
+});
diff --git a/tests_integration/cli/skip-folders/a/file.js b/tests_integration/cli/skip-folders/a/file.js
new file mode 100644
index 000000000..d785a6ad8
--- /dev/null
+++ b/tests_integration/cli/skip-folders/a/file.js
@@ -0,0 +1 @@
+fooA(     )
diff --git a/tests_integration/cli/skip-folders/b/file.js b/tests_integration/cli/skip-folders/b/file.js
new file mode 100644
index 000000000..2fc0b7efc
--- /dev/null
+++ b/tests_integration/cli/skip-folders/b/file.js
@@ -0,0 +1 @@
+fooB(   )

From 46f657bbaa9887c13813d233e3c3a2e6292855a8 Mon Sep 17 00:00:00 2001
From: Lucas Duailibe <lucasds@gmail.com>
Date: Tue, 5 Dec 2017 16:30:21 -0200
Subject: [PATCH 2/3] add another test case

---
 .../__tests__/__snapshots__/skip-folders.js.snap | 16 ++++++++++++----
 tests_integration/__tests__/skip-folders.js      | 11 +++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tests_integration/__tests__/__snapshots__/skip-folders.js.snap b/tests_integration/__tests__/__snapshots__/skip-folders.js.snap
index 8c967ae7b..26593103d 100644
--- a/tests_integration/__tests__/__snapshots__/skip-folders.js.snap
+++ b/tests_integration/__tests__/__snapshots__/skip-folders.js.snap
@@ -1,9 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`skips folders (stdout) 1`] = `
-"skip-folders/a/file.js
-skip-folders/b/file.js
+exports[`skip folders passed specifically (stdout) 1`] = `
+"a/file.js
+b/file.js
 "
 `;
 
-exports[`skips folders (write) 1`] = `Array []`;
+exports[`skip folders passed specifically (write) 1`] = `Array []`;
+
+exports[`skips folders in glob (stdout) 1`] = `
+"a/file.js
+b/file.js
+"
+`;
+
+exports[`skips folders in glob (write) 1`] = `Array []`;
diff --git a/tests_integration/__tests__/skip-folders.js b/tests_integration/__tests__/skip-folders.js
index f8d8c422a..84e1a31ef 100644
--- a/tests_integration/__tests__/skip-folders.js
+++ b/tests_integration/__tests__/skip-folders.js
@@ -4,9 +4,16 @@ const runPrettier = require("../runPrettier");
 
 expect.addSnapshotSerializer(require("../path-serializer"));
 
-describe("skips folders", () => {
-  runPrettier("cli", ["skip-folders/**/*", "-l"]).test({
+describe("skips folders in glob", () => {
+  runPrettier("cli/skip-folders", ["**/*", "-l"]).test({
     status: 1,
     stderr: ""
   });
 });
+
+describe("skip folders passed specifically", () => {
+  runPrettier("cli/skip-folders", [
+    "a", "a/file.js", "b", "b/file.js",
+    "-l"
+  ]).test({ status: 1, stderr: "" });
+});

From c986f45ec7f60295e73d52b8c94661937d17a158 Mon Sep 17 00:00:00 2001
From: Lucas Duailibe <lucasds@gmail.com>
Date: Tue, 5 Dec 2017 17:48:10 -0200
Subject: [PATCH 3/3] fix lint

---
 tests_integration/__tests__/skip-folders.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests_integration/__tests__/skip-folders.js b/tests_integration/__tests__/skip-folders.js
index 84e1a31ef..a2403bbf8 100644
--- a/tests_integration/__tests__/skip-folders.js
+++ b/tests_integration/__tests__/skip-folders.js
@@ -13,7 +13,10 @@ describe("skips folders in glob", () => {
 
 describe("skip folders passed specifically", () => {
   runPrettier("cli/skip-folders", [
-    "a", "a/file.js", "b", "b/file.js",
+    "a",
+    "a/file.js",
+    "b",
+    "b/file.js",
     "-l"
   ]).test({ status: 1, stderr: "" });
 });