diff --git a/Gruntfile.js b/Gruntfile.js index 3734d82c9..6242a4881 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -231,13 +231,21 @@ module.exports = function (grunt) { // creates browser_tests:{{browser}} tasks, for the browsers listed directly above Object.keys(browsers).forEach(function (browser) { + // on other platforms, grunt-open expects appname to be the name of the executale... + var appName = browsers[browser][process.platform === 'darwin' || process.platform === 'win32' + ? 'appName' + : 'executale' + ]; + + if (!appName) { + // this browser doesn't run on this arch + return; + } + grunt.config.set('open_browser_tests.' + browser, { - // on other platforms, grunt-open expects appname to be the name of the executale... - appName: browsers[browser][process.platform === 'darwin' || process.platform === 'win32' - ? 'appName' - : 'executale' - ] + appName: appName }); + grunt.registerTask('browser_tests:' + browser, [ 'generate', 'build', diff --git a/README.md b/README.md index 89e283d6c..37ec3ea4e 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,11 @@ elasticsearch.js works great in node, as well as modern browsers (many thanks to - Node: - [![Build Status](https://spenceralger.com/jenkins-badge/es/es-js_nightly)](http://build.elasticsearch.com/job/es-js_nightly/) + [![Build Status](https://spenceralger.com/jenkins-badge/es/es-js_nightly)](http://build.elasticsearch.com/job/es-js_nightly) - Browsers (see [browser builds](#browser-builds)): - ![testling results for browser clients](https://ci.testling.com/spenceralger/xhr-method-test.png) + ![current browser support](https://spenceralger.com/jenkins-browser-badge/es_js) ## Install in Node diff --git a/src/lib/loggers/console.js b/src/lib/loggers/console.js index b75ffa7af..9bc93a884 100644 --- a/src/lib/loggers/console.js +++ b/src/lib/loggers/console.js @@ -103,5 +103,5 @@ Console.prototype.onTrace = _.handler(function (method, url, body, responseBody, message += ' -d "' + body.replace(/"/g, '\\"') + '"'; } message += '\n<- ' + responseStatus + '\n' + responseBody; - console.log('TRACE:\n' + message + '\n\n'); + console.log('TRACE:\n' + message + '\n'); }); diff --git a/test/browser_integration/esjs_reporter.js b/test/browser_integration/esjs_reporter.js index d0f7f8df6..9aed1c42a 100644 --- a/test/browser_integration/esjs_reporter.js +++ b/test/browser_integration/esjs_reporter.js @@ -189,14 +189,14 @@ return { log: function () { if (stack[0]) { - stack[0].stdout += argsToString(arguments) + '\n'; + stack[0].stdout += argsToString(arguments) + '\n\n'; } else { origLog(argsToString(arguments)); } }, error: function () { if (stack[0]) { - stack[0].stderr += argsToString(arguments) + '\n'; + stack[0].stderr += argsToString(arguments) + '\n\n'; } else { origErr(argsToString(arguments)); }