updated mocha-cov dependency to be custom fork that provides valuable information to coveralls, added engine info to package.json, disable styles for codeship, switched to code based pattern that is very specific since the entire es-js repo is stored withing a src directory on codeship

test/unit/coverage.js

@@ -0,0 +1,5 @@
+var blanket = require("blanket")({
+  pattern: require('path').join(__dirname, '../../src')
+});
+
+require('./index');

test/unit/index.js

@@ -0,0 +1,3 @@
+require('fs').readdirSync(__dirname + '/tests').forEach(function (file) {
+  require(__dirname + '/tests/' + file);
+});

test/unit/tests/abstract_logger.js

@@ -1,11 +1,11 @@
 describe('Logger Abstract', function () {
   var expect = require('expect.js');
   var sinon = require('sinon');
-  var Log = require('../../src/lib/log');
-  var LoggerAbstract = require('../../src/lib/logger');
+  var Log = require('../../../src/lib/log');
+  var LoggerAbstract = require('../../../src/lib/logger');
 
   var parentLog;
-  var stub = require('../utils/auto_release_stub').make();
+  var stub = require('../../utils/auto_release_stub').make();
 
   function makeLogger(parent, levels) {
     return new LoggerAbstract(parent || parentLog, {
@@ -30,6 +30,6 @@ describe('Logger Abstract', function () {
     });
   });
 
-  require('./generic_logger_tests')(makeLogger);
+  require('../generic_logger_tests')(makeLogger);
 
 });

test/unit/tests/client.js

@@ -1,7 +1,7 @@
 describe('Client instances creation', function () {
-  var es = require('../../src/elasticsearch');
-  var api = require('../../src/lib/api');
-  var api090 = require('../../src/lib/api_0_90');
+  var es = require('../../../src/elasticsearch');
+  var api = require('../../../src/lib/api');
+  var api090 = require('../../../src/lib/api_0_90');
   var expect = require('expect.js');
   var client;
 

test/unit/tests/client_action.js

@@ -1,4 +1,4 @@
-var ca = require('../../src/lib/client_action');
+var ca = require('../../../src/lib/client_action');
 var expect = require('expect.js');
 var _ = require('lodash');
 var when = require('when');

test/unit/tests/connection_abstract.js

@@ -1,11 +1,11 @@
-var ConnectionAbstract = require('../../src/lib/connection');
-var Host = require('../../src/lib/host');
+var ConnectionAbstract = require('../../../src/lib/connection');
+var Host = require('../../../src/lib/host');
 var sinon = require('sinon');
 var expect = require('expect.js');
 var _ = require('lodash');
-var errors = require('../../src/lib/errors');
+var errors = require('../../../src/lib/errors');
 
-var stub = require('../utils/auto_release_stub').make();
+var stub = require('../../utils/auto_release_stub').make();
 
 describe('Connection Abstract', function () {
   var host = new Host('localhost:9200');

test/unit/tests/connection_pool.js

@@ -1,12 +1,12 @@
-var ConnectionPool = require('../../src/lib/connection_pool');
-var Host = require('../../src/lib/host');
-var errors = require('../../src/lib/errors');
-var ConnectionAbstract = require('../../src/lib/connection');
+var ConnectionPool = require('../../../src/lib/connection_pool');
+var Host = require('../../../src/lib/host');
+var errors = require('../../../src/lib/errors');
+var ConnectionAbstract = require('../../../src/lib/connection');
 var _ = require('lodash');
 var EventEmitter = require('events').EventEmitter;
 var expect = require('expect.js');
 var sinon = require('sinon');
-var stub = require('../utils/auto_release_stub').make();
+var stub = require('../../utils/auto_release_stub').make();
 
 function listenerCount(emitter, event) {
   if (EventEmitter.listenerCount) {

test/unit/tests/console_logger.js

@@ -1,5 +1,5 @@
-var Log = require('../../src/lib/log');
-var ConsoleLogger = require('../../src/lib/loggers/console');
+var Log = require('../../../src/lib/log');
+var ConsoleLogger = require('../../../src/lib/loggers/console');
 var sinon = require('sinon');
 var expect = require('expect.js');
 var parentLog;
@@ -20,11 +20,11 @@ function makeLogger(parent, levels) {
   return new ConsoleLogger(parent, config);
 }
 
-var stub = require('../utils/auto_release_stub').make();
+var stub = require('../../utils/auto_release_stub').make();
 
 describe('Console Logger', function () {
 
-  require('./generic_logger_tests')(makeLogger);
+  require('../generic_logger_tests')(makeLogger);
 
   it('checks before using unique logging functions, falls back to #log()', function () {
     var _warning = console.warn;

test/unit/tests/errors.js

@@ -1,4 +1,4 @@
-var errors = require('../../src/lib/errors');
+var errors = require('../../../src/lib/errors');
 var expect = require('expect.js');
 var _ = require('lodash');
 

test/unit/tests/file_logger.js

@@ -1,13 +1,13 @@
 describe('File Logger', function () {
-  var Log = require('../../src/lib/log');
-  var FileLogger = require('../../src/lib/loggers/file');
+  var Log = require('../../../src/lib/log');
+  var FileLogger = require('../../../src/lib/loggers/file');
   var once = require('events').EventEmitter.prototype.once;
   var _ = require('lodash');
   var parentLog;
   var logger;
   var expect = require('expect.js');
   var fs = require('fs');
-  var stub = require('../utils/auto_release_stub').make();
+  var stub = require('../../utils/auto_release_stub').make();
 
   beforeEach(function () {
     parentLog = new Log();
@@ -39,7 +39,7 @@ describe('File Logger', function () {
     fs.unlinkSync('test.log');
   });
 
-  require('./generic_logger_tests')(makeLogger);
+  require('../generic_logger_tests')(makeLogger);
 
   describe('buffer flush', function () {
     if (require('stream').Writable) {

test/unit/tests/host.js

@@ -1,4 +1,4 @@
-var Host = require('../../src/lib/host');
+var Host = require('../../../src/lib/host');
 var _ = require('lodash');
 var expect = require('expect.js');
 var url = require('url');

test/unit/tests/http_connector.js

@@ -1,10 +1,10 @@
 describe('Http Connector', function () {
 
   var expect = require('expect.js');
-  var Host = require('../../src/lib/host');
-  var errors = require('../../src/lib/errors');
-  var HttpConnection = require('../../src/lib/connectors/http');
-  var ConnectionAbstract = require('../../src/lib/connection');
+  var Host = require('../../../src/lib/host');
+  var errors = require('../../../src/lib/errors');
+  var HttpConnection = require('../../../src/lib/connectors/http');
+  var ConnectionAbstract = require('../../../src/lib/connection');
   var nock = require('nock');
   var sinon = require('sinon');
   var util = require('util');
@@ -13,12 +13,12 @@ describe('Http Connector', function () {
   var http = require('http');
   var https = require('https');
 
-  var MockRequest = require('../mocks/request');
-  var MockIncommingMessage = require('../mocks/incomming_message');
+  var MockRequest = require('../../mocks/request');
+  var MockIncommingMessage = require('../../mocks/incomming_message');
 
   nock.disableNetConnect();
 
-  var stub = require('../utils/auto_release_stub').make();
+  var stub = require('../../utils/auto_release_stub').make();
 
   function makeStubReqMethod(prep) {
     return function (params, cb) {

test/unit/tests/json_serializer.js

@@ -1,8 +1,8 @@
 describe('JSON serializer', function () {
-  var JsonSerializer = require('../../src/lib/serializers/json');
+  var JsonSerializer = require('../../../src/lib/serializers/json');
   var expect = require('expect.js');
   var sinon = require('sinon');
-  var stub = require('../utils/auto_release_stub').make();
+  var stub = require('../../utils/auto_release_stub').make();
 
   function makeSerializer() {
     return new JsonSerializer();

test/unit/tests/log.js

@@ -1,4 +1,4 @@
-var Log = require('../../src/lib/log');
+var Log = require('../../../src/lib/log');
 var _ = require('lodash');
 var expect = require('expect.js');
 

test/unit/tests/nodes_to_host_callback.js

@@ -1,9 +1,9 @@
 describe('Nodes to host callback', function () {
-  var callback = require('../../src/lib/nodes_to_host');
+  var callback = require('../../../src/lib/nodes_to_host');
   var expect = require('expect.js');
 
   // example node list that would come back from "GET _cluster/nodes"
-  var nodes = require('../fixtures/short_node_list.json');
+  var nodes = require('../../fixtures/short_node_list.json');
 
   it('properly creates host objects', function () {
     var hosts = callback(nodes);

test/unit/tests/random_selector.js

@@ -1,5 +1,5 @@
 describe('Random Selector', function () {
-  var randomSelector = require('../../src/lib/selectors/random');
+  var randomSelector = require('../../../src/lib/selectors/random');
   var _ = require('lodash');
   var expect = require('expect.js');
 

test/unit/tests/round_robin_selector.js

@@ -1,5 +1,5 @@
 describe('Round Robin Selector', function () {
-  var selector = require('../../src/lib/selectors/round_robin');
+  var selector = require('../../../src/lib/selectors/round_robin');
   var _ = require('lodash');
   var expect = require('expect.js');
 

test/unit/tests/stdio_logger.js

@@ -1,7 +1,7 @@
 describe('Stdio Logger', function () {
 
-  var Log = require('../../src/lib/log');
-  var StdioLogger = require('../../src/lib/loggers/stdio');
+  var Log = require('../../../src/lib/log');
+  var StdioLogger = require('../../../src/lib/loggers/stdio');
   var expect = require('expect.js');
   var sinon = require('sinon');
   var parentLog;
@@ -22,9 +22,9 @@ describe('Stdio Logger', function () {
     return new StdioLogger(parent, config);
   }
 
-  var stub = require('../utils/auto_release_stub').make();
+  var stub = require('../../utils/auto_release_stub').make();
 
-  require('./generic_logger_tests')(makeLogger);
+  require('../generic_logger_tests')(makeLogger);
 
   describe('colorizing', function () {
     var chalk = require('chalk');

test/unit/tests/stream_logger.js

@@ -1,14 +1,14 @@
 describe('Stream Logger', function () {
-  var Log = require('../../src/lib/log');
-  var StreamLogger = require('../../src/lib/loggers/stream');
-  var MockWritableStream = require('../mocks/writable_stream');
+  var Log = require('../../../src/lib/log');
+  var StreamLogger = require('../../../src/lib/loggers/stream');
+  var MockWritableStream = require('../../mocks/writable_stream');
   var once = require('events').EventEmitter.prototype.once;
   var stream = new MockWritableStream();
   var _ = require('lodash');
   var expect = require('expect.js');
   var parentLog;
 
-  var stub = require('../utils/auto_release_stub').make();
+  var stub = require('../../utils/auto_release_stub').make();
 
   beforeEach(function () {
     stub(stream, 'write');
@@ -35,7 +35,7 @@ describe('Stream Logger', function () {
     return new StreamLogger(parent, config);
   }
 
-  require('./generic_logger_tests')(makeLogger);
+  require('../generic_logger_tests')(makeLogger);
 
   describe('buffer flush', function () {
     if (require('stream').Writable) {

test/unit/tests/tracer_logger.js

@@ -1,7 +1,7 @@
 describe('Tracer Logger', function () {
 
-  var Log = require('../../src/lib/log');
-  var TracerLogger = require('../../src/lib/loggers/tracer');
+  var Log = require('../../../src/lib/log');
+  var TracerLogger = require('../../../src/lib/loggers/tracer');
   var sinon = require('sinon');
   var expect = require('expect.js');
   var parentLog;
@@ -22,10 +22,10 @@ describe('Tracer Logger', function () {
     return new TracerLogger(parent, config);
   }
 
-  var stub = require('../utils/auto_release_stub').make();
+  var stub = require('../../utils/auto_release_stub').make();
 
 
-  require('./generic_logger_tests')(makeLogger);
+  require('../generic_logger_tests')(makeLogger);
 
   describe('#write', function () {
     it('comments out everything accept the curlCall', function () {

test/unit/tests/transport.js

@@ -1,13 +1,13 @@
-var Transport = require('../../src/lib/transport');
-var Host = require('../../src/lib/host');
-var errors = require('../../src/lib/errors');
+var Transport = require('../../../src/lib/transport');
+var Host = require('../../../src/lib/host');
+var errors = require('../../../src/lib/errors');
 var when = require('when');
 
 var sinon = require('sinon');
 var expect = require('expect.js');
 var _ = require('lodash');
-var nodeList = require('../fixtures/short_node_list.json');
-var stub = require('../utils/auto_release_stub').make();
+var nodeList = require('../../fixtures/short_node_list.json');
+var stub = require('../../utils/auto_release_stub').make();
 
 /**
  * Allows the tests call #request() without it doing anything past trying to select
@@ -188,7 +188,7 @@ describe('Transport Class', function () {
 
     describe('randomizeHosts options', function () {
       it('calls _.shuffle be default', function () {
-        var _ = require('../../src/lib/utils');
+        var _ = require('../../../src/lib/utils');
         stub(Transport.connectionPools.main.prototype, 'setHosts');
         stub(_, 'shuffle');
         var trans = new Transport({
@@ -198,7 +198,7 @@ describe('Transport Class', function () {
         expect(_.shuffle.callCount).to.eql(1);
       });
       it('skips the call to _.shuffle when false', function () {
-        var _ = require('../../src/lib/utils');
+        var _ = require('../../../src/lib/utils');
         stub(Transport.connectionPools.main.prototype, 'setHosts');
         stub(_, 'shuffle');
         var trans = new Transport({
@@ -447,7 +447,7 @@ describe('Transport Class', function () {
       // create a test that checks N retries
       function testRetries(retries) {
         return function (done) {
-          var randomSelector = require('../../src/lib/selectors/random');
+          var randomSelector = require('../../../src/lib/selectors/random');
           var connections;
           var attempts = 0;
           function failRequest(params, cb) {

test/unit/tests/transport_with_server.js

@@ -1,14 +1,14 @@
-var Transport = require('../../src/lib/transport');
-var Host = require('../../src/lib/host');
-var errors = require('../../src/lib/errors');
+var Transport = require('../../../src/lib/transport');
+var Host = require('../../../src/lib/host');
+var errors = require('../../../src/lib/errors');
 var when = require('when');
 var expect = require('expect.js');
 
 var sinon = require('sinon');
-var nock = require('../mocks/server.js');
+var nock = require('../../mocks/server.js');
 var _ = require('lodash');
-var nodeList = require('../fixtures/short_node_list.json');
-var stub = require('../utils/auto_release_stub').make();
+var nodeList = require('../../fixtures/short_node_list.json');
+var stub = require('../../utils/auto_release_stub').make();
 
 /**
  * Allows the tests call #request() without it doing anything past trying to select

test/unit/tests/utils.js

@@ -1,7 +1,7 @@
-var _ = require('../../src/lib/utils');
+var _ = require('../../../src/lib/utils');
 var expect = require('expect.js');
 
-var stub = require('../utils/auto_release_stub').make();
+var stub = require('../../utils/auto_release_stub').make();
 
 describe('Utils', function () {
 
@@ -398,7 +398,7 @@ describe('Utils', function () {
     });
 
     if (require('stream').Writable) {
-      var MockWritableStream = require('../mocks/writable_stream');
+      var MockWritableStream = require('../../mocks/writable_stream');
       it('ignores empty stream', function () {
         var stream = new MockWritableStream();
         expect(_.getUnwrittenFromStream(stream)).to.be('');

test/utils/server/index.js

@@ -10,7 +10,7 @@ var browserify = require('browserify');
 var pkg = require(root + '/package.json');
 
 var testFiles = {
-  unit: 'test/unit/test_!(' + [
+  unit: 'test/unit/tests/!(' + [
     'file_logger',
     'http_connector',
     'stdio_logger',
@@ -18,7 +18,7 @@ var testFiles = {
     'stream_logger',
     'tracer_logger',
     'transport_with_server',
-  ].join('|') + ')*',
+  ].join('|') + ')*.js',
   build: 'test/unit/browser_builds/*.js'
 };
 

test/utils/slk.js

@@ -1,6 +1,6 @@
 // I know this is horrible
 // I just don't want the keys searchable on github
 module.exports = JSON.parse(new Buffer(
-  'eyJzYXVjZWxhYnNfdXNlciI6ImVsYXN0aWNzZWFyY2gtanMiLCJzYXVjZWxhYnMiOiIyNGY0OWUwNy1kODJmLTQwNjctODU0ZS1kODE1ZWJkMTVlNDYifQ==',
+  'eyJ1c2VyIjoiZWxhc3RpY3NlYXJjaC1qcyIsImtleSI6IjI0ZjQ5ZTA3LWQ4MmYtNDA2Ny04NTRlLWQ4MTVlYmQxNWU0NiJ9',
   'base64'
 ).toString('utf8'));