From 5a833bd982f8f43f8df7234d0f177030db53b053 Mon Sep 17 00:00:00 2001
From: Futago-za Ryuu <futagoza.ryuu@gmail.com>
Date: Mon, 2 Oct 2017 03:49:42 +0100
Subject: [PATCH] Moved all spec and benchmark tests

- Moved benchmark to test/benchmark
- Moved tests to test/spec
- Removed individual servers
- Implemented single test server
- Moved server assets to test/server
- Updated Gulpfile.js
- Moved tools/impact to test/impact

This commit move's nearly all code related to testing the PEG.js module into the test directory, and also ensures they run as they did before the move.
---
 benchmark/server                              | 36 -------------------
 gulpfile.js                                   | 16 ++++-----
 package.json                                  |  1 +
 {benchmark => test/benchmark}/README.md       |  0
 {benchmark => test/benchmark}/benchmarks.js   |  0
 .../benchmark}/css/960.gs/min/960.css         |  0
 .../benchmark}/css/960.gs/min/960_24_col.css  |  0
 .../benchmark}/css/960.gs/min/reset.css       |  0
 .../benchmark}/css/960.gs/min/text.css        |  0
 .../benchmark}/css/960.gs/src/960.css         |  0
 .../benchmark}/css/960.gs/src/960_24_col.css  |  0
 .../benchmark}/css/960.gs/src/reset.css       |  0
 .../benchmark}/css/960.gs/src/text.css        |  0
 .../benchmark}/css/blueprint/min/ie.css       |  0
 .../benchmark}/css/blueprint/min/print.css    |  0
 .../benchmark}/css/blueprint/min/screen.css   |  0
 .../benchmark}/css/blueprint/src/forms.css    |  0
 .../benchmark}/css/blueprint/src/grid.css     |  0
 .../benchmark}/css/blueprint/src/ie.css       |  0
 .../benchmark}/css/blueprint/src/print.css    |  0
 .../benchmark}/css/blueprint/src/reset.css    |  0
 .../css/blueprint/src/typography.css          |  0
 {benchmark => test/benchmark}/index.js        | 18 +++++-----
 .../benchmark}/json/example1.json             |  0
 .../benchmark}/json/example2.json             |  0
 .../benchmark}/json/example3.json             |  0
 .../benchmark}/json/example4.json             |  0
 .../benchmark}/json/example5.json             |  0
 {benchmark => test/benchmark}/run             |  0
 {benchmark => test/benchmark}/runner.js       |  4 +--
 {tools => test}/impact                        |  0
 test/server                                   | 35 ------------------
 .../index.css => test/server/benchmark.css    |  0
 .../index.html => test/server/benchmark.html  |  4 +--
 test/server/index.html                        | 24 +++++++++++++
 test/server/run                               | 34 ++++++++++++++++++
 test/{index.html => server/spec.html}         |  4 +--
 .../server}/vendor/jquery.scrollto/LICENSE    |  0
 .../vendor/jquery.scrollto/jquery.scrollTo.js | 12 +++----
 .../server}/vendor/jquery/LICENSE.txt         |  0
 .../server}/vendor/jquery/jquery.js           |  0
 test/{ => server}/vendor/mocha/LICENSE        |  0
 test/{ => server}/vendor/mocha/mocha.css      |  0
 test/{ => server}/vendor/mocha/mocha.js       |  0
 test/{ => spec}/.eslintrc.json                |  0
 test/{ => spec}/README.md                     |  0
 .../api/generated-parser-api.spec.js          |  2 +-
 test/{ => spec}/api/pegjs-api.spec.js         |  2 +-
 test/{ => spec}/api/plugin-api.spec.js        |  2 +-
 .../generated-parser-behavior.spec.js         |  2 +-
 .../compiler/passes/generate-bytecode.spec.js |  2 +-
 .../unit/compiler/passes/helpers.js           |  2 +-
 .../passes/remove-proxy-rules.spec.js         |  2 +-
 .../passes/report-duplicate-labels.spec.js    |  2 +-
 .../passes/report-duplicate-rules.spec.js     |  2 +-
 .../passes/report-infinite-recursion.spec.js  |  2 +-
 .../passes/report-infinite-repetition.spec.js |  2 +-
 .../passes/report-undefined-rules.spec.js     |  2 +-
 test/{ => spec}/unit/parser.spec.js           |  2 +-
 59 files changed, 99 insertions(+), 115 deletions(-)
 delete mode 100755 benchmark/server
 rename {benchmark => test/benchmark}/README.md (100%)
 rename {benchmark => test/benchmark}/benchmarks.js (100%)
 rename {benchmark => test/benchmark}/css/960.gs/min/960.css (100%)
 rename {benchmark => test/benchmark}/css/960.gs/min/960_24_col.css (100%)
 rename {benchmark => test/benchmark}/css/960.gs/min/reset.css (100%)
 rename {benchmark => test/benchmark}/css/960.gs/min/text.css (100%)
 rename {benchmark => test/benchmark}/css/960.gs/src/960.css (100%)
 rename {benchmark => test/benchmark}/css/960.gs/src/960_24_col.css (100%)
 rename {benchmark => test/benchmark}/css/960.gs/src/reset.css (100%)
 rename {benchmark => test/benchmark}/css/960.gs/src/text.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/min/ie.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/min/print.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/min/screen.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/src/forms.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/src/grid.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/src/ie.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/src/print.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/src/reset.css (100%)
 rename {benchmark => test/benchmark}/css/blueprint/src/typography.css (100%)
 rename {benchmark => test/benchmark}/index.js (90%)
 rename {benchmark => test/benchmark}/json/example1.json (100%)
 rename {benchmark => test/benchmark}/json/example2.json (100%)
 rename {benchmark => test/benchmark}/json/example3.json (100%)
 rename {benchmark => test/benchmark}/json/example4.json (100%)
 rename {benchmark => test/benchmark}/json/example5.json (100%)
 rename {benchmark => test/benchmark}/run (100%)
 mode change 100755 => 100644
 rename {benchmark => test/benchmark}/runner.js (96%)
 rename {tools => test}/impact (100%)
 mode change 100755 => 100644
 delete mode 100755 test/server
 rename benchmark/index.css => test/server/benchmark.css (100%)
 rename benchmark/index.html => test/server/benchmark.html (91%)
 create mode 100644 test/server/index.html
 create mode 100644 test/server/run
 rename test/{index.html => server/spec.html} (80%)
 rename {benchmark => test/server}/vendor/jquery.scrollto/LICENSE (100%)
 rename {benchmark => test/server}/vendor/jquery.scrollto/jquery.scrollTo.js (98%)
 rename {benchmark => test/server}/vendor/jquery/LICENSE.txt (100%)
 rename {benchmark => test/server}/vendor/jquery/jquery.js (100%)
 rename test/{ => server}/vendor/mocha/LICENSE (100%)
 rename test/{ => server}/vendor/mocha/mocha.css (100%)
 rename test/{ => server}/vendor/mocha/mocha.js (100%)
 rename test/{ => spec}/.eslintrc.json (100%)
 rename test/{ => spec}/README.md (100%)
 rename test/{ => spec}/api/generated-parser-api.spec.js (99%)
 rename test/{ => spec}/api/pegjs-api.spec.js (99%)
 rename test/{ => spec}/api/plugin-api.spec.js (98%)
 rename test/{ => spec}/behavior/generated-parser-behavior.spec.js (99%)
 rename test/{ => spec}/unit/compiler/passes/generate-bytecode.spec.js (99%)
 rename test/{ => spec}/unit/compiler/passes/helpers.js (97%)
 rename test/{ => spec}/unit/compiler/passes/remove-proxy-rules.spec.js (94%)
 rename test/{ => spec}/unit/compiler/passes/report-duplicate-labels.spec.js (96%)
 rename test/{ => spec}/unit/compiler/passes/report-duplicate-rules.spec.js (87%)
 rename test/{ => spec}/unit/compiler/passes/report-infinite-recursion.spec.js (97%)
 rename test/{ => spec}/unit/compiler/passes/report-infinite-repetition.spec.js (97%)
 rename test/{ => spec}/unit/compiler/passes/report-undefined-rules.spec.js (89%)
 rename test/{ => spec}/unit/parser.spec.js (99%)

diff --git a/benchmark/server b/benchmark/server
deleted file mode 100755
index 253103a..0000000
--- a/benchmark/server
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-/* eslint-env node */
-
-// Small server whose main purpose is to ensure that both the benchmarked code
-// and the benchmark get passed through Babel & Browserify before they are
-// served to the browser.
-
-let babelify = require("babelify");
-let browserify = require("browserify");
-let express = require("express");
-let glob = require("glob");
-let logger = require("morgan");
-
-let app = express();
-
-app.use(logger("dev"));
-app.use(express.static(__dirname));
-app.use("/examples", express.static(`${__dirname}/../examples`));
-
-app.get("/bundle.js", (req, res) => {
-  let files = glob.sync(`${__dirname}/**/*.js`, {
-    ignore: `${__dirname}/vendor/**/*`
-  });
-
-  browserify(files)
-    .transform(babelify, { presets: "es2015", compact: false })
-    .bundle()
-    .pipe(res);
-});
-
-app.listen(8000, () => {
-  console.log("Benchmark server running at http://localhost:8000...");
-});
diff --git a/gulpfile.js b/gulpfile.js
index 8a3e2fe..03c9ee9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -32,20 +32,16 @@ const HEADER = [
 const JS_FILES = [
   "lib/**/*.js",
   "!lib/parser.js",
-  "test/**/*.js",
-  "test/server",
-  "!test/vendor/**/*",
-  "benchmark/**/*.js",
-  "benchmark/run",
-  "benchmark/server",
-  "!benchmark/vendor/**/*",
+  "test/benchmark/**/*.js",
+  "test/benchmark/run",
+  "test/spec/**/*.js",
+  "test/server/run",
   "bin/*.js",
   "gulpfile.js"
 ];
 
 const TEST_FILES = [
-  "test/**/*.js",
-  "!test/vendor/**/*"
+  "test/spec/**/*.js"
 ];
 
 function generate(contents) {
@@ -71,7 +67,7 @@ gulp.task("test", () =>
 
 // Run benchmarks.
 gulp.task("benchmark", () =>
-  spawn("node", ["benchmark/run"], { stdio: "inherit" })
+  spawn("node", ["test/benchmark/run"], { stdio: "inherit" })
 );
 
 // Create the browser build.
diff --git a/package.json b/package.json
index 62cb56b..4c22f18 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "lint": "gulp lint",
     "spec": "gulp test",
     "test": "gulp",
+    "test:server": "node test/server/run",
     "benchmark": "gulp benchmark",
     "browser:build": "gulp browser:build",
     "browser:clean": "gulp browser:build",
diff --git a/benchmark/README.md b/test/benchmark/README.md
similarity index 100%
rename from benchmark/README.md
rename to test/benchmark/README.md
diff --git a/benchmark/benchmarks.js b/test/benchmark/benchmarks.js
similarity index 100%
rename from benchmark/benchmarks.js
rename to test/benchmark/benchmarks.js
diff --git a/benchmark/css/960.gs/min/960.css b/test/benchmark/css/960.gs/min/960.css
similarity index 100%
rename from benchmark/css/960.gs/min/960.css
rename to test/benchmark/css/960.gs/min/960.css
diff --git a/benchmark/css/960.gs/min/960_24_col.css b/test/benchmark/css/960.gs/min/960_24_col.css
similarity index 100%
rename from benchmark/css/960.gs/min/960_24_col.css
rename to test/benchmark/css/960.gs/min/960_24_col.css
diff --git a/benchmark/css/960.gs/min/reset.css b/test/benchmark/css/960.gs/min/reset.css
similarity index 100%
rename from benchmark/css/960.gs/min/reset.css
rename to test/benchmark/css/960.gs/min/reset.css
diff --git a/benchmark/css/960.gs/min/text.css b/test/benchmark/css/960.gs/min/text.css
similarity index 100%
rename from benchmark/css/960.gs/min/text.css
rename to test/benchmark/css/960.gs/min/text.css
diff --git a/benchmark/css/960.gs/src/960.css b/test/benchmark/css/960.gs/src/960.css
similarity index 100%
rename from benchmark/css/960.gs/src/960.css
rename to test/benchmark/css/960.gs/src/960.css
diff --git a/benchmark/css/960.gs/src/960_24_col.css b/test/benchmark/css/960.gs/src/960_24_col.css
similarity index 100%
rename from benchmark/css/960.gs/src/960_24_col.css
rename to test/benchmark/css/960.gs/src/960_24_col.css
diff --git a/benchmark/css/960.gs/src/reset.css b/test/benchmark/css/960.gs/src/reset.css
similarity index 100%
rename from benchmark/css/960.gs/src/reset.css
rename to test/benchmark/css/960.gs/src/reset.css
diff --git a/benchmark/css/960.gs/src/text.css b/test/benchmark/css/960.gs/src/text.css
similarity index 100%
rename from benchmark/css/960.gs/src/text.css
rename to test/benchmark/css/960.gs/src/text.css
diff --git a/benchmark/css/blueprint/min/ie.css b/test/benchmark/css/blueprint/min/ie.css
similarity index 100%
rename from benchmark/css/blueprint/min/ie.css
rename to test/benchmark/css/blueprint/min/ie.css
diff --git a/benchmark/css/blueprint/min/print.css b/test/benchmark/css/blueprint/min/print.css
similarity index 100%
rename from benchmark/css/blueprint/min/print.css
rename to test/benchmark/css/blueprint/min/print.css
diff --git a/benchmark/css/blueprint/min/screen.css b/test/benchmark/css/blueprint/min/screen.css
similarity index 100%
rename from benchmark/css/blueprint/min/screen.css
rename to test/benchmark/css/blueprint/min/screen.css
diff --git a/benchmark/css/blueprint/src/forms.css b/test/benchmark/css/blueprint/src/forms.css
similarity index 100%
rename from benchmark/css/blueprint/src/forms.css
rename to test/benchmark/css/blueprint/src/forms.css
diff --git a/benchmark/css/blueprint/src/grid.css b/test/benchmark/css/blueprint/src/grid.css
similarity index 100%
rename from benchmark/css/blueprint/src/grid.css
rename to test/benchmark/css/blueprint/src/grid.css
diff --git a/benchmark/css/blueprint/src/ie.css b/test/benchmark/css/blueprint/src/ie.css
similarity index 100%
rename from benchmark/css/blueprint/src/ie.css
rename to test/benchmark/css/blueprint/src/ie.css
diff --git a/benchmark/css/blueprint/src/print.css b/test/benchmark/css/blueprint/src/print.css
similarity index 100%
rename from benchmark/css/blueprint/src/print.css
rename to test/benchmark/css/blueprint/src/print.css
diff --git a/benchmark/css/blueprint/src/reset.css b/test/benchmark/css/blueprint/src/reset.css
similarity index 100%
rename from benchmark/css/blueprint/src/reset.css
rename to test/benchmark/css/blueprint/src/reset.css
diff --git a/benchmark/css/blueprint/src/typography.css b/test/benchmark/css/blueprint/src/typography.css
similarity index 100%
rename from benchmark/css/blueprint/src/typography.css
rename to test/benchmark/css/blueprint/src/typography.css
diff --git a/benchmark/index.js b/test/benchmark/index.js
similarity index 90%
rename from benchmark/index.js
rename to test/benchmark/index.js
index 190d95a..57fd4aa 100644
--- a/benchmark/index.js
+++ b/test/benchmark/index.js
@@ -10,12 +10,6 @@ $("#run").click(() => {
 
   let resultsTable = $("#results-table");
 
-  function appendHeading(heading) {
-    resultsTable.append(
-      "<tr class='heading'><th colspan='4'>" + heading + "</th></tr>"
-    );
-  }
-
   function appendResult(klass, title, url, inputSize, parseTime) {
     const KB = 1024;
     const MS_IN_S = 1000;
@@ -76,7 +70,7 @@ $("#run").click(() => {
     readFile(file) {
       return $.ajax({
         type: "GET",
-        url: file,
+        url: "benchmark/" + file,
         dataType: "text",
         async: false
       }).responseText;
@@ -90,14 +84,20 @@ $("#run").click(() => {
       appendResult(
         "individual",
         test.title,
-        benchmark.id + "/" + test.file,
+        "benchmark/" + benchmark.id + "/" + test.file,
         inputSize,
         parseTime
       );
     },
 
     benchmarkStart(benchmark) {
-      appendHeading(benchmark.title);
+      resultsTable.append(
+          "<tr class='heading'><th colspan='4'>"
+        +   "<a href='../../examples/" + benchmark.id + ".pegjs'>"
+        +     benchmark.title
+        +   "</a>"
+        + "</th></tr>"
+      );
     },
 
     benchmarkFinish(benchmark, inputSize, parseTime) {
diff --git a/benchmark/json/example1.json b/test/benchmark/json/example1.json
similarity index 100%
rename from benchmark/json/example1.json
rename to test/benchmark/json/example1.json
diff --git a/benchmark/json/example2.json b/test/benchmark/json/example2.json
similarity index 100%
rename from benchmark/json/example2.json
rename to test/benchmark/json/example2.json
diff --git a/benchmark/json/example3.json b/test/benchmark/json/example3.json
similarity index 100%
rename from benchmark/json/example3.json
rename to test/benchmark/json/example3.json
diff --git a/benchmark/json/example4.json b/test/benchmark/json/example4.json
similarity index 100%
rename from benchmark/json/example4.json
rename to test/benchmark/json/example4.json
diff --git a/benchmark/json/example5.json b/test/benchmark/json/example5.json
similarity index 100%
rename from benchmark/json/example5.json
rename to test/benchmark/json/example5.json
diff --git a/benchmark/run b/test/benchmark/run
old mode 100755
new mode 100644
similarity index 100%
rename from benchmark/run
rename to test/benchmark/run
diff --git a/benchmark/runner.js b/test/benchmark/runner.js
similarity index 96%
rename from benchmark/runner.js
rename to test/benchmark/runner.js
index 861bf7a..7b49506 100644
--- a/benchmark/runner.js
+++ b/test/benchmark/runner.js
@@ -2,7 +2,7 @@
 
 /* global setTimeout */
 
-let peg = require("../lib/peg");
+let peg = require("../../lib/peg");
 
 let Runner = {
   run(benchmarks, runCount, options, callbacks) {
@@ -53,7 +53,7 @@ let Runner = {
         callbacks.benchmarkStart(benchmark);
 
         state.parser = peg.generate(
-          callbacks.readFile("../examples/" + benchmark.id + ".pegjs"),
+          callbacks.readFile("../../examples/" + benchmark.id + ".pegjs"),
           options
         );
         state.benchmarkInputSize = 0;
diff --git a/tools/impact b/test/impact
old mode 100755
new mode 100644
similarity index 100%
rename from tools/impact
rename to test/impact
diff --git a/test/server b/test/server
deleted file mode 100755
index 9dbb3f2..0000000
--- a/test/server
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-/* eslint-env node */
-
-// Small server whose main purpose is to ensure that both the tested code and
-// the tests get passed through Babel & Browserify before they are served to the
-// browser.
-
-let babelify = require("babelify");
-let browserify = require("browserify");
-let express = require("express");
-let glob = require("glob");
-let logger = require("morgan");
-
-let app = express();
-
-app.use(logger("dev"));
-app.use(express.static(__dirname));
-
-app.get("/bundle.js", (req, res) => {
-  let files = glob.sync(`${__dirname}/**/*.js`, {
-    ignore: `${__dirname}/vendor/**/*`
-  });
-
-  browserify(files)
-    .transform(babelify, { presets: "es2015", compact: false })
-    .bundle()
-    .pipe(res);
-});
-
-app.listen(8000, () => {
-  console.log("Test server running at http://localhost:8000...");
-});
diff --git a/benchmark/index.css b/test/server/benchmark.css
similarity index 100%
rename from benchmark/index.css
rename to test/server/benchmark.css
diff --git a/benchmark/index.html b/test/server/benchmark.html
similarity index 91%
rename from benchmark/index.html
rename to test/server/benchmark.html
index ec6a390..3d53fe6 100644
--- a/benchmark/index.html
+++ b/test/server/benchmark.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>PEG.js Benchmark Suite</title>
-    <link rel="stylesheet" href="index.css">
+    <link rel="stylesheet" href="benchmark.css">
   </head>
   <body>
     <h1>PEG.js Benchmark Suite</h1>
@@ -35,6 +35,6 @@
 
     <script src="vendor/jquery/jquery.js"></script>
     <script src="vendor/jquery.scrollto/jquery.scrollTo.js"></script>
-    <script src="bundle.js"></script>
+    <script src="benchmark/bundle.js"></script>
   </body>
 </html>
diff --git a/test/server/index.html b/test/server/index.html
new file mode 100644
index 0000000..7c0d5fa
--- /dev/null
+++ b/test/server/index.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>PEG.js Test Suites</title>
+    <style>
+      a {
+        text-decoration: none;
+        color: #1A0BF1;
+      }
+      a:hover {
+        text-decoration: underline;
+        color: #9D0BF1;
+      }
+    </style>
+  </head>
+  <body>
+    <p>
+      <h1>PEG.js Test Suites</h1>
+    </p>
+    &bull; <a href="/benchmark.html">Benchmark Suite</a><br />
+    &bull; <a href="/spec.html">Spec Suite</a>
+  </body>
+</html>
diff --git a/test/server/run b/test/server/run
new file mode 100644
index 0000000..1843fb1
--- /dev/null
+++ b/test/server/run
@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+
+"use strict";
+
+/* eslint-env node */
+
+let babelify = require("babelify");
+let browserify = require("browserify");
+let express = require("express");
+let glob = require("glob");
+let logger = require("morgan");
+
+let app = express();
+
+app.use(logger("dev"));
+app.use(express.static(__dirname));
+app.use("/benchmark", express.static(`${__dirname}/../benchmark`));
+app.use("/examples", express.static(`${__dirname}/../../examples`));
+
+app.get("/:dir/bundle.js", (req, res) => {
+  browserify(glob.sync(
+    `${__dirname}/../${req.params.dir}/**/*.js`
+  ))
+    .transform(babelify, {
+      presets: "es2015",
+      compact: false
+    })
+    .bundle()
+    .pipe(res);
+});
+
+app.listen(8000, () => {
+  console.log("Test server running at: http://localhost:8000/");
+});
diff --git a/test/index.html b/test/server/spec.html
similarity index 80%
rename from test/index.html
rename to test/server/spec.html
index ef3d950..1775f44 100644
--- a/test/index.html
+++ b/test/server/spec.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>PEG.js Test Suite</title>
+    <title>PEG.js Spec Suite</title>
     <link rel="stylesheet" href="vendor/mocha/mocha.css">
   </head>
   <body>
@@ -11,7 +11,7 @@
     <script>
       mocha.setup('bdd');
     </script>
-    <script src="bundle.js"></script>
+    <script src="spec/bundle.js"></script>
     <script>
       mocha.run();
     </script>
diff --git a/benchmark/vendor/jquery.scrollto/LICENSE b/test/server/vendor/jquery.scrollto/LICENSE
similarity index 100%
rename from benchmark/vendor/jquery.scrollto/LICENSE
rename to test/server/vendor/jquery.scrollto/LICENSE
diff --git a/benchmark/vendor/jquery.scrollto/jquery.scrollTo.js b/test/server/vendor/jquery.scrollto/jquery.scrollTo.js
similarity index 98%
rename from benchmark/vendor/jquery.scrollto/jquery.scrollTo.js
rename to test/server/vendor/jquery.scrollto/jquery.scrollTo.js
index 65a020d..ead8108 100644
--- a/benchmark/vendor/jquery.scrollto/jquery.scrollTo.js
+++ b/test/server/vendor/jquery.scrollto/jquery.scrollTo.js
@@ -1,7 +1,7 @@
-/**
- * Copyright (c) 2007-2015 Ariel Flesler - aflesler<a>gmail<d>com | http://flesler.blogspot.com
- * Licensed under MIT
- * @author Ariel Flesler
- * @version 2.1.2
- */
+/**
+ * Copyright (c) 2007-2015 Ariel Flesler - aflesler<a>gmail<d>com | http://flesler.blogspot.com
+ * Licensed under MIT
+ * @author Ariel Flesler
+ * @version 2.1.2
+ */
 ;(function(f){"use strict";"function"===typeof define&&define.amd?define(["jquery"],f):"undefined"!==typeof module&&module.exports?module.exports=f(require("jquery")):f(jQuery)})(function($){"use strict";function n(a){return!a.nodeName||-1!==$.inArray(a.nodeName.toLowerCase(),["iframe","#document","html","body"])}function h(a){return $.isFunction(a)||$.isPlainObject(a)?a:{top:a,left:a}}var p=$.scrollTo=function(a,d,b){return $(window).scrollTo(a,d,b)};p.defaults={axis:"xy",duration:0,limit:!0};$.fn.scrollTo=function(a,d,b){"object"=== typeof d&&(b=d,d=0);"function"===typeof b&&(b={onAfter:b});"max"===a&&(a=9E9);b=$.extend({},p.defaults,b);d=d||b.duration;var u=b.queue&&1<b.axis.length;u&&(d/=2);b.offset=h(b.offset);b.over=h(b.over);return this.each(function(){function k(a){var k=$.extend({},b,{queue:!0,duration:d,complete:a&&function(){a.call(q,e,b)}});r.animate(f,k)}if(null!==a){var l=n(this),q=l?this.contentWindow||window:this,r=$(q),e=a,f={},t;switch(typeof e){case "number":case "string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(e)){e= h(e);break}e=l?$(e):$(e,q);case "object":if(e.length===0)return;if(e.is||e.style)t=(e=$(e)).offset()}var v=$.isFunction(b.offset)&&b.offset(q,e)||b.offset;$.each(b.axis.split(""),function(a,c){var d="x"===c?"Left":"Top",m=d.toLowerCase(),g="scroll"+d,h=r[g](),n=p.max(q,c);t?(f[g]=t[m]+(l?0:h-r.offset()[m]),b.margin&&(f[g]-=parseInt(e.css("margin"+d),10)||0,f[g]-=parseInt(e.css("border"+d+"Width"),10)||0),f[g]+=v[m]||0,b.over[m]&&(f[g]+=e["x"===c?"width":"height"]()*b.over[m])):(d=e[m],f[g]=d.slice&& "%"===d.slice(-1)?parseFloat(d)/100*n:d);b.limit&&/^\d+$/.test(f[g])&&(f[g]=0>=f[g]?0:Math.min(f[g],n));!a&&1<b.axis.length&&(h===f[g]?f={}:u&&(k(b.onAfterFirst),f={}))});k(b.onAfter)}})};p.max=function(a,d){var b="x"===d?"Width":"Height",h="scroll"+b;if(!n(a))return a[h]-$(a)[b.toLowerCase()]();var b="client"+b,k=a.ownerDocument||a.document,l=k.documentElement,k=k.body;return Math.max(l[h],k[h])-Math.min(l[b],k[b])};$.Tween.propHooks.scrollLeft=$.Tween.propHooks.scrollTop={get:function(a){return $(a.elem)[a.prop]()}, set:function(a){var d=this.get(a);if(a.options.interrupt&&a._last&&a._last!==d)return $(a.elem).stop();var b=Math.round(a.now);d!==b&&($(a.elem)[a.prop](b),a._last=this.get(a))}};return p});
\ No newline at end of file
diff --git a/benchmark/vendor/jquery/LICENSE.txt b/test/server/vendor/jquery/LICENSE.txt
similarity index 100%
rename from benchmark/vendor/jquery/LICENSE.txt
rename to test/server/vendor/jquery/LICENSE.txt
diff --git a/benchmark/vendor/jquery/jquery.js b/test/server/vendor/jquery/jquery.js
similarity index 100%
rename from benchmark/vendor/jquery/jquery.js
rename to test/server/vendor/jquery/jquery.js
diff --git a/test/vendor/mocha/LICENSE b/test/server/vendor/mocha/LICENSE
similarity index 100%
rename from test/vendor/mocha/LICENSE
rename to test/server/vendor/mocha/LICENSE
diff --git a/test/vendor/mocha/mocha.css b/test/server/vendor/mocha/mocha.css
similarity index 100%
rename from test/vendor/mocha/mocha.css
rename to test/server/vendor/mocha/mocha.css
diff --git a/test/vendor/mocha/mocha.js b/test/server/vendor/mocha/mocha.js
similarity index 100%
rename from test/vendor/mocha/mocha.js
rename to test/server/vendor/mocha/mocha.js
diff --git a/test/.eslintrc.json b/test/spec/.eslintrc.json
similarity index 100%
rename from test/.eslintrc.json
rename to test/spec/.eslintrc.json
diff --git a/test/README.md b/test/spec/README.md
similarity index 100%
rename from test/README.md
rename to test/spec/README.md
diff --git a/test/api/generated-parser-api.spec.js b/test/spec/api/generated-parser-api.spec.js
similarity index 99%
rename from test/api/generated-parser-api.spec.js
rename to test/spec/api/generated-parser-api.spec.js
index b1827bb..2e7e84e 100644
--- a/test/api/generated-parser-api.spec.js
+++ b/test/spec/api/generated-parser-api.spec.js
@@ -3,7 +3,7 @@
 /* global console */
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 let sinon = require("sinon");
 
 let expect = chai.expect;
diff --git a/test/api/pegjs-api.spec.js b/test/spec/api/pegjs-api.spec.js
similarity index 99%
rename from test/api/pegjs-api.spec.js
rename to test/spec/api/pegjs-api.spec.js
index f06f28d..a0ad3c1 100644
--- a/test/api/pegjs-api.spec.js
+++ b/test/spec/api/pegjs-api.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 let sinon = require("sinon");
 
 let expect = chai.expect;
diff --git a/test/api/plugin-api.spec.js b/test/spec/api/plugin-api.spec.js
similarity index 98%
rename from test/api/plugin-api.spec.js
rename to test/spec/api/plugin-api.spec.js
index 84a5bf4..93342df 100644
--- a/test/api/plugin-api.spec.js
+++ b/test/spec/api/plugin-api.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 
 let expect = chai.expect;
 
diff --git a/test/behavior/generated-parser-behavior.spec.js b/test/spec/behavior/generated-parser-behavior.spec.js
similarity index 99%
rename from test/behavior/generated-parser-behavior.spec.js
rename to test/spec/behavior/generated-parser-behavior.spec.js
index e50d1a6..aeea59b 100644
--- a/test/behavior/generated-parser-behavior.spec.js
+++ b/test/spec/behavior/generated-parser-behavior.spec.js
@@ -3,7 +3,7 @@
 /* global console */
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 let sinon = require("sinon");
 
 let expect = chai.expect;
diff --git a/test/unit/compiler/passes/generate-bytecode.spec.js b/test/spec/unit/compiler/passes/generate-bytecode.spec.js
similarity index 99%
rename from test/unit/compiler/passes/generate-bytecode.spec.js
rename to test/spec/unit/compiler/passes/generate-bytecode.spec.js
index 128e3fe..ef55023 100644
--- a/test/unit/compiler/passes/generate-bytecode.spec.js
+++ b/test/spec/unit/compiler/passes/generate-bytecode.spec.js
@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/generate-bytecode");
+let pass = require("../../../../../lib/compiler/passes/generate-bytecode");
 
 chai.use(helpers);
 
diff --git a/test/unit/compiler/passes/helpers.js b/test/spec/unit/compiler/passes/helpers.js
similarity index 97%
rename from test/unit/compiler/passes/helpers.js
rename to test/spec/unit/compiler/passes/helpers.js
index 0232b79..0d16573 100644
--- a/test/unit/compiler/passes/helpers.js
+++ b/test/spec/unit/compiler/passes/helpers.js
@@ -1,6 +1,6 @@
 "use strict";
 
-let parser = require("../../../../lib/parser");
+let parser = require("../../../../../lib/parser");
 
 module.exports = function(chai, utils) {
   let Assertion = chai.Assertion;
diff --git a/test/unit/compiler/passes/remove-proxy-rules.spec.js b/test/spec/unit/compiler/passes/remove-proxy-rules.spec.js
similarity index 94%
rename from test/unit/compiler/passes/remove-proxy-rules.spec.js
rename to test/spec/unit/compiler/passes/remove-proxy-rules.spec.js
index e7afc23..46d6108 100644
--- a/test/unit/compiler/passes/remove-proxy-rules.spec.js
+++ b/test/spec/unit/compiler/passes/remove-proxy-rules.spec.js
@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/remove-proxy-rules");
+let pass = require("../../../../../lib/compiler/passes/remove-proxy-rules");
 
 chai.use(helpers);
 
diff --git a/test/unit/compiler/passes/report-duplicate-labels.spec.js b/test/spec/unit/compiler/passes/report-duplicate-labels.spec.js
similarity index 96%
rename from test/unit/compiler/passes/report-duplicate-labels.spec.js
rename to test/spec/unit/compiler/passes/report-duplicate-labels.spec.js
index a775e89..a69f914 100644
--- a/test/unit/compiler/passes/report-duplicate-labels.spec.js
+++ b/test/spec/unit/compiler/passes/report-duplicate-labels.spec.js
@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-duplicate-labels");
+let pass = require("../../../../../lib/compiler/passes/report-duplicate-labels");
 
 chai.use(helpers);
 
diff --git a/test/unit/compiler/passes/report-duplicate-rules.spec.js b/test/spec/unit/compiler/passes/report-duplicate-rules.spec.js
similarity index 87%
rename from test/unit/compiler/passes/report-duplicate-rules.spec.js
rename to test/spec/unit/compiler/passes/report-duplicate-rules.spec.js
index 6c9283c..cf619ac 100644
--- a/test/unit/compiler/passes/report-duplicate-rules.spec.js
+++ b/test/spec/unit/compiler/passes/report-duplicate-rules.spec.js
@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-duplicate-rules");
+let pass = require("../../../../../lib/compiler/passes/report-duplicate-rules");
 
 chai.use(helpers);
 
diff --git a/test/unit/compiler/passes/report-infinite-recursion.spec.js b/test/spec/unit/compiler/passes/report-infinite-recursion.spec.js
similarity index 97%
rename from test/unit/compiler/passes/report-infinite-recursion.spec.js
rename to test/spec/unit/compiler/passes/report-infinite-recursion.spec.js
index 28b46f3..3d668c7 100644
--- a/test/unit/compiler/passes/report-infinite-recursion.spec.js
+++ b/test/spec/unit/compiler/passes/report-infinite-recursion.spec.js
@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-infinite-recursion");
+let pass = require("../../../../../lib/compiler/passes/report-infinite-recursion");
 
 chai.use(helpers);
 
diff --git a/test/unit/compiler/passes/report-infinite-repetition.spec.js b/test/spec/unit/compiler/passes/report-infinite-repetition.spec.js
similarity index 97%
rename from test/unit/compiler/passes/report-infinite-repetition.spec.js
rename to test/spec/unit/compiler/passes/report-infinite-repetition.spec.js
index ff3dea9..ede874a 100644
--- a/test/unit/compiler/passes/report-infinite-repetition.spec.js
+++ b/test/spec/unit/compiler/passes/report-infinite-repetition.spec.js
@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-infinite-repetition");
+let pass = require("../../../../../lib/compiler/passes/report-infinite-repetition");
 
 chai.use(helpers);
 
diff --git a/test/unit/compiler/passes/report-undefined-rules.spec.js b/test/spec/unit/compiler/passes/report-undefined-rules.spec.js
similarity index 89%
rename from test/unit/compiler/passes/report-undefined-rules.spec.js
rename to test/spec/unit/compiler/passes/report-undefined-rules.spec.js
index bfaa43a..082c7b7 100644
--- a/test/unit/compiler/passes/report-undefined-rules.spec.js
+++ b/test/spec/unit/compiler/passes/report-undefined-rules.spec.js
@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-undefined-rules");
+let pass = require("../../../../../lib/compiler/passes/report-undefined-rules");
 
 chai.use(helpers);
 
diff --git a/test/unit/parser.spec.js b/test/spec/unit/parser.spec.js
similarity index 99%
rename from test/unit/parser.spec.js
rename to test/spec/unit/parser.spec.js
index f872db9..c794c5f 100644
--- a/test/unit/parser.spec.js
+++ b/test/spec/unit/parser.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 let chai = require("chai");
-let parser = require("../../lib/parser");
+let parser = require("../../../lib/parser");
 
 let expect = chai.expect;