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

Backport PR #8558

Browse source 
---------

**Commit 1:**
remove unused vars

do not hardcode css-snippet

* Original sha: 56c130aa80
* Authored by Thomas Neirynck <thomas@elastic.co> on 2016-10-05T15:47:05Z
This commit is contained in:
Elastic Jasper 2016-10-05 18:46:13 -04:00
parent 00d0e3f48d
commit a14b51e0c2
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ bdd.describe('visualize app', function describeIndexTests() {
// sleep a bit before trying to get the chart data // sleep a bit before trying to get the chart data
return PageObjects.common.sleep(3000) return PageObjects.common.sleep(3000)
.then(function () { .then(function () {
return PageObjects.visualize.getLineChartData('fill="#57c17b"') return PageObjects.visualize.getLineChartData('fill="#6eadc1"')
.then(function showData(data) { .then(function showData(data) {
PageObjects.common.debug('data=' + data); PageObjects.common.debug('data=' + data);
PageObjects.common.saveScreenshot('Visualize-line-chart'); PageObjects.common.saveScreenshot('Visualize-line-chart');
@ -92,7 +92,7 @@ bdd.describe('visualize app', function describeIndexTests() {
}) })
.then(function () { .then(function () {
return PageObjects.common.try(function () { return PageObjects.common.try(function () {
return PageObjects.visualize.getLineChartData('fill="#57c17b"') return PageObjects.visualize.getLineChartData('fill="#6eadc1"')
.then(function showData(data) { .then(function showData(data) {
PageObjects.common.debug('data=' + data); PageObjects.common.debug('data=' + data);
PageObjects.common.saveScreenshot('Visualize-line-chart'); PageObjects.common.saveScreenshot('Visualize-line-chart');

7
test/support/page_objects/visualize_page.js
View file

@ -75,7 +75,7 @@ export default class VisualizePage {
} }
getChartTypes() { getChartTypes() {
var types = [];
return this.remote return this.remote
.setFindTimeout(defaultFindTimeout) .setFindTimeout(defaultFindTimeout)
.findAllByCssSelector('.wizard-type-heading h4') .findAllByCssSelector('.wizard-type-heading h4')
@ -440,7 +440,6 @@ export default class VisualizePage {
var chartData = []; var chartData = [];
var tempArray = []; var tempArray = [];
var chartSections = 0; var chartSections = 0;
var chartMap = {};
var height = 0; var height = 0;
var yAxisLabel = 0; var yAxisLabel = 0;
var yAxisHeight = 0; var yAxisHeight = 0;
@ -529,7 +528,7 @@ export default class VisualizePage {
// 5). for each chart element, find the green circle, then the cy position // 5). for each chart element, find the green circle, then the cy position
function getChartType(chart) { function getChartType(chart) {
return chart return chart
.findByCssSelector('circle[fill="#6eadc1"]') .findByCssSelector(`circle[${cssPart}]`)
.then(function (circleObject) { .then(function (circleObject) {
// PageObjects.common.debug('circleObject = ' + circleObject + ' yAxisHeight= ' + yAxisHeight + ' yAxisLabel= ' + yAxisLabel); // PageObjects.common.debug('circleObject = ' + circleObject + ' yAxisHeight= ' + yAxisHeight + ' yAxisLabel= ' + yAxisLabel);
return circleObject return circleObject
@ -619,8 +618,6 @@ export default class VisualizePage {
} }
getPieChartData() { getPieChartData() {
var self = this.remote;
// 1). get the maximim chart Y-Axis marker value // 1). get the maximim chart Y-Axis marker value
return this.remote return this.remote
.setFindTimeout(defaultFindTimeout * 2) .setFindTimeout(defaultFindTimeout * 2)