summaryrefslogtreecommitdiff
path: root/mocha_test
diff options
context:
space:
mode:
Diffstat (limited to 'mocha_test')
-rw-r--r--mocha_test/apply.js2
-rw-r--r--mocha_test/applyEach.js2
-rw-r--r--mocha_test/asyncify.js2
-rw-r--r--mocha_test/auto.js2
-rw-r--r--mocha_test/autoInject.js2
-rw-r--r--mocha_test/cargo.js2
-rw-r--r--mocha_test/compose.js2
-rw-r--r--mocha_test/concat.js2
-rw-r--r--mocha_test/consoleFunctions.js2
-rw-r--r--mocha_test/constant.js2
-rw-r--r--mocha_test/detect.js2
-rw-r--r--mocha_test/during.js2
-rw-r--r--mocha_test/each.js2
-rw-r--r--mocha_test/eachOf.js2
-rw-r--r--mocha_test/ensureAsync.js2
-rw-r--r--mocha_test/every.js2
-rw-r--r--mocha_test/filter.js2
-rw-r--r--mocha_test/forever.js2
-rw-r--r--mocha_test/iterator.js2
-rw-r--r--mocha_test/map.js2
-rw-r--r--mocha_test/mapValues.js2
-rw-r--r--mocha_test/memoize.js2
-rw-r--r--mocha_test/nextTick.js2
-rw-r--r--mocha_test/parallel.js2
-rw-r--r--mocha_test/priorityQueue.js2
-rw-r--r--mocha_test/queue.js2
-rw-r--r--mocha_test/race.js2
-rw-r--r--mocha_test/reduce.js2
-rw-r--r--mocha_test/retry.js2
-rw-r--r--mocha_test/retryable.js2
-rw-r--r--mocha_test/seq.js2
-rw-r--r--mocha_test/series.js2
-rw-r--r--mocha_test/setImmediate.js2
-rw-r--r--mocha_test/some.js2
-rw-r--r--mocha_test/sortBy.js2
-rw-r--r--mocha_test/support/async.js9
-rw-r--r--mocha_test/timeout.js2
-rw-r--r--mocha_test/times.js2
-rw-r--r--mocha_test/transform.js2
-rw-r--r--mocha_test/until.js2
-rw-r--r--mocha_test/waterfall.js2
-rw-r--r--mocha_test/whilst.js2
42 files changed, 50 insertions, 41 deletions
diff --git a/mocha_test/apply.js b/mocha_test/apply.js
index 18e5d12..d9b1fd2 100644
--- a/mocha_test/apply.js
+++ b/mocha_test/apply.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('concat', function() {
diff --git a/mocha_test/applyEach.js b/mocha_test/applyEach.js
index 6138d3f..973f117 100644
--- a/mocha_test/applyEach.js
+++ b/mocha_test/applyEach.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/asyncify.js b/mocha_test/asyncify.js
index 880f2f2..f5097fd 100644
--- a/mocha_test/asyncify.js
+++ b/mocha_test/asyncify.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var assert = require('assert');
var expect = require('chai').expect;
var isBrowser = require('./support/is_browser');
diff --git a/mocha_test/auto.js b/mocha_test/auto.js
index 55f3b25..fdc1041 100644
--- a/mocha_test/auto.js
+++ b/mocha_test/auto.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var _ = require('lodash');
diff --git a/mocha_test/autoInject.js b/mocha_test/autoInject.js
index 9c2d1fb..fca004b 100644
--- a/mocha_test/autoInject.js
+++ b/mocha_test/autoInject.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('autoInject', function () {
diff --git a/mocha_test/cargo.js b/mocha_test/cargo.js
index 235b9a2..94ecd95 100644
--- a/mocha_test/cargo.js
+++ b/mocha_test/cargo.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/compose.js b/mocha_test/compose.js
index 5be9192..1eb4ba0 100644
--- a/mocha_test/compose.js
+++ b/mocha_test/compose.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('compose', function(){
diff --git a/mocha_test/concat.js b/mocha_test/concat.js
index 389b2de..54807b6 100644
--- a/mocha_test/concat.js
+++ b/mocha_test/concat.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/consoleFunctions.js b/mocha_test/consoleFunctions.js
index 3c295c8..af4f4d3 100644
--- a/mocha_test/consoleFunctions.js
+++ b/mocha_test/consoleFunctions.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('console functions', function() {
diff --git a/mocha_test/constant.js b/mocha_test/constant.js
index d76076c..0852c19 100644
--- a/mocha_test/constant.js
+++ b/mocha_test/constant.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('constant', function () {
diff --git a/mocha_test/detect.js b/mocha_test/detect.js
index f308485..492e9ea 100644
--- a/mocha_test/detect.js
+++ b/mocha_test/detect.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe("detect", function () {
diff --git a/mocha_test/during.js b/mocha_test/during.js
index 851acf1..23893d3 100644
--- a/mocha_test/during.js
+++ b/mocha_test/during.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/each.js b/mocha_test/each.js
index 014e9df..2ec4cd3 100644
--- a/mocha_test/each.js
+++ b/mocha_test/each.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/eachOf.js b/mocha_test/eachOf.js
index c705bad..3eb3aa3 100644
--- a/mocha_test/eachOf.js
+++ b/mocha_test/eachOf.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/ensureAsync.js b/mocha_test/ensureAsync.js
index 89659e2..7eec098 100644
--- a/mocha_test/ensureAsync.js
+++ b/mocha_test/ensureAsync.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/every.js b/mocha_test/every.js
index ed4693e..3fea0c7 100644
--- a/mocha_test/every.js
+++ b/mocha_test/every.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe("every", function () {
diff --git a/mocha_test/filter.js b/mocha_test/filter.js
index 8b4b268..8837669 100644
--- a/mocha_test/filter.js
+++ b/mocha_test/filter.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
function filterIteratee(x, callback) {
diff --git a/mocha_test/forever.js b/mocha_test/forever.js
index ec21ed7..23fee66 100644
--- a/mocha_test/forever.js
+++ b/mocha_test/forever.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var isBrowser = require('./support/is_browser');
diff --git a/mocha_test/iterator.js b/mocha_test/iterator.js
index 71c477c..55281df 100644
--- a/mocha_test/iterator.js
+++ b/mocha_test/iterator.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('iterator', function() {
diff --git a/mocha_test/map.js b/mocha_test/map.js
index c7f5030..4c26360 100644
--- a/mocha_test/map.js
+++ b/mocha_test/map.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/mapValues.js b/mocha_test/mapValues.js
index 612feff..a70bece 100644
--- a/mocha_test/mapValues.js
+++ b/mocha_test/mapValues.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('mapValues', function () {
diff --git a/mocha_test/memoize.js b/mocha_test/memoize.js
index 39620dd..370e50c 100644
--- a/mocha_test/memoize.js
+++ b/mocha_test/memoize.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/nextTick.js b/mocha_test/nextTick.js
index b428822..24e7168 100644
--- a/mocha_test/nextTick.js
+++ b/mocha_test/nextTick.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe("nextTick", function () {
diff --git a/mocha_test/parallel.js b/mocha_test/parallel.js
index bad98af..ec2f091 100644
--- a/mocha_test/parallel.js
+++ b/mocha_test/parallel.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
var isBrowser = require('./support/is_browser');
diff --git a/mocha_test/priorityQueue.js b/mocha_test/priorityQueue.js
index b777815..6ffb184 100644
--- a/mocha_test/priorityQueue.js
+++ b/mocha_test/priorityQueue.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('priorityQueue', function() {
diff --git a/mocha_test/queue.js b/mocha_test/queue.js
index e4a29e4..f54c030 100644
--- a/mocha_test/queue.js
+++ b/mocha_test/queue.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/race.js b/mocha_test/race.js
index d56205d..a730a62 100644
--- a/mocha_test/race.js
+++ b/mocha_test/race.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var assert = require('assert');
describe('race', function () {
diff --git a/mocha_test/reduce.js b/mocha_test/reduce.js
index f5dce59..402d8a5 100644
--- a/mocha_test/reduce.js
+++ b/mocha_test/reduce.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/retry.js b/mocha_test/retry.js
index 43a8f6f..161bc20 100644
--- a/mocha_test/retry.js
+++ b/mocha_test/retry.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/retryable.js b/mocha_test/retryable.js
index 7147269..55e220d 100644
--- a/mocha_test/retryable.js
+++ b/mocha_test/retryable.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/seq.js b/mocha_test/seq.js
index 1f7cbfc..488ec20 100644
--- a/mocha_test/seq.js
+++ b/mocha_test/seq.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/series.js b/mocha_test/series.js
index 0237582..9a48fa8 100644
--- a/mocha_test/series.js
+++ b/mocha_test/series.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
var isBrowser = require('./support/is_browser');
diff --git a/mocha_test/setImmediate.js b/mocha_test/setImmediate.js
index 854111a..e8559ef 100644
--- a/mocha_test/setImmediate.js
+++ b/mocha_test/setImmediate.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe("setImmediate", function () {
diff --git a/mocha_test/some.js b/mocha_test/some.js
index 0a5a8da..6909249 100644
--- a/mocha_test/some.js
+++ b/mocha_test/some.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe("some", function () {
diff --git a/mocha_test/sortBy.js b/mocha_test/sortBy.js
index 1636276..48a654a 100644
--- a/mocha_test/sortBy.js
+++ b/mocha_test/sortBy.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/support/async.js b/mocha_test/support/async.js
new file mode 100644
index 0000000..7bb530a
--- /dev/null
+++ b/mocha_test/support/async.js
@@ -0,0 +1,9 @@
+// Resolve the async version we currently want to test
+console.log(process.env.ASYNC_TEST);
+if (typeof process === 'object' && process.env.ASYNC_TEST === 'build') {
+ console.log('testing built modules');
+ module.exports = require('../..');
+} else {
+ console.log('testing source');
+ module.exports = require('../../lib');
+}
diff --git a/mocha_test/timeout.js b/mocha_test/timeout.js
index be41283..902becd 100644
--- a/mocha_test/timeout.js
+++ b/mocha_test/timeout.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('timeout', function () {
diff --git a/mocha_test/times.js b/mocha_test/times.js
index ad1dfcd..0af8b50 100644
--- a/mocha_test/times.js
+++ b/mocha_test/times.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/transform.js b/mocha_test/transform.js
index 5c04f56..cd9c030 100644
--- a/mocha_test/transform.js
+++ b/mocha_test/transform.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
describe('transform', function() {
diff --git a/mocha_test/until.js b/mocha_test/until.js
index a738218..34746fe 100644
--- a/mocha_test/until.js
+++ b/mocha_test/until.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/waterfall.js b/mocha_test/waterfall.js
index 7053b2c..da26a99 100644
--- a/mocha_test/waterfall.js
+++ b/mocha_test/waterfall.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');
diff --git a/mocha_test/whilst.js b/mocha_test/whilst.js
index a384916..e57fb47 100644
--- a/mocha_test/whilst.js
+++ b/mocha_test/whilst.js
@@ -1,4 +1,4 @@
-var async = require('../lib');
+var async = require('./support/async');
var expect = require('chai').expect;
var assert = require('assert');