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

Added UTC Timezone to the initial kibana data load. Change HeaderPage.setAbsoluteTime to click the Timepicker and collapse the pane when done. Update data in most visualize tests for UTC time.

Browse source
This commit is contained in:
LeeDr 2015-11-25 13:34:23 -06:00
parent e1606db2db
commit d6ff27be29
14 changed files with 152 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/fixtures/scenarios/emptyKibana/kibana.js vendored
View file

@ -1,12 +1,10 @@
module.exports = [{
'index': {
'_index': '.kibana',
'_type': 'config'
'_type': 'config',
'_id': require('../../../../package.json').version
}
}, {
'index': '.kibana',
'body': {
'buildNum': '@@buildNum'
},
'id': '@@version'
'buildNum': require('../../../../package.json').build.number,
'dateFormat:tz': 'UTC'
}];

8
test/functional/apps/discover/_discover.js
View file

@ -40,18 +40,10 @@ define(function (require) {
common.debug('discover');
return common.navigateToApp('discover');
})
.then(function () {
common.debug('clickTimepicker');
return headerPage.clickTimepicker();
})
.then(function () {
common.debug('setAbsoluteRange');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function () {
common.debug('collapseTimepicker');
return headerPage.collapseTimepicker();
})
.catch(common.handleError(this));
});

80
test/functional/apps/visualize/_area_chart.js
View file

@ -41,9 +41,6 @@ define(function (require) {
common.debug('navigateToApp visualize');
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.then(function () {
common.debug('clickAreaChart');
return visualizePage.clickAreaChart();
@ -52,20 +49,10 @@ define(function (require) {
common.debug('clickNewSearch');
return visualizePage.clickNewSearch();
})
.then(function clickTimepicker() {
common.debug('clickTimepicker');
return common.tryForTime(5000, function () {
return headerPage.clickTimepicker();
});
})
.then(function setAbsoluteRange() {
common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function collapseTimepicker() {
common.debug('Collapse Time Picker pane');
return headerPage.collapseTimepicker();
})
.then(function clickBucket() {
common.debug('Click X-Axis');
return visualizePage.clickBucket('X-Axis');
@ -134,19 +121,30 @@ define(function (require) {
this.timeout = 60000;
var expectedTableData = ['September 19th 2015, 18:00:00.000 15',
'September 19th 2015, 21:00:00.000 105', 'September 20th 2015, 00:00:00.000 518',
'September 20th 2015, 03:00:00.000 1,261', 'September 20th 2015, 06:00:00.000 1,485',
'September 20th 2015, 09:00:00.000 982', 'September 20th 2015, 12:00:00.000 322',
'September 20th 2015, 15:00:00.000 65', 'September 20th 2015, 18:00:00.000 29',
'September 20th 2015, 21:00:00.000 104', 'September 21st 2015, 00:00:00.000 483',
'September 21st 2015, 03:00:00.000 1,163', 'September 21st 2015, 06:00:00.000 1,507',
'September 21st 2015, 09:00:00.000 958', 'September 21st 2015, 12:00:00.000 317',
'September 21st 2015, 15:00:00.000 55', 'September 21st 2015, 18:00:00.000 17',
'September 21st 2015, 21:00:00.000 88', 'September 22nd 2015, 00:00:00.000 498',
'September 22nd 2015, 03:00:00.000 1,209', 'September 22nd 2015, 06:00:00.000 1,488',
'September 22nd 2015, 09:00:00.000 949', 'September 22nd 2015, 12:00:00.000 308',
'September 22nd 2015, 15:00:00.000 74', 'September 22nd 2015, 18:00:00.000 4'
var expectedTableData = [ 'September 20th 2015, 00:00:00.000 37',
'September 20th 2015, 03:00:00.000 202',
'September 20th 2015, 06:00:00.000 740',
'September 20th 2015, 09:00:00.000 1,437',
'September 20th 2015, 12:00:00.000 1,371',
'September 20th 2015, 15:00:00.000 751',
'September 20th 2015, 18:00:00.000 188',
'September 20th 2015, 21:00:00.000 31',
'September 21st 2015, 00:00:00.000 42',
'September 21st 2015, 03:00:00.000 202',
'September 21st 2015, 06:00:00.000 683',
'September 21st 2015, 09:00:00.000 1,361',
'September 21st 2015, 12:00:00.000 1,415',
'September 21st 2015, 15:00:00.000 707',
'September 21st 2015, 18:00:00.000 177',
'September 21st 2015, 21:00:00.000 27',
'September 22nd 2015, 00:00:00.000 32',
'September 22nd 2015, 03:00:00.000 175',
'September 22nd 2015, 06:00:00.000 707',
'September 22nd 2015, 09:00:00.000 1,408',
'September 22nd 2015, 12:00:00.000 1,355',
'September 22nd 2015, 15:00:00.000 726',
'September 22nd 2015, 18:00:00.000 201',
'September 22nd 2015, 21:00:00.000 29'
];
return visualizePage.collapseChart()
@ -175,10 +173,34 @@ define(function (require) {
this.timeout = 60000;
var chartHeight = 0;
var xAxisLabels = ['2015-09-19 19:00', '2015-09-20 19:00', '2015-09-21 19:00', '2015-09-22 19:00'];
var xAxisLabels = [ '2015-09-20 00:00', '2015-09-21 00:00',
'2015-09-22 00:00', '2015-09-23 00:00'
];
var yAxisLabels = ['0','200','400','600','800','1,000','1,200','1,400','1,600'];
var expectedAreaChartData = [15, 105, 518, 1261, 1485, 982, 322, 65, 29,
104, 483, 1163, 1507, 958, 317, 55, 17, 88, 498, 1209, 1488, 949, 308, 74, 4
var expectedAreaChartData = [37,
202,
740,
1437,
1371,
751,
188,
31,
42,
202,
683,
1361,
1415,
707,
177,
27,
32,
175,
707,
1408,
1355,
726,
201,
29
];
return visualizePage.getXAxisLabels()

3
test/functional/apps/visualize/_chart_types.js
View file

@ -28,9 +28,6 @@ define(function (require) {
common.debug('navigateToApp visualize');
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.catch(common.handleError(this));
});

15
test/functional/apps/visualize/_data_table.js
View file

@ -42,30 +42,17 @@ define(function (require) {
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.then(function () {
common.debug('clickLineChart');
common.debug('clickDataTable');
return visualizePage.clickDataTable();
})
.then(function clickNewSearch() {
common.debug('clickNewSearch');
return visualizePage.clickNewSearch();
})
.then(function clickTimepicker() {
return common.tryForTime(5000, function () {
common.debug('clickTimepicker');
return headerPage.clickTimepicker();
});
})
.then(function setAbsoluteRange() {
common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function collapseTimepicker() {
common.debug('Collapse Time Picker pane');
return headerPage.collapseTimepicker();
})
.then(function clickBucket() {
common.debug('Bucket = Split Rows');
return visualizePage.clickBucket('Split Rows');

14
test/functional/apps/visualize/_line_chart.js
View file

@ -38,9 +38,6 @@ define(function (require) {
common.debug('navigateToApp visualize');
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.then(function () {
common.debug('clickLineChart');
return visualizePage.clickLineChart();
@ -48,21 +45,10 @@ define(function (require) {
.then(function clickNewSearch() {
return visualizePage.clickNewSearch();
})
.then(function sleep() {
return common.sleep(1000);
})
.then(function clickTimepicker() {
common.debug('Click time picker');
return headerPage.clickTimepicker();
})
.then(function setAbsoluteRange() {
common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function collapseTimepicker() {
common.debug('Collapse Time Picker pane');
return headerPage.collapseTimepicker();
})
.then(function clickBucket() {
common.debug('Bucket = Split Chart');
return visualizePage.clickBucket('Split Chart');

18
test/functional/apps/visualize/_metric_chart.js
View file

@ -45,9 +45,6 @@ define(function (require) {
common.debug('navigateToApp visualize');
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.then(function () {
common.debug('clickMetric');
return visualizePage.clickMetric();
@ -55,21 +52,10 @@ define(function (require) {
.then(function clickNewSearch() {
return visualizePage.clickNewSearch();
})
.then(function sleep() {
return common.sleep(1000);
})
.then(function clickTimepicker() {
common.debug('Click time picker');
return headerPage.clickTimepicker();
})
.then(function setAbsoluteRange() {
common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function collapseTimepicker() {
common.debug('Collapse Time Picker pane');
return headerPage.collapseTimepicker();
})
.catch(common.handleError(this));
});
@ -160,7 +146,7 @@ define(function (require) {
});
bdd.it('should show Min', function pageHeader() {
var minTimestamp = ['September 19th 2015, 19:00:00.000', 'Min @timestamp'];
var minTimestamp = ['September 20th 2015, 00:00:00.000', 'Min @timestamp'];
common.debug('Aggregation = Min');
return visualizePage.selectAggregation('Min')
.then(function selectField() {
@ -182,7 +168,7 @@ define(function (require) {
});
bdd.it('should show Max', function pageHeader() {
var maxRelatedContentArticleModifiedTime = ['April 3rd 2015, 19:54:41.000', 'Max relatedContent.article:modified_time'];
var maxRelatedContentArticleModifiedTime = ['April 4th 2015, 00:54:41.000', 'Max relatedContent.article:modified_time'];
common.debug('Aggregation = Max');
return visualizePage.selectAggregation('Max')
.then(function selectField() {

14
test/functional/apps/visualize/_pie_chart.js
View file

@ -38,9 +38,6 @@ define(function (require) {
common.debug('navigateToApp visualize');
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.then(function () {
common.debug('clickPieChart');
return visualizePage.clickPieChart();
@ -48,21 +45,10 @@ define(function (require) {
.then(function clickNewSearch() {
return visualizePage.clickNewSearch();
})
.then(function sleep() {
return common.sleep(1000);
})
.then(function clickTimepicker() {
common.debug('Click time picker');
return headerPage.clickTimepicker();
})
.then(function setAbsoluteRange() {
common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function collapseTimepicker() {
common.debug('Collapse Time Picker pane');
return headerPage.collapseTimepicker();
})
.then(function () {
common.debug('select bucket Split Slices');
return visualizePage.clickBucket('Split Slices');

12
test/functional/apps/visualize/_tile_map.js
View file

@ -40,9 +40,6 @@ define(function (require) {
common.debug('navigateToApp visualize');
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.then(function () {
common.debug('clickTileMap');
return visualizePage.clickTileMap();
@ -50,19 +47,10 @@ define(function (require) {
.then(function () {
return visualizePage.clickNewSearch();
})
.then(function () {
return common.tryForTime(5000, function () {
return headerPage.clickTimepicker();
});
})
.then(function () {
common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function () {
common.debug('Collapse Time Picker pane');
return headerPage.collapseTimepicker();
})
.then(function () {
common.debug('select bucket Geo Coordinates');
return visualizePage.clickBucket('Geo Coordinates');

38
test/functional/apps/visualize/_vertical_bar_chart.js
View file

@ -40,9 +40,6 @@ define(function (require) {
common.debug('navigateToApp visualize');
return common.navigateToApp('visualize');
})
.then(function () {
return common.sleep(2000);
})
.then(function () {
common.debug('clickVerticalBarChart');
return visualizePage.clickVerticalBarChart();
@ -50,21 +47,10 @@ define(function (require) {
.then(function clickNewSearch() {
return visualizePage.clickNewSearch();
})
.then(function sleep() {
return common.sleep(1000);
})
.then(function clickTimepicker() {
common.debug('Click time picker');
return headerPage.clickTimepicker();
})
.then(function setAbsoluteRange() {
common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
return headerPage.setAbsoluteRange(fromTime, toTime);
})
.then(function collapseTimepicker() {
common.debug('Collapse Time Picker pane');
return headerPage.collapseTimepicker();
})
.then(function clickBucket() {
common.debug('Bucket = X-Axis');
return visualizePage.clickBucket('X-Axis');
@ -125,8 +111,8 @@ define(function (require) {
bdd.it('should show correct chart', function pageHeader() {
this.timeout = 60000;
var expectedChartValues = [15, 105, 518, 1261, 1485, 982, 322, 65, 29, 104,
483, 1163, 1507, 958, 317, 55, 17, 88, 498, 1209, 1488, 949, 308, 74, 4
var expectedChartValues = [37, 202, 740, 1437, 1371, 751, 188, 31, 42, 202, 683,
1361, 1415, 707, 177, 27, 32, 175, 707, 1408, 1355, 726, 201, 29
];
return visualizePage.getBarChartData()
@ -145,16 +131,16 @@ define(function (require) {
this.timeout = 60000;
// this is only the first page of the tabular data.
var expectedChartData = [ 'September 19th 2015, 18:00:00.000 15',
'September 19th 2015, 21:00:00.000 105',
'September 20th 2015, 00:00:00.000 518',
'September 20th 2015, 03:00:00.000 1,261',
'September 20th 2015, 06:00:00.000 1,485',
'September 20th 2015, 09:00:00.000 982',
'September 20th 2015, 12:00:00.000 322',
'September 20th 2015, 15:00:00.000 65',
'September 20th 2015, 18:00:00.000 29',
'September 20th 2015, 21:00:00.000 104'
var expectedChartData = [ 'September 20th 2015, 00:00:00.000 37',
'September 20th 2015, 03:00:00.000 202',
'September 20th 2015, 06:00:00.000 740',
'September 20th 2015, 09:00:00.000 1,437',
'September 20th 2015, 12:00:00.000 1,371',
'September 20th 2015, 15:00:00.000 751',
'September 20th 2015, 18:00:00.000 188',
'September 20th 2015, 21:00:00.000 31',
'September 21st 2015, 00:00:00.000 42',
'September 21st 2015, 03:00:00.000 202'
];
return visualizePage.collapseChart()

1
test/functional/apps/visualize/index.js
View file

@ -49,6 +49,7 @@ define(function (require) {
});
});
bdd.after(function unloadMakelogs() {
return scenarioManager.unload('logstashFunctional');
});

11
test/support/pages/HeaderPage.js
View file

@ -82,8 +82,12 @@ define(function (require) {
setAbsoluteRange: function setAbsoluteRange(fromTime, toTime) {
var self = this;
common.debug('--Clicking Absolute button');
return self.clickAbsoluteButton()
common.debug('clickTimepicker');
return self.clickTimepicker()
.then(function () {
common.debug('--Clicking Absolute button');
return self.clickAbsoluteButton();
})
.then(function () {
common.debug('--Setting From Time : ' + fromTime);
return self.setFromTime(fromTime);
@ -94,6 +98,9 @@ define(function (require) {
})
.then(function () {
return self.clickGoButton();
})
.then(function () {
self.collapseTimepicker();
});
},

43
test/support/pages/SettingsPage.js
View file

@ -7,7 +7,7 @@ define(function (require) {
var Promise = require('bluebird');
var Common = require('./Common');
var defaultTimeout = 60000;
var defaultTimeout = 6000;
var common;
function SettingsPage(remote) {
@ -22,6 +22,47 @@ define(function (require) {
return common.navigateToApp('settings');
},
setAdvancedSetting2: function (propertyName, propertyValue) {
var self = this;
// assumes we're on Settings tab already
//click Advanced sub-tab
return this.remote.setFindTimeout(defaultTimeout)
.findByLinkText('Advanced').click()
.then(function () {
//.table
return self.remote.findByCssSelector('tr')
.then(function (table) {
common.log('table.rows = ' + table.length); // undefined
common.log('table.rows = ' + table.size); // undefined
common.log('table.rows = ' + table.count); // undefined
common.log('table.getProperty(rows).length = ' + table.getProperty('rows').length); // undefined
common.log('table.getProperty(rows) = ' + table.getProperty('rows')); // [object Object]
common.log('table.getProperty(rows).size = ' + table.getProperty('rows').size); // undefined
// common.log('table.getProperty(rows).size = ' + table.getProperty('rows').size()); // exception
});
});
},
setAdvancedSetting: function (propertyName, propertyValue) {
var self = this;
// assumes we're on Settings tab already
//click Advanced sub-tab
return this.remote.setFindTimeout(defaultTimeout)
.findByLinkText('Advanced').click()
.then(function () {
return self.remote.findByCssSelector('tr > td > b:contains("' + propertyName + '")')
.then(function (foundit) {
console.log('foundit)');
});
});
// },
// .ng-binding
// tr.ng-scope:nth-child(4) > td:nth-child(1)
// tr.ng-scope:nth-child(4) > td:nth-child(3) > button:nth-child(1) (the edit button)
// .findByCssSelector('input[ng-model="index.isTimeBased"]');
},
getTimeBasedEventsCheckbox: function () {
return this.remote.setFindTimeout(defaultTimeout)
.findByCssSelector('input[ng-model="index.isTimeBased"]');

60
test/support/pages/VisualizePage.js
View file

@ -96,14 +96,14 @@ define(function (require) {
},
//
clickTimepicker: function clickTimepicker() {
return this.remote
.setFindTimeout(defaultTimeout * 2)
.findByClassName('navbar-timepicker-time-desc')
.then(function (picker) {
return picker.click();
});
},
// clickTimepicker: function clickTimepicker() {
// return this.remote
// .setFindTimeout(defaultTimeout * 2)
// .findByClassName('navbar-timepicker-time-desc')
// .then(function (picker) {
// return picker.click();
// });
// },
clickAbsoluteButton: function clickAbsoluteButton() {
return this.remote
@ -138,22 +138,22 @@ define(function (require) {
},
setAbsoluteRange: function setAbsoluteRange(fromTime, toTime) {
var self = this;
common.debug('--Clicking Absolute button');
return self.clickAbsoluteButton()
.then(function () {
common.debug('--Setting From Time : ' + fromTime);
return self.setFromTime(fromTime);
})
.then(function () {
common.debug('--Setting To Time : ' + toTime);
return self.setToTime(toTime);
})
.then(function () {
return self.clickGoButton();
});
},
// setAbsoluteRange: function setAbsoluteRange(fromTime, toTime) {
// var self = this;
// common.debug('--Clicking Absolute button');
// return self.clickAbsoluteButton()
// .then(function () {
// common.debug('--Setting From Time : ' + fromTime);
// return self.setFromTime(fromTime);
// })
// .then(function () {
// common.debug('--Setting To Time : ' + toTime);
// return self.setToTime(toTime);
// })
// .then(function () {
// return self.clickGoButton();
// });
// },
collapseChart: function collapseChart() {
return this.remote
@ -162,12 +162,12 @@ define(function (require) {
.click();
},
collapseTimepicker: function collapseTimepicker() {
return this.remote
.setFindTimeout(defaultTimeout)
.findByCssSelector('i.fa.fa-chevron-up')
.click();
},
// collapseTimepicker: function collapseTimepicker() {
// return this.remote
// .setFindTimeout(defaultTimeout)
// .findByCssSelector('i.fa.fa-chevron-up')
// .click();
// },
getMetric: function getMetric() {
return this.remote