improved error propagation in RequestHandler - closes #747

webdriverio · Aug 31, 2015 · 6586144 · 6586144
1 parent e38d751
commit 6586144
Showing 1 changed file with 6 additions and 19 deletions.
diff --git a/lib/utils/RequestHandler.js b/lib/utils/RequestHandler.js
@@ -52,16 +52,7 @@ RequestHandler.prototype.setSessionID = function(body, response, data, fullReque
     // check if we got a session id
     /* istanbul ignore next */
     if(!this.sessionID) {
-        this.eventHandler.emit('error', {
-            err: {
-                code: 'NOSESSIONID',
-                message: body.message
-            },
-            body: body,
-            requestOptions: fullRequestOptions,
-            response: response
-        });
-        throw new Error('NOSESSIONID');
+        throw new ErrorHandler.RuntimeError('A session id is required for this command but wasn\'t found in the response payload');
     }
 
     this.eventHandler.emit('init', {
@@ -151,14 +142,6 @@ RequestHandler.prototype.create = function(requestOptions, data) {
 
         if(err || (body && body.status !== 0)) {
 
-            this.eventHandler.emit('error', {
-                err: err,
-                requestData: data,
-                requestOptions: fullRequestOptions,
-                response: response,
-                body: body
-            });
-
             if(body && typeof body === 'string') {
 
                 error = new ErrorHandler.RuntimeError(body);
@@ -192,7 +175,11 @@ RequestHandler.prototype.create = function(requestOptions, data) {
         // connected to a session itself and it therefore doesn't
         // require it
         if(this.sessionID === null && requestOptions.requiresSession !== false) {
-            this.setSessionID(body, response, data, fullRequestOptions);
+            try {
+                this.setSessionID(body, response, data, fullRequestOptions);
+            } catch(e) {
+                return defer.reject(e);
+            }
         }
 
         if(body === undefined) {