From f0f2db8432eece61f0a4ccc86b35dce0798a1858 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 22 May 2015 16:37:19 -0400
Subject: [PATCH] another deconflicting test

---
 .../_config.js                                                 | 0
 .../bar.js                                                     | 0
 .../foo.js                                                     | 0
 .../main.js                                                    | 0
 test/function/imports-are-deconflicted-c/_config.js            | 3 +++
 test/function/imports-are-deconflicted-c/bar.js                | 1 +
 test/function/imports-are-deconflicted-c/foo.js                | 3 +++
 test/function/imports-are-deconflicted-c/main.js               | 3 +++
 8 files changed, 10 insertions(+)
 rename test/function/{imports-are-deconflicted-redux => imports-are-deconflicted-b}/_config.js (100%)
 rename test/function/{imports-are-deconflicted-redux => imports-are-deconflicted-b}/bar.js (100%)
 rename test/function/{imports-are-deconflicted-redux => imports-are-deconflicted-b}/foo.js (100%)
 rename test/function/{imports-are-deconflicted-redux => imports-are-deconflicted-b}/main.js (100%)
 create mode 100644 test/function/imports-are-deconflicted-c/_config.js
 create mode 100644 test/function/imports-are-deconflicted-c/bar.js
 create mode 100644 test/function/imports-are-deconflicted-c/foo.js
 create mode 100644 test/function/imports-are-deconflicted-c/main.js

diff --git a/test/function/imports-are-deconflicted-redux/_config.js b/test/function/imports-are-deconflicted-b/_config.js
similarity index 100%
rename from test/function/imports-are-deconflicted-redux/_config.js
rename to test/function/imports-are-deconflicted-b/_config.js
diff --git a/test/function/imports-are-deconflicted-redux/bar.js b/test/function/imports-are-deconflicted-b/bar.js
similarity index 100%
rename from test/function/imports-are-deconflicted-redux/bar.js
rename to test/function/imports-are-deconflicted-b/bar.js
diff --git a/test/function/imports-are-deconflicted-redux/foo.js b/test/function/imports-are-deconflicted-b/foo.js
similarity index 100%
rename from test/function/imports-are-deconflicted-redux/foo.js
rename to test/function/imports-are-deconflicted-b/foo.js
diff --git a/test/function/imports-are-deconflicted-redux/main.js b/test/function/imports-are-deconflicted-b/main.js
similarity index 100%
rename from test/function/imports-are-deconflicted-redux/main.js
rename to test/function/imports-are-deconflicted-b/main.js
diff --git a/test/function/imports-are-deconflicted-c/_config.js b/test/function/imports-are-deconflicted-c/_config.js
new file mode 100644
index 0000000..b33a03f
--- /dev/null
+++ b/test/function/imports-are-deconflicted-c/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'deconflicts imports, again'
+};
diff --git a/test/function/imports-are-deconflicted-c/bar.js b/test/function/imports-are-deconflicted-c/bar.js
new file mode 100644
index 0000000..a056dae
--- /dev/null
+++ b/test/function/imports-are-deconflicted-c/bar.js
@@ -0,0 +1 @@
+export default { isBar: true };
diff --git a/test/function/imports-are-deconflicted-c/foo.js b/test/function/imports-are-deconflicted-c/foo.js
new file mode 100644
index 0000000..676b6b4
--- /dev/null
+++ b/test/function/imports-are-deconflicted-c/foo.js
@@ -0,0 +1,3 @@
+import foo from './bar';
+
+export default foo.isBar;
diff --git a/test/function/imports-are-deconflicted-c/main.js b/test/function/imports-are-deconflicted-c/main.js
new file mode 100644
index 0000000..75d6989
--- /dev/null
+++ b/test/function/imports-are-deconflicted-c/main.js
@@ -0,0 +1,3 @@
+import foo from './foo';
+
+assert.ok( foo );