feat: Add extended WebDriver error data in output

up73k · up73k · commit 73a26edfc7b3 · 2016-12-22T15:36:34.000+03:00
diff --git a/lib/browser/new-browser.js b/lib/browser/new-browser.js
@@ -7,6 +7,7 @@ const debug = require('debug');
 const chalk = require('chalk');
 const _ = require('lodash');
 const Promise = require('bluebird');
+const striptags = require('striptags');
 
 const Browser = require('./browser');
 const ClientBridge = require('./client-bridge');
@@ -116,6 +117,10 @@ module.exports = class NewBrowser extends Browser {
 
                 const error = new GeminiError(`Cannot launch browser ${this.id}:\n${e.message}.`);
 
+                if (e.data) {
+                    error.message += '\nReason: ' + this._parseHtmlBody(e.data);
+                }
+
                 error.browserId = this.id;
                 error.sessionId = this.sessionId;
 
@@ -124,6 +129,20 @@ module.exports = class NewBrowser extends Browser {
             });
     }
 
+    _parseHtmlBody(html) {
+        const body = html.match(/<body[\s\S]*<\/body>/i);
+
+        if (!body) {
+            return html;
+        }
+
+        const rawText = striptags(body[0]);
+
+        return rawText
+            ? (rawText).replace(/\s+/g, ' ').trim()
+            : html;
+    }
+
     _setSessionTimeout(timeout) {
         if (_.isNull(timeout)) {
             timeout = this.config.httpTimeout;
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "resolve": "^1.1.0",
     "sizzle": "^2.2.0",
     "source-map": "^0.5.3",
+    "striptags": "^2.1.1",
     "temp": "~0.8.0",
     "uglify-js": "^2.7.3",
     "uglifyify": "^3.0.1",
diff --git a/test/unit/browser/new-browser.js b/test/unit/browser/new-browser.js
@@ -8,6 +8,7 @@ const Camera = require('lib/browser/camera');
 const ClientBridge = require('lib/browser/client-bridge');
 const Calibrator = require('lib/calibrator');
 const WdErrors = require('lib/constants/wd-errors');
+const GeminiError = require('lib/errors/gemini-error');
 
 const makeBrowser = require('../../util').makeBrowser;
 
@@ -203,6 +204,80 @@ describe('browser/new-browser', () => {
                 return assert.isRejected(launchBrowser());
             });
         });
+
+        describe('catch error on wd init', () => {
+            it('should fail if wd init fails', () => {
+                wd.init.returns(Promise.reject(new Error('o.O')));
+
+                return assert.isRejected(launchBrowser());
+            });
+
+            it('should fail with GeminiError instance', () => {
+                wd.init.returns(Promise.reject({message: 'defaultError'}));
+
+                return assert.isRejected(launchBrowser(), GeminiError);
+            });
+
+            it('should fail with the error message by default', () => {
+                wd.init.returns(Promise.reject({message: 'error text'}));
+
+                return launchBrowser()
+                    .catch((e) => assert.include(e.message, 'error text'));
+            });
+
+            it('should extend error message with error data if it exists', () => {
+                wd.init.returns(Promise.reject({data: 'error text'}));
+
+                return launchBrowser()
+                    .catch((e) => assert.include(e.message, 'error text'));
+            });
+
+            it('should not add to the message fail reason if error data does not exists', () => {
+                wd.init.returns(Promise.reject({message: 'defaultError'}));
+
+                return launchBrowser()
+                    .catch((e) => assert.notInclude(e.message, 'Reason'));
+            });
+
+            it('should cut all tags from error', () => {
+                wd.init.returns(Promise.reject({data: '<title></title><body><h1>Error</h1> text</body>'}));
+
+                return launchBrowser()
+                    .catch((e) => {
+                        assert.notInclude(e.message, '<title>');
+                        assert.notInclude(e.message, '<body>');
+                        assert.notInclude(e.message, '<h1>');
+                    });
+            });
+
+            it('should skip text from all tags except body', () => {
+                wd.init.returns(Promise.reject({data: '<title>4xx</title><body>Error</body>'}));
+
+                return launchBrowser()
+                    .catch((e) => assert.notInclude(e.message, '4xx'));
+            });
+
+            it('should not skip text from internal tags in body tag', () => {
+                wd.init.returns(Promise.reject({data: '<body><h1>Error</h1> text</body>'}));
+
+                return launchBrowser()
+                    .catch((e) => assert.include(e.message, 'Error text'));
+            });
+
+            it('should replace newlines to spaces', () => {
+                wd.init.returns(Promise.reject({data: '<body>Error\ntext</body>'}));
+
+                return launchBrowser()
+                    .catch((e) => assert.include(e.message, 'Error text'));
+            });
+
+            it('should fail with full html if <body> tag is empty', () => {
+                wd.init.returns(Promise.reject({data: '<html><body></body></html>'}));
+
+                return launchBrowser()
+                    .catch((e) => assert.include(e.message, '<html><body></body></html>'));
+            });
+        });
     });
 
     describe('URL opening', () => {
