restructure test directory

2014-10-11 22:42:31 +11:00
parent a1b2da49d7
commit bb9b7455b5
312 changed files with 24 additions and 25 deletions
--- a/test/_helper.js
+++ b/test/_helper.js
@@ -1,7 +1,7 @@
 var fs = require("fs");
 var _  = require("lodash");

-var fixturesDir = __dirname + "/syntax-fixtures";
+var fixturesDir = __dirname + "/fixtures/syntax";

 var humanise = function (val) {
  return val.replace(/-/g, " ");
--- a/test/bin.js
+++ b/test/bin.js
@@ -7,7 +7,7 @@ var path    = require("path");
 var fs      = require("fs");
 var _       = require("lodash");

-var fixtureLoc = __dirname + "/bin-fixtures";
+var fixtureLoc = __dirname + "/fixtures/bin";
 var tmpLoc = __dirname + "/tmp";

 var readFile = function (filename) {
--- a/test/browser.html
+++ b/test/browser.html
@@ -0,0 +1,20 @@
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Mocha</title>
+    <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
+  </head>
+  <body>
+    <div id="mocha"></div>
+    <script src="../node_modules/proclaim/lib/proclaim.js"></script>
+    <script src="../node_modules/lodash/lodash.js"></script>
+    <script src="../node_modules/mocha/mocha.js"></script>
+    <script src="../dist/6to5.js"></script>
+    <script>mocha.setup("tdd");</script>
+    <script src="../dist/6to5-test.js"></script>
+    <script>
+      mocha.checkLeaks();
+      mocha.run();
+    </script>
+  </body>
+</html>
--- a/test/browser/index.html
+++ b/test/browser/index.html
@@ -1,20 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Mocha</title>
-    <link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
-  </head>
-  <body>
-    <div id="mocha"></div>
-    <script src="../../node_modules/proclaim/lib/proclaim.js"></script>
-    <script src="../../node_modules/lodash/lodash.js"></script>
-    <script src="../../node_modules/mocha/mocha.js"></script>
-    <script src="../../dist/6to5.js"></script>
-    <script>mocha.setup("tdd");</script>
-    <script src="../../dist/6to5-test.js"></script>
-    <script>
-      mocha.checkLeaks();
-      mocha.run();
-    </script>
-  </body>
-</html>
--- a/test/fixtures/bin/6to5-node/--eval/options.json
+++ b/test/fixtures/bin/6to5-node/--eval/options.json
--- a/test/fixtures/bin/6to5-node/--print/options.json
+++ b/test/fixtures/bin/6to5-node/--print/options.json
--- a/test/fixtures/bin/6to5-node/directory/in-files/foo/index.js
+++ b/test/fixtures/bin/6to5-node/directory/in-files/foo/index.js
--- a/test/fixtures/bin/6to5-node/directory/options.json
+++ b/test/fixtures/bin/6to5-node/directory/options.json
--- a/test/fixtures/bin/6to5-node/directory/stdout.txt
+++ b/test/fixtures/bin/6to5-node/directory/stdout.txt
--- a/test/fixtures/bin/6to5-node/filename/in-files/foo.js
+++ b/test/fixtures/bin/6to5-node/filename/in-files/foo.js
--- a/test/fixtures/bin/6to5-node/filename/options.json
+++ b/test/fixtures/bin/6to5-node/filename/options.json
--- a/test/fixtures/bin/6to5-node/filename/stdout.txt
+++ b/test/fixtures/bin/6to5-node/filename/stdout.txt
--- a/test/fixtures/bin/6to5-node/filenames/in-files/bar.js
+++ b/test/fixtures/bin/6to5-node/filenames/in-files/bar.js
--- a/test/fixtures/bin/6to5-node/filenames/in-files/foo.js
+++ b/test/fixtures/bin/6to5-node/filenames/in-files/foo.js
--- a/test/fixtures/bin/6to5-node/filenames/options.json
+++ b/test/fixtures/bin/6to5-node/filenames/options.json
--- a/test/fixtures/bin/6to5-node/filenames/stdout.txt
+++ b/test/fixtures/bin/6to5-node/filenames/stdout.txt
--- a/test/fixtures/bin/6to5-node/require/in-files/bar.js
+++ b/test/fixtures/bin/6to5-node/require/in-files/bar.js
--- a/test/fixtures/bin/6to5-node/require/in-files/foo.js
+++ b/test/fixtures/bin/6to5-node/require/in-files/foo.js
--- a/test/fixtures/bin/6to5-node/require/options.json
+++ b/test/fixtures/bin/6to5-node/require/options.json
--- a/test/fixtures/bin/6to5-node/require/stdout.txt
+++ b/test/fixtures/bin/6to5-node/require/stdout.txt
--- a/test/fixtures/bin/6to5/--blacklist/options.json
+++ b/test/fixtures/bin/6to5/--blacklist/options.json
--- a/test/fixtures/bin/6to5/--blacklist/stdin.txt
+++ b/test/fixtures/bin/6to5/--blacklist/stdin.txt
--- a/test/fixtures/bin/6to5/--blacklist/stdout.txt
+++ b/test/fixtures/bin/6to5/--blacklist/stdout.txt
--- a/test/fixtures/bin/6to5/--whitelist/options.json
+++ b/test/fixtures/bin/6to5/--whitelist/options.json
--- a/test/fixtures/bin/6to5/--whitelist/stdin.txt
+++ b/test/fixtures/bin/6to5/--whitelist/stdin.txt
--- a/test/fixtures/bin/6to5/--whitelist/stdout.txt
+++ b/test/fixtures/bin/6to5/--whitelist/stdout.txt
--- a/--source-maps-inline/in-files/src/bar/bar.js
+++ b/--source-maps-inline/in-files/src/bar/bar.js
--- a/--source-maps-inline/in-files/src/foo.js
+++ b/--source-maps-inline/in-files/src/foo.js
--- a/--source-maps-inline/options.json
+++ b/--source-maps-inline/options.json
--- a/--source-maps-inline/out-files/lib/bar/bar.js
+++ b/--source-maps-inline/out-files/lib/bar/bar.js
--- a/--source-maps-inline/out-files/lib/foo.js
+++ b/--source-maps-inline/out-files/lib/foo.js
--- a/--source-maps-inline/stdout.txt
+++ b/--source-maps-inline/stdout.txt
--- a/--source-maps/in-files/src/bar/bar.js
+++ b/--source-maps/in-files/src/bar/bar.js
--- a/--source-maps/in-files/src/foo.js
+++ b/--source-maps/in-files/src/foo.js
--- a/--source-maps/options.json
+++ b/--source-maps/options.json
--- a/--source-maps/out-files/lib/bar/bar.js
+++ b/--source-maps/out-files/lib/bar/bar.js
--- a/--source-maps/out-files/lib/bar/bar.js.map
+++ b/--source-maps/out-files/lib/bar/bar.js.map
--- a/--source-maps/out-files/lib/foo.js
+++ b/--source-maps/out-files/lib/foo.js
--- a/--source-maps/out-files/lib/foo.js.map
+++ b/--source-maps/out-files/lib/foo.js.map
--- a/test/fixtures/bin/6to5/dir
+++ b/test/fixtures/bin/6to5/dir
--- a/--out-dir/in-files/src/bar/bar.js
+++ b/--out-dir/in-files/src/bar/bar.js
--- a/--out-dir/in-files/src/foo.js
+++ b/--out-dir/in-files/src/foo.js
--- a/test/fixtures/bin/6to5/dir
+++ b/test/fixtures/bin/6to5/dir
--- a/--out-dir/out-files/lib/bar/bar.js
+++ b/--out-dir/out-files/lib/bar/bar.js
--- a/--out-dir/out-files/lib/foo.js
+++ b/--out-dir/out-files/lib/foo.js
--- a/test/fixtures/bin/6to5/dir
+++ b/test/fixtures/bin/6to5/dir
--- a/--source-maps-inline/in-files/script.js
+++ b/--source-maps-inline/in-files/script.js
--- a/--source-maps-inline/options.json
+++ b/--source-maps-inline/options.json
--- a/--source-maps-inline/out-files/script2.js
+++ b/--source-maps-inline/out-files/script2.js
--- a/test/fixtures/bin/6to5/filename
+++ b/test/fixtures/bin/6to5/filename
--- a/test/fixtures/bin/6to5/filename
+++ b/test/fixtures/bin/6to5/filename
--- a/--out-file/out-files/script2.js
+++ b/--out-file/out-files/script2.js
--- a/--source-maps-inline/in-files/script.js
+++ b/--source-maps-inline/in-files/script.js
--- a/--source-maps-inline/in-files/script2.js
+++ b/--source-maps-inline/in-files/script2.js
--- a/--source-maps-inline/options.json
+++ b/--source-maps-inline/options.json
--- a/--source-maps-inline/out-files/script3.js
+++ b/--source-maps-inline/out-files/script3.js
--- a/--source-maps/in-files/script.js
+++ b/--source-maps/in-files/script.js
--- a/--source-maps/in-files/script2.js
+++ b/--source-maps/in-files/script2.js
--- a/test/fixtures/bin/6to5/filenames
+++ b/test/fixtures/bin/6to5/filenames
--- a/--source-maps/out-files/script3.js
+++ b/--source-maps/out-files/script3.js
--- a/--source-maps/out-files/script3.js.map
+++ b/--source-maps/out-files/script3.js.map
--- a/test/fixtures/bin/6to5/filenames
+++ b/test/fixtures/bin/6to5/filenames
--- a/test/fixtures/bin/6to5/filenames
+++ b/test/fixtures/bin/6to5/filenames
--- a/test/fixtures/bin/6to5/filenames
+++ b/test/fixtures/bin/6to5/filenames
--- a/test/fixtures/bin/6to5/filenames
+++ b/test/fixtures/bin/6to5/filenames
--- a/test/fixtures/bin/6to5/stdin
+++ b/test/fixtures/bin/6to5/stdin
--- a/test/fixtures/bin/6to5/stdin
+++ b/test/fixtures/bin/6to5/stdin
--- a/test/fixtures/bin/6to5/stdin
+++ b/test/fixtures/bin/6to5/stdin
--- a/test/fixtures/bin/6to5/stdin
+++ b/test/fixtures/bin/6to5/stdin
--- a/--source-maps/out-files/test.js
+++ b/--source-maps/out-files/test.js
--- a/--source-maps/out-files/test.js.map
+++ b/--source-maps/out-files/test.js.map
--- a/test/fixtures/bin/6to5/stdin
+++ b/test/fixtures/bin/6to5/stdin
--- a/test/fixtures/bin/6to5/stdin
+++ b/test/fixtures/bin/6to5/stdin
--- a/--out-file/out-files/script.js
+++ b/--out-file/out-files/script.js
--- a/test/fixtures/bin/6to5/stdin
+++ b/test/fixtures/bin/6to5/stdin
--- a/--source-maps-inline/options.json
+++ b/--source-maps-inline/options.json
--- a/--source-maps-inline/stdin.txt
+++ b/--source-maps-inline/stdin.txt
--- a/--source-maps-inline/stdout.txt
+++ b/--source-maps-inline/stdout.txt
--- a/test/fixtures/bin/6to5/stdin/stdin.txt
+++ b/test/fixtures/bin/6to5/stdin/stdin.txt
--- a/test/fixtures/bin/6to5/stdin/stdout.txt
+++ b/test/fixtures/bin/6to5/stdin/stdout.txt
--- a/test/fixtures/syntax/api/blacklist/actual.js
+++ b/test/fixtures/syntax/api/blacklist/actual.js
--- a/test/fixtures/syntax/api/blacklist/expected.js
+++ b/test/fixtures/syntax/api/blacklist/expected.js
--- a/test/fixtures/syntax/api/blacklist/options.json
+++ b/test/fixtures/syntax/api/blacklist/options.json
--- a/test/fixtures/syntax/api/whitelist/actual.js
+++ b/test/fixtures/syntax/api/whitelist/actual.js
--- a/test/fixtures/syntax/api/whitelist/expected.js
+++ b/test/fixtures/syntax/api/whitelist/expected.js
--- a/test/fixtures/syntax/api/whitelist/options.json
+++ b/test/fixtures/syntax/api/whitelist/options.json
--- a/test/fixtures/syntax/array-comprehension/multiple-if/actual.js
+++ b/test/fixtures/syntax/array-comprehension/multiple-if/actual.js
--- a/test/fixtures/syntax/array-comprehension/multiple-if/expected.js
+++ b/test/fixtures/syntax/array-comprehension/multiple-if/expected.js
--- a/test/fixtures/syntax/array-comprehension/multiple/actual.js
+++ b/test/fixtures/syntax/array-comprehension/multiple/actual.js
--- a/test/fixtures/syntax/array-comprehension/multiple/expected.js
+++ b/test/fixtures/syntax/array-comprehension/multiple/expected.js
--- a/test/fixtures/syntax/array-comprehension/no-in/actual.js
+++ b/test/fixtures/syntax/array-comprehension/no-in/actual.js
--- a/test/fixtures/syntax/array-comprehension/no-in/options.json
+++ b/test/fixtures/syntax/array-comprehension/no-in/options.json
--- a/test/fixtures/syntax/array-comprehension/single-if/actual.js
+++ b/test/fixtures/syntax/array-comprehension/single-if/actual.js
--- a/test/fixtures/syntax/array-comprehension/single-if/expected.js
+++ b/test/fixtures/syntax/array-comprehension/single-if/expected.js
--- a/test/fixtures/syntax/array-comprehension/single/actual.js
+++ b/test/fixtures/syntax/array-comprehension/single/actual.js
--- a/test/fixtures/syntax/array-comprehension/single/expected.js
+++ b/test/fixtures/syntax/array-comprehension/single/expected.js
--- a/test/fixtures/syntax/arrow-functions/arguments/actual.js
+++ b/test/fixtures/syntax/arrow-functions/arguments/actual.js
--- a/test/fixtures/syntax/arrow-functions/arguments/expected.js
+++ b/test/fixtures/syntax/arrow-functions/arguments/expected.js
--- a/test/fixtures/syntax/arrow-functions/empty-arguments/actual.js
+++ b/test/fixtures/syntax/arrow-functions/empty-arguments/actual.js
--- a/test/fixtures/syntax/arrow-functions/empty-arguments/expected.js
+++ b/test/fixtures/syntax/arrow-functions/empty-arguments/expected.js
--- a/Show More
+++ b/Show More