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

update POST api functional tests for the new resource schema

Browse source
This commit is contained in:
Matthew Bargar 2015-12-10 15:16:13 -05:00
parent 8ae714b0c2
commit 0ff6696dd2
2 changed files with 14 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/plugins/kibana/server/routes/api/index_patterns/register_post.js
View file

@ -24,7 +24,6 @@ module.exports = function registerPost(server) {
const included = requestDocument.included;
const indexPatternId = requestDocument.data.id;
const indexPattern = requestDocument.data.attributes;
const isWildcard = _.contains(indexPattern.title, '*');
const templateResource = _.isEmpty(included) ? null : included[0];
if (!_.isEmpty(templateResource)) {
@ -41,7 +40,7 @@ module.exports = function registerPost(server) {
callWithRequest(req, 'create', patternCreateParams)
.then((patternResponse) => {
if (!isWildcard || _.isEmpty(included)) {
if (_.isEmpty(included)) {
return patternResponse;
}

61
test/unit/api/index_patterns/_post.js
View file

@ -44,7 +44,7 @@ define(function (require) {
.expect(201);
});
bdd.it('should create an index template if mappings are provided', function createTemplate() {
bdd.it('should create an index template if a template is included', function createTemplate() {
return request.post('/kibana/index_patterns')
.send(createTestData().indexPatternWithTemplate)
.expect(201)
@ -53,42 +53,6 @@ define(function (require) {
});
});
bdd.it('should NOT create an index template if mappings are NOT provided', function noMappings() {
var pattern = createTestData().indexPatternWithTemplate;
pattern.fields = _.map(pattern.fields, function (field) {
return _.omit(field, 'mapping');
});
return request.post('/kibana/index_patterns')
.send(pattern)
.expect(201)
.then(function () {
return scenarioManager.client.indices.getTemplate({name: 'kibana-logstash-*'});
})
.then(function () {
throw new Error('Template was created');
}, function (error) {
expect(error.status).to.be(404);
});
});
bdd.it('should NOT create an index template if pattern does not contain a wildcard', function noWildcard() {
var pattern = createTestData().indexPatternWithTemplate;
pattern.title = 'notawildcard';
return request.post('/kibana/index_patterns')
.send(pattern)
.expect(201)
.then(function () {
return scenarioManager.client.indices.getTemplate({name: 'kibana-notawildcard'});
})
.then(function () {
throw new Error('Template was created');
}, function (error) {
expect(error.status).to.be(404);
});
});
bdd.it('should return 409 conflict when a pattern with the given ID already exists', function patternConflict() {
return request.post('/kibana/index_patterns')
.send(createTestData().indexPatternWithTemplate)
@ -113,23 +77,21 @@ define(function (require) {
});
});
bdd.it('should return 409 conflict when mappings are provided with a pattern that matches existing indices',
bdd.it('should return 409 conflict when a template is included with a pattern that matches existing indices',
function existingIndicesConflict() {
var pattern = createTestData().indexPatternWithTemplate;
pattern.title = '.kib*';
pattern.data.id = pattern.data.attributes.title = pattern.included[0].attributes.template = '.kib*';
return request.post('/kibana/index_patterns')
.send(pattern)
.expect(409);
});
bdd.it('should return 201 created successfully if a pattern matches existing indices but has NO mappings',
function existingIndicesNoMappings() {
bdd.it('should return 201 created successfully if a pattern matches existing indices but no template is included',
function existingIndicesNoTemplate() {
var pattern = createTestData().indexPatternWithTemplate;
pattern.fields = _.map(pattern.fields, function (field) {
return _.omit(field, 'mapping');
});
pattern.title = '.kib*';
pattern.data.id = pattern.data.attributes.title = '.kib*';
delete pattern.included;
return request.post('/kibana/index_patterns')
.send(pattern)
@ -137,10 +99,13 @@ define(function (require) {
});
bdd.it('should enforce snake_case in the request body', function () {
var pattern = createTestData().indexPatternWithTemplate;
pattern.data.attributes = _.mapKeys(pattern.data.attributes, function (value, key) {
return _.camelCase(key);
});
return request.post('/kibana/index_patterns')
.send(_.mapKeys(createTestData().indexPatternWithTemplate, function (value, key) {
return _.camelCase(key);
}))
.send(pattern)
.expect(400);
});