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

fixing selenium test

Browse source
This commit is contained in:
ppisljar 2016-12-08 14:05:49 +01:00
parent 98dbfac2b6
commit 9b0f4aa37e
6 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html
View file

@ -76,11 +76,11 @@
<div class="kuiSideBarCollapsibleTitle">
<div
class="kuiSideBarCollapsibleTitle__label"
ng-click="isColorRangeOpen = !isColorRangeOpen"
ng-click="vis.params.setColorRange = !vis.params.setColorRange"
>
<span
aria-hidden="true"
ng-class="{ 'fa-caret-down': isColorRangeOpen, 'fa-caret-right': !isColorRangeOpen }"
ng-class="{ 'fa-caret-down': vis.params.setColorRange, 'fa-caret-right': !vis.params.setColorRange }"
class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret"
></span>
<span class="kuiSideBarCollapsibleTitle__text">
@ -94,7 +94,7 @@
>
</div>
<div ng-if="vis.params.setColorRange" ng-show="isColorRangeOpen" class="kuiSideBarCollapsibleSection">
<div ng-if="vis.params.setColorRange" class="kuiSideBarCollapsibleSection">
<div class="kuiSideBarSection">
<div class="kuiSideBarFormRow" ng-repeat="color in vis.params.colorsRange track by $index">
<label class="kuiSideBarFormRow__label" for="{{ 'colorRange' + $index }}">
@ -121,11 +121,14 @@
<div class="kuiSideBarCollapsibleTitle">
<div
class="kuiSideBarCollapsibleTitle__label"
ng-click="isLabelsOpen = !isLabelsOpen"
ng-click="vis.params.valueAxes[0].labels.show = !vis.params.valueAxes[0].labels.show"
>
<span
aria-hidden="true"
ng-class="{ 'fa-caret-down': isLabelsOpen, 'fa-caret-right': !isLabelsOpen }"
ng-class="{
'fa-caret-down': vis.params.valueAxes[0].labels.show,
'fa-caret-right': !vis.params.valueAxes[0].labels.show
}"
class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret"
></span>
<span class="kuiSideBarCollapsibleTitle__text">
@ -138,7 +141,7 @@
class="kuiSideBarSectionTitle__action"
>
</div>
<div ng-if="vis.params.valueAxes[0].labels.show" ng-show="isLabelsOpen" class="kuiSideBarCollapsibleSection">
<div ng-if="vis.params.valueAxes[0].labels.show" class="kuiSideBarCollapsibleSection">
<div class="kuiSideBarSection">
<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="rotateLabels">

6
src/ui/public/vislib/__tests__/components/heatmap_color.js
View file

@ -52,10 +52,10 @@ describe('Vislib Heatmap Color Module Test Suite', function () {
});
it('should return a color for numbers from 0 to 9', function () {
const colorRegex = /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/;
const schema = 'reds';
const colorRegex = /^rgb\((\d{1,3}),(\d{1,3}),(\d{1,3})\)$/;
const schema = 'Greens';
for (let i = 0; i < 10; i++) {
expect(getColors(i, schema)).to.match(colorRegex);
expect(getColors(i / 10, schema)).to.match(colorRegex);
}
});

5
src/ui/public/vislib/__tests__/visualizations/heatmap_chart.js
View file

@ -37,8 +37,10 @@ describe('Vislib Heatmap Chart Test Suite', function () {
addLegend: true,
addTooltip: true,
colorsNumber: 4,
colorSchema: 'yellow to red',
colorSchema: 'Greens',
setColorRange: false,
percentageMode: true,
invertColors: false,
colorsRange: []
};
@ -139,6 +141,7 @@ describe('Vislib Heatmap Chart Test Suite', function () {
});
it('should set custom range', function () {
vis.destroy();
generateVis({
setColorRange: true,
colorsRange: [{ value: 0}, { value: 200 }, { value: 400 }, { value: 500 }]

1
src/ui/public/vislib/lib/data.js
View file

@ -46,6 +46,7 @@ export default function DataFactory(Private) {
newVal.aggConfig = val.aggConfig;
newVal.aggConfigResult = val.aggConfigResult;
newVal.extraMetrics = val.extraMetrics;
newVal.series = val.series || seri.label;
return newVal;
})
};

2
src/ui/public/vislib/visualizations/point_series/heatmap_chart.js
View file

@ -237,7 +237,7 @@ export default function HeatmapChartFactory(Private) {
squares.call(tooltip.render());
}
return squares;
return squares.selectAll('rect');
};
/**

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

@ -16,7 +16,7 @@ bdd.describe('visualize app', function describeIndexTests() {
bdd.describe('chart types', function indexPatternCreation() {
bdd.it('should show the correct chart types', function () {
const expectedChartTypes = [
'Area chart', 'Data table', 'Line chart', 'Markdown widget',
'Area chart', 'Data table', 'Heatmap chart', 'Line chart', 'Markdown widget',
'Metric', 'Pie chart', 'Tag cloud', 'Tile map', 'Timeseries', 'Vertical bar chart'
];
// find all the chart types and make sure there all there