From 5de8d2faa1cfab1dd790e0c682890389d1afe80f Mon Sep 17 00:00:00 2001 From: Chris Impey Date: Mon, 5 Oct 2015 16:02:16 +0100 Subject: [PATCH] remove timeouts now specs are faster due to local elasticsearch --- circle.yml | 2 +- spec/analytics.js | 4 +--- spec/indexes_{name}.js | 4 +--- spec/indexes_{name}_batch.js | 4 +--- spec/indexes_{name}_{objectID}.js | 4 +--- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/circle.yml b/circle.yml index 93440cc..084dd6e 100644 --- a/circle.yml +++ b/circle.yml @@ -21,4 +21,4 @@ dependencies: test: override: - - docker-compose run api bash -c grunt ci + - docker-compose run api grunt ci diff --git a/spec/analytics.js b/spec/analytics.js index 289e19c..6456915 100644 --- a/spec/analytics.js +++ b/spec/analytics.js @@ -6,9 +6,7 @@ const specRequest = require('./spec_request'); const elasticsearchClient = require('../lib/elasticsearchClient'); const generateOpsIndexName = require('../lib/analytics_logger').generateIndexName; -describe('analytics', function () { - this.timeout(3000); - +describe('analytics', () => { const testIndexName = `test_index_${cuid()}`; before(() => { diff --git a/spec/indexes_{name}.js b/spec/indexes_{name}.js index 9028c2a..4d7566d 100644 --- a/spec/indexes_{name}.js +++ b/spec/indexes_{name}.js @@ -7,9 +7,7 @@ const specRequest = require('./spec_request'); const expect = require('chai').expect; -describe('/indexes/{name}', function () { - this.timeout(5000); - +describe('/indexes/{name}', () => { const testIndexName = `test_index_${cuid()}`; const testObject = {name: 'object', field: 'value'}; let createResponse; diff --git a/spec/indexes_{name}_batch.js b/spec/indexes_{name}_batch.js index 912b91c..870402c 100644 --- a/spec/indexes_{name}_batch.js +++ b/spec/indexes_{name}_batch.js @@ -8,9 +8,7 @@ const elasticsearchClient = require('../lib/elasticsearchClient'); const expect = require('chai').expect; -describe('/indexes/{name}/batch', function () { - this.timeout(5000); - +describe('/indexes/{name}/batch', () => { let testIndexName; describe('post', () => { diff --git a/spec/indexes_{name}_{objectID}.js b/spec/indexes_{name}_{objectID}.js index ffe23ca..4712d9d 100644 --- a/spec/indexes_{name}_{objectID}.js +++ b/spec/indexes_{name}_{objectID}.js @@ -8,9 +8,7 @@ const specRequest = require('./spec_request'); const expect = require('chai').expect; -describe('/indexes/{name}/{objectID}', function () { - this.timeout(5000); - +describe('/indexes/{name}/{objectID}', () => { const testIndexName = `test_index_${cuid()}`; const testObject = {name: 'an object', field1: 'some value', field2: false}; let indexedObject;