github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

propertly return promises, properly catch Promise.all failure

Browse source
This commit is contained in:
Joe Fleming 2015-11-05 16:15:20 -07:00
parent c71505fe26
commit 72151b50e9
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
test/fixtures/scenarioManager.js vendored
View file

@ -16,15 +16,14 @@ function ScenarioManager(server) {
* @return {Promise} A promise that is resolved when elasticsearch has a response
*/
ScenarioManager.prototype.load = function (id) {
var self = this;
var scenario = config[id];
if (!scenario) return Promise.reject('No scenario found for ' + id);
var self = this;
return Promise.all(scenario.bulk.map(function mapBulk(bulk) {
var loadIndexDefinition;
if (bulk.indexDefinition) {
var body = require(path.join(scenario.baseDir, bulk.indexDefinition));
loadIndexDefinition = self.client.indices.create({
index: bulk.indexName,
body: body
@ -33,10 +32,10 @@ ScenarioManager.prototype.load = function (id) {
loadIndexDefinition = Promise.resolve();
}
return loadIndexDefinition.then(function bulkRequest() {
return loadIndexDefinition
.then(function bulkRequest() {
var body = require(path.join(scenario.baseDir, bulk.source));
self.client.bulk({
return self.client.bulk({
body: body
});
});
@ -69,7 +68,8 @@ ScenarioManager.prototype.unload = function (id) {
ScenarioManager.prototype.reload = function (id) {
var self = this;
return this.unload(id).then(function load() {
return self.unload(id)
.then(function load() {
return self.load(id);
});
};
@ -103,14 +103,13 @@ ScenarioManager.prototype.loadIfEmpty = function (id) {
})
.then(function handleCountResponse(response) {
if (response.count === 0) {
self.load(id);
return self.load(id);
}
})
.catch(function (reason) {
self.load(id);
});
}));
}))
.catch(function (reason) {
return self.load(id);
});
};
module.exports = ScenarioManager;
module.exports = ScenarioManager;