Merge 69ab3e2 into bf54a5a

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 node_js:
-  - '0.10'
+  - '8'
 
 branches:
   only:
     - master
 
-script: make test-coveralls
+script: make test-coveralls

lib/util/batch.js

@@ -327,7 +327,7 @@ function containsBatch(parentBatch, batchToFind) {
   if (parentBatch === batchToFind) {
     return true;
   }
-  return _.any(parentBatch.context.queries, function (query) {
+  return _.some(parentBatch.context.queries, function (query) {
     if (isBatch(query)) {
       return containsBatch(query, batchToFind);
     }

package.json

@@ -21,7 +21,7 @@
     "async": "^1.2.1",
     "cassandra-driver": "^3.0.2",
     "isstream": "^0.1.2",
-    "lodash": "^3.9.3",
+    "lodash": "^4.17.11",
     "q": "^1.4.1",
     "read-only-stream": "^1.1.1",
     "retry": "^0.6.1",

test/unit/driver-factory.tests.js

@@ -37,9 +37,9 @@ describe('lib/driver-factory.js', function () {
     });
 
     it('exposes DataStax types and consistencies', function () {
-      expect(DriverFactory.consistencies).to.be.an.object;
-      expect(DriverFactory.dataTypes).to.be.an.object;
-      expect(DriverFactory.valueTypes).to.be.an.object;
+      expect(DriverFactory.consistencies).to.be.an('object');
+      expect(DriverFactory.dataTypes).to.be.an('object');
+      expect(DriverFactory.valueTypes).to.be.an('object');
     });
 
     function testInstance(driver, versionPath, cqlVersion, expectedDriver, expectedVersion, expectedProtocol, expectedInstance) {

test/unit/driver.basic.tests.js

@@ -308,7 +308,8 @@ describe('lib/driver.js', function () {
       expect(driver.execCql.args[0][0]).to.equal(cql);
       expect(driver.execCql.args[0][1]).to.deep.equal(params);
       expect(driver.execCql.args[0][2]).to.deep.equal(options);
-      expect(driver.execCql.args[0][3]).to.be.a.function;
+      expect(driver.execCql.args[0][3]).to.be.a('string');
+      expect(driver.execCql.args[0][4]).to.be.a('function');
       expect(driver.execCqlStream.called).to.be.false;
     });