aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorOleg Gaidarenko <markelog@gmail.com>2016-06-11 10:30:12 +0300
committerOleg Gaidarenko <markelog@gmail.com>2016-06-11 10:39:51 +0300
commita4474c9a0025095f82d734a9d7230eace2f08ef8 (patch)
treee62f988ad38a32e9bb639bb28431f365386b0863 /test
parentf80ae67c53c0a4bfc95741ed39d7f9e498eaf02b (diff)
downloadjquery-a4474c9a0025095f82d734a9d7230eace2f08ef8.tar.gz
jquery-a4474c9a0025095f82d734a9d7230eace2f08ef8.zip
Tests: Move promise/A+ adapters for tests to dedicated folder
Diffstat (limited to 'test')
-rw-r--r--test/node_smoke_tests/.eslintrc3
-rw-r--r--test/promises_aplus_adapters/.eslintrc7
-rw-r--r--test/promises_aplus_adapters/deferred.js (renamed from test/promises_aplus_adapter_deferred.js)6
-rw-r--r--test/promises_aplus_adapters/when.js (renamed from test/promises_aplus_adapter_when.js)6
4 files changed, 14 insertions, 8 deletions
diff --git a/test/node_smoke_tests/.eslintrc b/test/node_smoke_tests/.eslintrc
index 11368d984..282933c1a 100644
--- 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
new file mode 100644
index 000000000..11368d984
--- /dev/null
+++ b/test/promises_aplus_adapters/.eslintrc
@@ -0,0 +1,7 @@
+{
+ "env": {
+ "node": true
+ },
+ "extends": "../.eslintrc",
+ "root": true
+}
diff --git a/test/promises_aplus_adapter_deferred.js b/test/promises_aplus_adapters/deferred.js
index c7440b969..31af16655 100644
--- a/test/promises_aplus_adapter_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_adapter_when.js b/test/promises_aplus_adapters/when.js
index 0a5ec6756..adde1a13a 100644
--- a/test/promises_aplus_adapter_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() {