Tests: Move promise/A+ adapters for tests to dedicated folder

markelog · markelog · commit a4474c9a0025 · 2016-06-11T10:39:51.000+03:00
diff --git a/build/tasks/promises_aplus_tests.js b/build/tasks/promises_aplus_tests.js
@@ -5,19 +5,19 @@ module.exports = function( grunt ) {
 	var spawnTest = require( "./lib/spawn_test.js" );
 
 	grunt.registerTask( "promises_aplus_tests",
-		[ "promises_aplus_tests_deferred", "promises_aplus_tests_when" ] );
+		[ "promises_aplus_tests:deferred", "promises_aplus_tests:when" ] );
 
-	grunt.registerTask( "promises_aplus_tests_deferred", function() {
+	grunt.registerTask( "promises_aplus_tests:deferred", function() {
 		spawnTest( this.async(),
 			"./node_modules/.bin/promises-aplus-tests",
-			"test/promises_aplus_adapter_deferred.js"
+			"test/promises_aplus_adapters/deferred.js"
 		);
 	} );
 
-	grunt.registerTask( "promises_aplus_tests_when", function() {
+	grunt.registerTask( "promises_aplus_tests:when", function() {
 		spawnTest( this.async(),
 			"./node_modules/.bin/promises-aplus-tests",
-			"test/promises_aplus_adapter_when.js"
+			"test/promises_aplus_adapters/when.js"
 		);
 	} );
 };
diff --git a/test/node_smoke_tests/.eslintrc b/test/node_smoke_tests/.eslintrc
@@ -2,6 +2,9 @@
 	"env": {
 		"node": true
 	},
+	"parserOptions": {
+		"ecmaVersion": 6
+	},
 	"extends": "../.eslintrc",
 	"root": true
 }
diff --git a/test/promises_aplus_adapters/.eslintrc b/test/promises_aplus_adapters/.eslintrc
@@ -0,0 +1,7 @@
+{
+	"env": {
+		"node": true
+	},
+	"extends": "../.eslintrc",
+	"root": true
+}
diff --git a/test/promises_aplus_adapters/deferred.js b/test/promises_aplus_adapters/deferred.js
@@ -1,5 +1,3 @@
-/* jshint node: true */
-
 "use strict";
 
 require( "jsdom" ).env( "", function( errors, window ) {
@@ -8,9 +6,9 @@ require( "jsdom" ).env( "", function( errors, window ) {
 		return;
 	}
 
-	var jQuery = require( ".." )( window );
+	var jQuery = require( "../../" )( window );
 
-	exports.deferred = function() {
+	module.exports.deferred = function() {
 		var deferred = jQuery.Deferred();
 
 		return {
diff --git a/test/promises_aplus_adapters/when.js b/test/promises_aplus_adapters/when.js
@@ -1,5 +1,3 @@
-/* jshint node: true */
-
 "use strict";
 
 require( "jsdom" ).env( "", function( errors, window ) {
@@ -8,9 +6,9 @@ require( "jsdom" ).env( "", function( errors, window ) {
 		return;
 	}
 
-	var jQuery = require( ".." )( window );
+	var jQuery = require( "../../" )( window );
 
-	exports.deferred = function() {
+	module.exports.deferred = function() {
 		var adopted, promised,
 			obj = {
 				resolve: function() {
