Fixed once request error

Amareis · Jan 13, 2018 · 808c9ef · 808c9ef
1 parent 3414ac1
commit 808c9ef
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 bower_components
 node_modules
 .idea
+npm-debug.log
+
diff --git a/npm-debug.log b/npm-debug.log
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "another-rest-client",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Simple REST API client that makes your code lesser and more beautiful than without it.",
   "main": "rest-client.js",
   "scripts": {

diff --git a/rest-client.js b/rest-client.js
diff --git a/rest-client.js.map b/rest-client.js.map
diff --git a/rest-client.min.js b/rest-client.min.js
diff --git a/rest-client.min.js.map b/rest-client.min.js.map
diff --git a/src/rest-client.js b/src/rest-client.js
@@ -94,9 +94,11 @@ class RestClient {
             }
         );
         new Events(p);
-        this.emit('request', xhr);
-        p.emit('request', xhr);
-        xhr.send(data);
+        setTimeout(() => {
+            this.emit('request', xhr);
+            p.emit('request', xhr);
+            xhr.send(data);
+        }, 0);
         return p;
     }
 }

diff --git a/test/test.js b/test/test.js
@@ -31,6 +31,22 @@ describe('RestClient', () => {
             new RestClient(host, {trailing: '/'}).res('cookies').get({fresh: true});
             req.url.should.be.equal(host + '/cookies/?fresh=true');
         });
+
+        it('should emit events', (done) => {
+            var req, bool;
+            xhr.onCreate = r => req = r;
+
+            var p = new RestClient(host, {trailing: '/'}).on('request', xhr => bool = true).res('cookies').get({fresh: true});
+            req.url.should.be.equal(host + '/cookies/?fresh=true');
+
+            setTimeout(() => req.respond(200, [], '{a:1}'), 0);
+
+            p.then(() => {
+                bool.should.be.equal(true)
+                done();
+            }).catch(done);
+        });
+
     });
 });
 
@@ -228,7 +244,7 @@ describe('resource', () => {
             var req;
             xhr.onCreate = r => req = r;
 
-            var respTText;
+            var respText;
 
             var p = api.cookies.get({fresh: true}).on('success', xhr => respText = xhr.responseText);
 
@@ -241,5 +257,22 @@ describe('resource', () => {
                 done();
             }).catch(done);
         });
+
+        it('should emit once request event', (done) => {
+            var req;
+            xhr.onCreate = r => req = r;
+
+            var bool;
+
+            var p = api.cookies.get({fresh: true}).on('request', xhr => bool = true);
+
+            setTimeout(() => req.respond(200, [], '{a:1}'), 0);
+
+            req.url.should.be.equal(host + '/cookies?fresh=true');
+            p.then(r => {
+                bool.should.be.equal(true);
+                done();
+            }).catch(done);
+        });
     });
 });