summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Early <alexander.early@gmail.com>2016-03-18 16:20:13 -0700
committerAlexander Early <alexander.early@gmail.com>2016-03-18 16:20:13 -0700
commite5ebf8d2a88ab49291bd3102a9d54d24568b6b47 (patch)
tree70b0c6972c42b32d164b973f4518385e14b97a58
parentb6c2449b3f71041509093c537a984163cbaad8ef (diff)
downloadasync-e5ebf8d2a88ab49291bd3102a9d54d24568b6b47.tar.gz
iterator -> iteratee in mocha_test/
-rw-r--r--mocha_test/auto.js2
-rw-r--r--mocha_test/detect.js14
-rw-r--r--mocha_test/filter.js10
3 files changed, 13 insertions, 13 deletions
diff --git a/mocha_test/auto.js b/mocha_test/auto.js
index 1850a0c..fb779ee 100644
--- a/mocha_test/auto.js
+++ b/mocha_test/auto.js
@@ -204,7 +204,7 @@ describe('auto', function () {
// Issue 24 on github: https://github.com/caolan/async/issues#issue/24
// Issue 76 on github: https://github.com/caolan/async/issues#issue/76
- it('auto removeListener has side effect on loop iterator', function(done) {
+ it('auto removeListener has side effect on loop iteratee', function(done) {
async.auto({
task1: ['task3', function(/*callback*/) { done(); }],
task2: ['task3', function(/*callback*/) { /* by design: DON'T call callback */ }],
diff --git a/mocha_test/detect.js b/mocha_test/detect.js
index 97d7c3d..d2a2602 100644
--- a/mocha_test/detect.js
+++ b/mocha_test/detect.js
@@ -3,7 +3,7 @@ var expect = require('chai').expect;
describe("detect", function () {
- function detectIterator(call_order, x, callback) {
+ function detectIteratee(call_order, x, callback) {
setTimeout(function(){
call_order.push(x);
callback(null, x == 2);
@@ -12,7 +12,7 @@ describe("detect", function () {
it('detect', function(done){
var call_order = [];
- async.detect([3,2,1], detectIterator.bind(this, call_order), function(err, result){
+ async.detect([3,2,1], detectIteratee.bind(this, call_order), function(err, result){
call_order.push('callback');
expect(err).to.equal(null);
expect(result).to.equal(2);
@@ -25,7 +25,7 @@ describe("detect", function () {
it('detect - mulitple matches', function(done){
var call_order = [];
- async.detect([3,2,2,1,2], detectIterator.bind(this, call_order), function(err, result){
+ async.detect([3,2,2,1,2], detectIteratee.bind(this, call_order), function(err, result){
call_order.push('callback');
expect(err).to.equal(null);
expect(result).to.equal(2);
@@ -48,7 +48,7 @@ describe("detect", function () {
it('detectSeries', function(done){
var call_order = [];
- async.detectSeries([3,2,1], detectIterator.bind(this, call_order), function(err, result){
+ async.detectSeries([3,2,1], detectIteratee.bind(this, call_order), function(err, result){
call_order.push('callback');
expect(err).to.equal(null);
expect(result).to.equal(2);
@@ -61,7 +61,7 @@ describe("detect", function () {
it('detectSeries - multiple matches', function(done){
var call_order = [];
- async.detectSeries([3,2,2,1,2], detectIterator.bind(this, call_order), function(err, result){
+ async.detectSeries([3,2,2,1,2], detectIteratee.bind(this, call_order), function(err, result){
call_order.push('callback');
expect(err).to.equal(null);
expect(result).to.equal(2);
@@ -85,7 +85,7 @@ describe("detect", function () {
it('detectLimit', function(done){
var call_order = [];
- async.detectLimit([3, 2, 1], 2, detectIterator.bind(this, call_order), function(err, result) {
+ async.detectLimit([3, 2, 1], 2, detectIteratee.bind(this, call_order), function(err, result) {
call_order.push('callback');
expect(err).to.equal(null);
expect(result).to.equal(2);
@@ -98,7 +98,7 @@ describe("detect", function () {
it('detectLimit - multiple matches', function(done){
var call_order = [];
- async.detectLimit([3,2,2,1,2], 2, detectIterator.bind(this, call_order), function(err, result){
+ async.detectLimit([3,2,2,1,2], 2, detectIteratee.bind(this, call_order), function(err, result){
call_order.push('callback');
expect(err).to.equal(null);
expect(result).to.equal(2);
diff --git a/mocha_test/filter.js b/mocha_test/filter.js
index 58f9a0b..569ef5e 100644
--- a/mocha_test/filter.js
+++ b/mocha_test/filter.js
@@ -1,7 +1,7 @@
var async = require('../lib');
var expect = require('chai').expect;
-function filterIterator(x, callback) {
+function filterIteratee(x, callback) {
setTimeout(function(){
callback(null, x % 2);
}, x*25);
@@ -22,7 +22,7 @@ function testLimit(arr, limitFunc, limit, iter, done) {
describe("filter", function () {
it('filter', function(done){
- async.filter([3,1,2], filterIterator, function(err, results){
+ async.filter([3,1,2], filterIteratee, function(err, results){
expect(err).to.equal(null);
expect(results).to.eql([3,1]);
done();
@@ -52,7 +52,7 @@ describe("filter", function () {
});
it('filterSeries', function(done){
- async.filterSeries([3,1,2], filterIterator, function(err, results){
+ async.filterSeries([3,1,2], filterIteratee, function(err, results){
expect(err).to.equal(null);
expect(results).to.eql([3,1]);
done();
@@ -82,7 +82,7 @@ describe("filter", function () {
describe("reject", function () {
it('reject', function(done){
- async.reject([3,1,2], filterIterator, function(err, results){
+ async.reject([3,1,2], filterIteratee, function(err, results){
expect(err).to.equal(null);
expect(results).to.eql([2]);
done();
@@ -112,7 +112,7 @@ describe("reject", function () {
});
it('rejectSeries', function(done){
- async.rejectSeries([3,1,2], filterIterator, function(err, results){
+ async.rejectSeries([3,1,2], filterIteratee, function(err, results){
expect(err).to.equal(null);
expect(results).to.eql([2]);
done();