Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/functional/apps/visualize/_line_chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bdd.describe('visualize app', function describeIndexTests() {
// sleep a bit before trying to get the chart data
return PageObjects.common.sleep(3000)
.then(function () {
return PageObjects.visualize.getLineChartData('fill="#57c17b"')
return PageObjects.visualize.getLineChartData('fill="#6eadc1"')
.then(function showData(data) {
PageObjects.common.debug('data=' + data);
PageObjects.common.saveScreenshot('Visualize-line-chart');
Expand Down Expand Up @@ -92,7 +92,7 @@ bdd.describe('visualize app', function describeIndexTests() {
})
.then(function () {
return PageObjects.common.try(function () {
return PageObjects.visualize.getLineChartData('fill="#57c17b"')
return PageObjects.visualize.getLineChartData('fill="#6eadc1"')
.then(function showData(data) {
PageObjects.common.debug('data=' + data);
PageObjects.common.saveScreenshot('Visualize-line-chart');
Expand Down
7 changes: 2 additions & 5 deletions test/support/page_objects/visualize_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default class VisualizePage {
}

getChartTypes() {
var types = [];

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

getPieChartData() {
var self = this.remote;

// 1). get the maximim chart Y-Axis marker value
return this.remote
.setFindTimeout(defaultFindTimeout * 2)
Expand Down