No issue: Remove /stable/ subdirectories

jshint · Aug 3, 2013 · 83374ad · 83374ad
1 parent 1a3c47f
commit 83374ad
Show file tree

Hide file tree

Showing 114 changed files with 26 additions and 26 deletions.
diff --git a/bin/build b/bin/build
@@ -4,14 +4,14 @@
 "use strict";
 
 var browserify = require("browserify");
-var bundle     = browserify("./src/stable/jshint.js");
+var bundle     = browserify("./src/jshint.js");
 var version    = require("../package.json").version;
 require("shelljs/make");
 
 if (!test("-e", "../dist"))
 	mkdir("../dist");
 
-bundle.require("./src/stable/jshint.js", { expose: "jshint" });
+bundle.require("./src/jshint.js", { expose: "jshint" });
 bundle.bundle({}, function (err, src) {
 	var web   = "./dist/jshint-" + version + ".js";
 	var rhino = "./dist/jshint-rhino-" + version + ".js";

diff --git a/bin/jshint b/bin/jshint
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("./../src/cli/cli.js").interpret(process.argv);
+require("../src/cli.js").interpret(process.argv);
diff --git a/package.json b/package.json
@@ -25,11 +25,11 @@
 
 	"scripts": {
 		"build": "node make.js build",
-		"test": "nodeunit tests tests/stable/regression tests/stable/unit",
+		"test": "nodeunit tests tests/regression tests/unit",
 		"pretest": "jshint src"
 	},
 
-	"main": "./src/stable/jshint.js",
+	"main": "./src/jshint.js",
 
 	"dependencies": {
 		"shelljs":    "0.1.x",

diff --git a/src/cli/cli.js → src/cli.js b/src/cli/cli.js → src/cli.js
@@ -1,11 +1,11 @@
 "use strict";
 
-var cli = require("cli");
-var path = require("path");
-var shjs = require("shelljs");
-var minimatch = require("minimatch");
-var JSHINT = require("../stable/jshint.js").JSHINT;
-var defReporter = require("../reporters/default").reporter;
+var cli         = require("cli");
+var path        = require("path");
+var shjs        = require("shelljs");
+var minimatch   = require("minimatch");
+var JSHINT      = require("./jshint.js").JSHINT;
+var defReporter = require("./reporters/default").reporter;
 
 var OPTIONS = {
 	"config": ["c", "Custom configuration file", "string", false ],
@@ -424,7 +424,7 @@ var exports = {
 		cli.options = {};
 
 		cli.enable("version", "glob", "help");
-		cli.setApp(path.resolve(__dirname + "/../../package.json"));
+		cli.setApp(path.resolve(__dirname + "/../package.json"));
 
 		var options = cli.parse(OPTIONS);
 		// Use config file if specified
@@ -437,18 +437,18 @@ var exports = {
 		// JSLint reporter
 		case options.reporter === "jslint":
 		case options["jslint-reporter"]:
-			options.reporter = "../reporters/jslint_xml.js";
+			options.reporter = "./reporters/jslint_xml.js";
 			break;
 
 		// CheckStyle (XML) reporter
 		case options.reporter === "checkstyle":
 		case options["checkstyle-reporter"]:
-			options.reporter = "../reporters/checkstyle.js";
+			options.reporter = "./reporters/checkstyle.js";
 			break;
 
 		// Reporter that displays additional JSHint data
 		case options["show-non-errors"]:
-			options.reporter = "../reporters/non_error.js";
+			options.reporter = "./reporters/non_error.js";
 			break;
 
 		// Custom reporter

diff --git a/src/stable/jshint.js → src/jshint.js b/src/stable/jshint.js → src/jshint.js
@@ -34,8 +34,8 @@
 
 var _        = require("underscore");
 var events   = require("events");
-var vars     = require("../shared/vars.js");
-var messages = require("../shared/messages.js");
+var vars     = require("./vars.js");
+var messages = require("./messages.js");
 var Lexer    = require("./lex.js").Lexer;
 var reg      = require("./reg.js");
 var state    = require("./state.js").state;

diff --git a/src/stable/lex.js → src/lex.js b/src/stable/lex.js → src/lex.js
diff --git a/src/shared/messages.js → src/messages.js b/src/shared/messages.js → src/messages.js
diff --git a/src/stable/reg.js → src/reg.js b/src/stable/reg.js → src/reg.js
diff --git a/src/stable/state.js → src/state.js b/src/stable/state.js → src/state.js
diff --git a/src/stable/style.js → src/style.js b/src/stable/style.js → src/style.js
diff --git a/src/shared/vars.js → src/vars.js b/src/shared/vars.js → src/vars.js
diff --git a/tests/cli.js b/tests/cli.js
@@ -1,9 +1,9 @@
 "use strict";
 
-var path = require("path");
-var shjs = require("shelljs");
+var path  = require("path");
+var shjs  = require("shelljs");
 var sinon = require("sinon");
-var cli = require("../src/cli/cli.js");
+var cli   = require("../src/cli.js");
 
 exports.group = {
 	setUp: function (cb) {

diff --git a/tests/stable/helpers/coveraje.js → tests/helpers/coveraje.js b/tests/stable/helpers/coveraje.js → tests/helpers/coveraje.js
diff --git a/tests/stable/helpers/fixture.js → tests/helpers/fixture.js b/tests/stable/helpers/fixture.js → tests/helpers/fixture.js
diff --git a/tests/stable/helpers/testhelper.js → tests/helpers/testhelper.js b/tests/stable/helpers/testhelper.js → tests/helpers/testhelper.js
@@ -28,7 +28,7 @@
 
 /*jshint node: true, eqnull: true*/
 
-var JSHINT = require('../../../src/stable/jshint.js').JSHINT;
+var JSHINT = require('../../src/jshint.js').JSHINT;
 
 if (exports.setup === undefined || exports.setup === null) {
 	exports.setup = {};

diff --git a/tests/stable/regression/libs/backbone.js → tests/regression/libs/backbone.js b/tests/stable/regression/libs/backbone.js → tests/regression/libs/backbone.js
diff --git a/tests/stable/regression/libs/codemirror3.js → tests/regression/libs/codemirror3.js b/tests/stable/regression/libs/codemirror3.js → tests/regression/libs/codemirror3.js
diff --git a/tests/stable/regression/libs/jquery-1.7.js → tests/regression/libs/jquery-1.7.js b/tests/stable/regression/libs/jquery-1.7.js → tests/regression/libs/jquery-1.7.js
diff --git a/tests/stable/regression/libs/json2.js → tests/regression/libs/json2.js b/tests/stable/regression/libs/json2.js → tests/regression/libs/json2.js
diff --git a/tests/stable/regression/libs/lodash.js → tests/regression/libs/lodash.js b/tests/stable/regression/libs/lodash.js → tests/regression/libs/lodash.js
diff --git a/tests/stable/regression/libs/prototype-17.js → tests/regression/libs/prototype-17.js b/tests/stable/regression/libs/prototype-17.js → tests/regression/libs/prototype-17.js
diff --git a/tests/stable/regression/npm.js → tests/regression/npm.js b/tests/stable/regression/npm.js → tests/regression/npm.js
@@ -2,7 +2,7 @@
 
 exports.npm = function (test) {
 	var jshint;
-	test.ok(jshint = require(__dirname + '/../../../'));
+	test.ok(jshint = require(__dirname + '/../../'));
 	test.equal(typeof(jshint.JSHINT), 'function');
 	test.done();
 };
diff --git a/tests/stable/regression/thirdparty.js → tests/regression/thirdparty.js b/tests/stable/regression/thirdparty.js → tests/regression/thirdparty.js
diff --git a/tests/stable/unit/core.js → tests/unit/core.js b/tests/stable/unit/core.js → tests/unit/core.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var JSHINT	= require('../../../src/stable/jshint.js').JSHINT;
+var JSHINT	= require('../../src/jshint.js').JSHINT;
 var fs      = require('fs');
 var TestRun = require("../helpers/testhelper").setup.testRun;
 

diff --git a/tests/stable/unit/envs.js → tests/unit/envs.js b/tests/stable/unit/envs.js → tests/unit/envs.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-var JSHINT  = require('../../../src/stable/jshint.js').JSHINT;
+var JSHINT  = require('../../src/jshint.js').JSHINT;
 var fs      = require('fs');
 var TestRun = require("../helpers/testhelper").setup.testRun;
 

diff --git a/tests/stable/unit/fixtures/asi.js → tests/unit/fixtures/asi.js b/tests/stable/unit/fixtures/asi.js → tests/unit/fixtures/asi.js
diff --git a/tests/stable/unit/fixtures/blocks.js → tests/unit/fixtures/blocks.js b/tests/stable/unit/fixtures/blocks.js → tests/unit/fixtures/blocks.js
diff --git a/tests/stable/unit/fixtures/boss.js → tests/unit/fixtures/boss.js b/tests/stable/unit/fixtures/boss.js → tests/unit/fixtures/boss.js
diff --git a/tests/stable/unit/fixtures/browser.js → tests/unit/fixtures/browser.js b/tests/stable/unit/fixtures/browser.js → tests/unit/fixtures/browser.js
diff --git a/tests/stable/unit/fixtures/camelcase.js → tests/unit/fixtures/camelcase.js b/tests/stable/unit/fixtures/camelcase.js → tests/unit/fixtures/camelcase.js
diff --git a/...s/stable/unit/fixtures/caseExpressions.js → tests/unit/fixtures/caseExpressions.js b/...s/stable/unit/fixtures/caseExpressions.js → tests/unit/fixtures/caseExpressions.js
diff --git a/tests/stable/unit/fixtures/comma.js → tests/unit/fixtures/comma.js b/tests/stable/unit/fixtures/comma.js → tests/unit/fixtures/comma.js
diff --git a/tests/stable/unit/fixtures/const.js → tests/unit/fixtures/const.js b/tests/stable/unit/fixtures/const.js → tests/unit/fixtures/const.js
diff --git a/tests/stable/unit/fixtures/curly.js → tests/unit/fixtures/curly.js b/tests/stable/unit/fixtures/curly.js → tests/unit/fixtures/curly.js
diff --git a/tests/stable/unit/fixtures/curly2.js → tests/unit/fixtures/curly2.js b/tests/stable/unit/fixtures/curly2.js → tests/unit/fixtures/curly2.js
diff --git a/...stable/unit/fixtures/default-arguments.js → tests/unit/fixtures/default-arguments.js b/...stable/unit/fixtures/default-arguments.js → tests/unit/fixtures/default-arguments.js
diff --git a/tests/stable/unit/fixtures/emptystmt.js → tests/unit/fixtures/emptystmt.js b/tests/stable/unit/fixtures/emptystmt.js → tests/unit/fixtures/emptystmt.js
diff --git a/tests/stable/unit/fixtures/eqeqeq.js → tests/unit/fixtures/eqeqeq.js b/tests/stable/unit/fixtures/eqeqeq.js → tests/unit/fixtures/eqeqeq.js
diff --git a/tests/stable/unit/fixtures/es5.funcexpr.js → tests/unit/fixtures/es5.funcexpr.js b/tests/stable/unit/fixtures/es5.funcexpr.js → tests/unit/fixtures/es5.funcexpr.js
diff --git a/tests/stable/unit/fixtures/es5.js → tests/unit/fixtures/es5.js b/tests/stable/unit/fixtures/es5.js → tests/unit/fixtures/es5.js
diff --git a/tests/stable/unit/fixtures/es5Reserved.js → tests/unit/fixtures/es5Reserved.js b/tests/stable/unit/fixtures/es5Reserved.js → tests/unit/fixtures/es5Reserved.js
diff --git a/...stable/unit/fixtures/es6-import-export.js → tests/unit/fixtures/es6-import-export.js b/...stable/unit/fixtures/es6-import-export.js → tests/unit/fixtures/es6-import-export.js
diff --git a/tests/stable/unit/fixtures/exported.js → tests/unit/fixtures/exported.js b/tests/stable/unit/fixtures/exported.js → tests/unit/fixtures/exported.js
diff --git a/tests/stable/unit/fixtures/forin.js → tests/unit/fixtures/forin.js b/tests/stable/unit/fixtures/forin.js → tests/unit/fixtures/forin.js
diff --git a/...le/unit/fixtures/functionScopedOptions.js → tests/unit/fixtures/functionScopedOptions.js b/...le/unit/fixtures/functionScopedOptions.js → tests/unit/fixtures/functionScopedOptions.js
diff --git a/tests/stable/unit/fixtures/gh-226.js → tests/unit/fixtures/gh-226.js b/tests/stable/unit/fixtures/gh-226.js → tests/unit/fixtures/gh-226.js
diff --git a/tests/stable/unit/fixtures/gh-334.js → tests/unit/fixtures/gh-334.js b/tests/stable/unit/fixtures/gh-334.js → tests/unit/fixtures/gh-334.js
diff --git a/tests/stable/unit/fixtures/gh247.js → tests/unit/fixtures/gh247.js b/tests/stable/unit/fixtures/gh247.js → tests/unit/fixtures/gh247.js
diff --git a/tests/stable/unit/fixtures/gh431.js → tests/unit/fixtures/gh431.js b/tests/stable/unit/fixtures/gh431.js → tests/unit/fixtures/gh431.js
diff --git a/tests/stable/unit/fixtures/gh56.js → tests/unit/fixtures/gh56.js b/tests/stable/unit/fixtures/gh56.js → tests/unit/fixtures/gh56.js
diff --git a/tests/stable/unit/fixtures/gh618.js → tests/unit/fixtures/gh618.js b/tests/stable/unit/fixtures/gh618.js → tests/unit/fixtures/gh618.js
diff --git a/tests/stable/unit/fixtures/gh668.js → tests/unit/fixtures/gh668.js b/tests/stable/unit/fixtures/gh668.js → tests/unit/fixtures/gh668.js
diff --git a/tests/stable/unit/fixtures/gh878.js → tests/unit/fixtures/gh878.js b/tests/stable/unit/fixtures/gh878.js → tests/unit/fixtures/gh878.js
diff --git a/tests/stable/unit/fixtures/gh988.js → tests/unit/fixtures/gh988.js b/tests/stable/unit/fixtures/gh988.js → tests/unit/fixtures/gh988.js
diff --git a/tests/stable/unit/fixtures/gruntComment.js → tests/unit/fixtures/gruntComment.js b/tests/stable/unit/fixtures/gruntComment.js → tests/unit/fixtures/gruntComment.js
diff --git a/tests/stable/unit/fixtures/identifiers.js → tests/unit/fixtures/identifiers.js b/tests/stable/unit/fixtures/identifiers.js → tests/unit/fixtures/identifiers.js
diff --git a/tests/stable/unit/fixtures/ignored.js → tests/unit/fixtures/ignored.js b/tests/stable/unit/fixtures/ignored.js → tests/unit/fixtures/ignored.js
diff --git a/tests/stable/unit/fixtures/immed.js → tests/unit/fixtures/immed.js b/tests/stable/unit/fixtures/immed.js → tests/unit/fixtures/immed.js
diff --git a/tests/stable/unit/fixtures/indent.js → tests/unit/fixtures/indent.js b/tests/stable/unit/fixtures/indent.js → tests/unit/fixtures/indent.js
diff --git a/tests/stable/unit/fixtures/insideEval.js → tests/unit/fixtures/insideEval.js b/tests/stable/unit/fixtures/insideEval.js → tests/unit/fixtures/insideEval.js
diff --git a/tests/stable/unit/fixtures/jslintInverted.js → tests/unit/fixtures/jslintInverted.js b/tests/stable/unit/fixtures/jslintInverted.js → tests/unit/fixtures/jslintInverted.js
diff --git a/tests/stable/unit/fixtures/jslintOptions.js → tests/unit/fixtures/jslintOptions.js b/tests/stable/unit/fixtures/jslintOptions.js → tests/unit/fixtures/jslintOptions.js
diff --git a/tests/stable/unit/fixtures/jslintRenamed.js → tests/unit/fixtures/jslintRenamed.js b/tests/stable/unit/fixtures/jslintRenamed.js → tests/unit/fixtures/jslintRenamed.js
diff --git a/tests/stable/unit/fixtures/lastsemic.js → tests/unit/fixtures/lastsemic.js b/tests/stable/unit/fixtures/lastsemic.js → tests/unit/fixtures/lastsemic.js
diff --git a/tests/stable/unit/fixtures/latedef.js → tests/unit/fixtures/latedef.js b/tests/stable/unit/fixtures/latedef.js → tests/unit/fixtures/latedef.js
diff --git a/tests/stable/unit/fixtures/latedefundef.js → tests/unit/fixtures/latedefundef.js b/tests/stable/unit/fixtures/latedefundef.js → tests/unit/fixtures/latedefundef.js
diff --git a/tests/stable/unit/fixtures/laxbreak.js → tests/unit/fixtures/laxbreak.js b/tests/stable/unit/fixtures/laxbreak.js → tests/unit/fixtures/laxbreak.js
diff --git a/tests/stable/unit/fixtures/laxcomma.js → tests/unit/fixtures/laxcomma.js b/tests/stable/unit/fixtures/laxcomma.js → tests/unit/fixtures/laxcomma.js
diff --git a/tests/stable/unit/fixtures/leak.js → tests/unit/fixtures/leak.js b/tests/stable/unit/fixtures/leak.js → tests/unit/fixtures/leak.js
diff --git a/tests/stable/unit/fixtures/loopfunc.js → tests/unit/fixtures/loopfunc.js b/tests/stable/unit/fixtures/loopfunc.js → tests/unit/fixtures/loopfunc.js
diff --git a/...max-cyclomatic-complexity-per-function.js → ...max-cyclomatic-complexity-per-function.js b/...max-cyclomatic-complexity-per-function.js → ...max-cyclomatic-complexity-per-function.js
diff --git a/...es/max-nested-block-depth-per-function.js → ...es/max-nested-block-depth-per-function.js b/...es/max-nested-block-depth-per-function.js → ...es/max-nested-block-depth-per-function.js
diff --git a/...t/fixtures/max-parameters-per-function.js → ...t/fixtures/max-parameters-per-function.js b/...t/fixtures/max-parameters-per-function.js → ...t/fixtures/max-parameters-per-function.js
diff --git a/...t/fixtures/max-statements-per-function.js → ...t/fixtures/max-statements-per-function.js b/...t/fixtures/max-statements-per-function.js → ...t/fixtures/max-statements-per-function.js
diff --git a/tests/stable/unit/fixtures/maxlen.js → tests/unit/fixtures/maxlen.js b/tests/stable/unit/fixtures/maxlen.js → tests/unit/fixtures/maxlen.js
diff --git a/tests/stable/unit/fixtures/missingspaces.js → tests/unit/fixtures/missingspaces.js b/tests/stable/unit/fixtures/missingspaces.js → tests/unit/fixtures/missingspaces.js
diff --git a/...nit/fixtures/nestedFunctions-locations.js → ...nit/fixtures/nestedFunctions-locations.js b/...nit/fixtures/nestedFunctions-locations.js → ...nit/fixtures/nestedFunctions-locations.js
diff --git a/...s/stable/unit/fixtures/nestedFunctions.js → tests/unit/fixtures/nestedFunctions.js b/...s/stable/unit/fixtures/nestedFunctions.js → tests/unit/fixtures/nestedFunctions.js
diff --git a/tests/stable/unit/fixtures/newcap.js → tests/unit/fixtures/newcap.js b/tests/stable/unit/fixtures/newcap.js → tests/unit/fixtures/newcap.js
diff --git a/tests/stable/unit/fixtures/noarg.js → tests/unit/fixtures/noarg.js b/tests/stable/unit/fixtures/noarg.js → tests/unit/fixtures/noarg.js
diff --git a/tests/stable/unit/fixtures/onevar.js → tests/unit/fixtures/onevar.js b/tests/stable/unit/fixtures/onevar.js → tests/unit/fixtures/onevar.js
diff --git a/tests/stable/unit/fixtures/protoiterator.js → tests/unit/fixtures/protoiterator.js b/tests/stable/unit/fixtures/protoiterator.js → tests/unit/fixtures/protoiterator.js
diff --git a/tests/stable/unit/fixtures/quotes.js → tests/unit/fixtures/quotes.js b/tests/stable/unit/fixtures/quotes.js → tests/unit/fixtures/quotes.js
diff --git a/tests/stable/unit/fixtures/quotes2.js → tests/unit/fixtures/quotes2.js b/tests/stable/unit/fixtures/quotes2.js → tests/unit/fixtures/quotes2.js
diff --git a/tests/stable/unit/fixtures/quotes3.js → tests/unit/fixtures/quotes3.js b/tests/stable/unit/fixtures/quotes3.js → tests/unit/fixtures/quotes3.js
diff --git a/tests/stable/unit/fixtures/redef.js → tests/unit/fixtures/redef.js b/tests/stable/unit/fixtures/redef.js → tests/unit/fixtures/redef.js
diff --git a/tests/stable/unit/fixtures/regex_array.js → tests/unit/fixtures/regex_array.js b/tests/stable/unit/fixtures/regex_array.js → tests/unit/fixtures/regex_array.js
diff --git a/tests/stable/unit/fixtures/reserved.js → tests/unit/fixtures/reserved.js b/tests/stable/unit/fixtures/reserved.js → tests/unit/fixtures/reserved.js
diff --git a/tests/stable/unit/fixtures/return.js → tests/unit/fixtures/return.js b/tests/stable/unit/fixtures/return.js → tests/unit/fixtures/return.js
diff --git a/tests/stable/unit/fixtures/scope.js → tests/unit/fixtures/scope.js b/tests/stable/unit/fixtures/scope.js → tests/unit/fixtures/scope.js
diff --git a/tests/stable/unit/fixtures/scripturl.js → tests/unit/fixtures/scripturl.js b/tests/stable/unit/fixtures/scripturl.js → tests/unit/fixtures/scripturl.js
diff --git a/tests/stable/unit/fixtures/shelljs.js → tests/unit/fixtures/shelljs.js b/tests/stable/unit/fixtures/shelljs.js → tests/unit/fixtures/shelljs.js
diff --git a/tests/stable/unit/fixtures/smarttabs.js → tests/unit/fixtures/smarttabs.js b/tests/stable/unit/fixtures/smarttabs.js → tests/unit/fixtures/smarttabs.js
diff --git a/.../stable/unit/fixtures/strict_incorrect.js → tests/unit/fixtures/strict_incorrect.js b/.../stable/unit/fixtures/strict_incorrect.js → tests/unit/fixtures/strict_incorrect.js
diff --git a/tests/stable/unit/fixtures/strict_newcap.js → tests/unit/fixtures/strict_newcap.js b/tests/stable/unit/fixtures/strict_newcap.js → tests/unit/fixtures/strict_newcap.js
diff --git a/tests/stable/unit/fixtures/strict_this.js → tests/unit/fixtures/strict_this.js b/tests/stable/unit/fixtures/strict_this.js → tests/unit/fixtures/strict_this.js
diff --git a/tests/stable/unit/fixtures/strict_this2.js → tests/unit/fixtures/strict_this2.js b/tests/stable/unit/fixtures/strict_this2.js → tests/unit/fixtures/strict_this2.js
diff --git a/...stable/unit/fixtures/strict_violations.js → tests/unit/fixtures/strict_violations.js b/...stable/unit/fixtures/strict_violations.js → tests/unit/fixtures/strict_violations.js
diff --git a/tests/stable/unit/fixtures/strings.js → tests/unit/fixtures/strings.js b/tests/stable/unit/fixtures/strings.js → tests/unit/fixtures/strings.js
diff --git a/tests/stable/unit/fixtures/supernew.js → tests/unit/fixtures/supernew.js b/tests/stable/unit/fixtures/supernew.js → tests/unit/fixtures/supernew.js
diff --git a/...table/unit/fixtures/switchDefaultFirst.js → tests/unit/fixtures/switchDefaultFirst.js b/...table/unit/fixtures/switchDefaultFirst.js → tests/unit/fixtures/switchDefaultFirst.js
diff --git a/...stable/unit/fixtures/switchFallThrough.js → tests/unit/fixtures/switchFallThrough.js b/...stable/unit/fixtures/switchFallThrough.js → tests/unit/fixtures/switchFallThrough.js
diff --git a/tests/stable/unit/fixtures/trycatch.js → tests/unit/fixtures/trycatch.js b/tests/stable/unit/fixtures/trycatch.js → tests/unit/fixtures/trycatch.js
diff --git a/tests/stable/unit/fixtures/undef.js → tests/unit/fixtures/undef.js b/tests/stable/unit/fixtures/undef.js → tests/unit/fixtures/undef.js
diff --git a/tests/stable/unit/fixtures/undef_func.js → tests/unit/fixtures/undef_func.js b/tests/stable/unit/fixtures/undef_func.js → tests/unit/fixtures/undef_func.js
diff --git a/tests/stable/unit/fixtures/undefstrict.js → tests/unit/fixtures/undefstrict.js b/tests/stable/unit/fixtures/undefstrict.js → tests/unit/fixtures/undefstrict.js
diff --git a/tests/stable/unit/fixtures/unignored.js → tests/unit/fixtures/unignored.js b/tests/stable/unit/fixtures/unignored.js → tests/unit/fixtures/unignored.js
diff --git a/tests/stable/unit/fixtures/unused.js → tests/unit/fixtures/unused.js b/tests/stable/unit/fixtures/unused.js → tests/unit/fixtures/unused.js
diff --git a/tests/stable/unit/fixtures/unusedglobals.js → tests/unit/fixtures/unusedglobals.js b/tests/stable/unit/fixtures/unusedglobals.js → tests/unit/fixtures/unusedglobals.js
diff --git a/tests/stable/unit/fixtures/white.js → tests/unit/fixtures/white.js b/tests/stable/unit/fixtures/white.js → tests/unit/fixtures/white.js
diff --git a/tests/stable/unit/fixtures/with.js → tests/unit/fixtures/with.js b/tests/stable/unit/fixtures/with.js → tests/unit/fixtures/with.js
diff --git a/...stable/unit/fixtures/yield-expressions.js → tests/unit/fixtures/yield-expressions.js b/...stable/unit/fixtures/yield-expressions.js → tests/unit/fixtures/yield-expressions.js
diff --git a/tests/stable/unit/options.js → tests/unit/options.js b/tests/stable/unit/options.js → tests/unit/options.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-var JSHINT = require('../../../src/stable/jshint.js').JSHINT;
+var JSHINT = require('../../src/jshint.js').JSHINT;
 var fs = require('fs');
 var TestRun = require('../helpers/testhelper').setup.testRun;
 var fixture = require('../helpers/fixture').fixture;

diff --git a/tests/stable/unit/parser.js → tests/unit/parser.js b/tests/stable/unit/parser.js → tests/unit/parser.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-var JSHINT	= require('../../../src/stable/jshint.js').JSHINT;
+var JSHINT	= require('../../src/jshint.js').JSHINT;
 var fs		= require('fs');
 var TestRun = require("../helpers/testhelper").setup.testRun;
 var path    = require("path");