From f10052f19e44c23445f06c0077aae9f4eccba2a2 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Wed, 29 Jan 2014 10:50:32 -0700
Subject: [PATCH] fixed the browser test

---
 CONTRIBUTING.md                           |  2 +-
 grunt/config/run.js                       |  1 +
 scripts/ci.sh                             |  5 ++--
 test/unit/browser_builds/index.js         |  3 ---
 test/utils/{server/index.js => server.js} | 31 ++++++++++++++++++-----
 5 files changed, 29 insertions(+), 13 deletions(-)
 delete mode 100644 test/unit/browser_builds/index.js
 rename test/utils/{server/index.js => server.js} (77%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66f9f9ce8..0428d93df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,8 +38,8 @@ The process for contributing to any of the Elasticsearch repositories is similar
 
       Quick Option: Run them locally in your browser
       ```sh
-      node ./test/utils/server
       grunt browser_clients:build
+      node ./test/utils/server
       # open http://127.0.0.1:8000/unit.html
       # open http://127.0.0.1:8000/builds.html
       ```
diff --git a/grunt/config/run.js b/grunt/config/run.js
index f757b7e94..3ea192b5b 100644
--- a/grunt/config/run.js
+++ b/grunt/config/run.js
@@ -23,6 +23,7 @@ module.exports = {
     exec: 'node ./test/utils/server',
     options: {
       wait: false,
+      quiet: true,
       ready: /listening/
     }
   },
diff --git a/scripts/ci.sh b/scripts/ci.sh
index eaf484a5a..23745320a 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -82,7 +82,6 @@ fi
 
 if [[ "$COVERAGE" == "1" ]]; then
   group "shipping coverage"
-    ensure_grunt
-    grunt mochacov:ship_coverage
-    exit 0
+    # don't fail even if this does
+    _grunt --force mochacov:ship_coverage
 fi
diff --git a/test/unit/browser_builds/index.js b/test/unit/browser_builds/index.js
deleted file mode 100644
index d5c61dbab..000000000
--- a/test/unit/browser_builds/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-require('./angular');
-require('./generic');
-require('./jquery');
\ No newline at end of file
diff --git a/test/utils/server/index.js b/test/utils/server.js
similarity index 77%
rename from test/utils/server/index.js
rename to test/utils/server.js
index e3d06abed..4cf7d6724 100644
--- a/test/utils/server/index.js
+++ b/test/utils/server.js
@@ -3,15 +3,34 @@ var http = require('http');
 var fs = require('fs');
 var _ = require('lodash');
 var async = require('async');
-var path = require('path');
-var root = path.join(__dirname, '../../..');
+var root = require('path').join(__dirname, '../..');
 var browserify = require('browserify');
 var pkg = require(root + '/package.json');
+var unitSpecDir = root + '/test/unit/specs';
+var browserBuildsDir = root + '/test/unit/browser_builds';
 
-var testFiles = {
-  unit: 'test/unit/browser.js',
-  build: 'test/unit/browser_builds/index.js'
-};
+var testFiles = {};
+
+testFiles.unit = _(fs.readdirSync(unitSpecDir))
+  .difference([
+    'file_logger.js',
+    'http_connector.js',
+    'stdio_logger.js',
+    'console_logger.js',
+    'stream_logger.js',
+    'tracer_logger.js',
+    'transport_with_server.js'
+  ])
+  .map(function (file) {
+    return unitSpecDir + '/' + file;
+  })
+  .value();
+
+testFiles.build = _(fs.readdirSync(browserBuildsDir))
+  .map(function (file) {
+    return browserBuildsDir + '/' + file;
+  })
+  .value();
 
 // generic aliasify instance
 var aliasify = require('aliasify').configure({