Fixing issue #8

axios · Sep 16, 2014 · 59eb2b6 · 59eb2b6
1 parent 1fa35ce
commit 59eb2b6
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 9 deletions.
diff --git a/dist/axios.amd.js b/dist/axios.amd.js
diff --git a/dist/axios.amd.map b/dist/axios.amd.map
diff --git a/dist/axios.amd.min.js b/dist/axios.amd.min.js
diff --git a/dist/axios.amd.min.map b/dist/axios.amd.min.map
diff --git a/dist/axios.js b/dist/axios.js
diff --git a/dist/axios.map b/dist/axios.map
diff --git a/dist/axios.min.js b/dist/axios.min.js
diff --git a/dist/axios.min.map b/dist/axios.min.map
diff --git a/lib/axios.js b/lib/axios.js
@@ -51,7 +51,9 @@ var axios = module.exports = function axios(config) {
 axios.defaults = defaults;
 
 // Expose all/spread
-axios.all = Promise.all;
+axios.all = function (promises) {
+  return Promise.all(promises);
+};
 axios.spread = spread;
 
 // Provide aliases for supported request methods

diff --git a/test/specs/promise.spec.js b/test/specs/promise.spec.js
@@ -67,4 +67,39 @@ describe('promise', function () {
       expect(config.url).toEqual('/foo');
     });
   });
+
+  it('should support all', function () {
+    var fulfilled = false;
+
+    axios.all([true, 123]).then(function () {
+      fulfilled = true;
+    });
+
+    waitsFor(function () {
+      return fulfilled;
+    });
+
+    runs(function () {
+      expect(fulfilled).toEqual(true);
+    });
+  });
+
+  it('should support spread', function () {
+    var sum = 0;
+    var fulfilled = false;
+
+    axios.all([123, 456]).then(axios.spread(function (a, b) {
+      sum = a + b;
+      fulfilled = true;
+    }));
+
+    waitsFor(function () {
+      return fulfilled;
+    });
+
+    runs(function () {
+      expect(fulfilled).toEqual(true);
+      expect(sum).toEqual(123 + 456);
+    });
+  });
 });