Skip to content

Commit

Permalink
getting marco's changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bhavyarm committed Oct 7, 2019
2 parents dba0946 + 64d09c6 commit f1e9061
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ function ValueAxisOptions(props: ValueAxisOptionsParams) {

<SelectOption
id={`scaleSelectYAxis-${axis.id}`}
data-test-subj={`scaleSelectYAxis-${axis.id}`}
label={i18n.translate('kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleTypeLabel', {
defaultMessage: 'Scale type',
})}
Expand Down
5 changes: 3 additions & 2 deletions test/functional/apps/visualize/_vertical_bar_chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default function ({ getService, getPageObjects }) {
const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);

// FLAKY: https://github.com/elastic/kibana/issues/22322

describe('vertical bar chart', function () {
const fromTime = '2015-09-19 06:31:44.000';
const toTime = '2015-09-23 18:31:44.000';
Expand Down Expand Up @@ -154,15 +155,15 @@ export default function ({ getService, getPageObjects }) {
});
});

describe.skip('switch between Y axis scale types', () => {
describe('switch between Y axis scale types', () => {
before(initBarChart);
const axisId = 'ValueAxis-1';

it('should show ticks on selecting log scale', async () => {
await PageObjects.visualize.clickMetricsAndAxes();
await PageObjects.visualize.clickYAxisOptions(axisId);
await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
await PageObjects.visualize.clickYAxisOptions(axisId);
await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
await PageObjects.visualize.clickGo();
const labels = await PageObjects.visualize.getYAxisLabels();
Expand Down
4 changes: 1 addition & 3 deletions test/functional/page_objects/visualize_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -675,9 +675,7 @@ export function VisualizePageProvider({ getService, getPageObjects, updateBaseli
}

async selectYAxisScaleType(axisId, scaleType) {
const selectElement = await testSubjects.find(`scaleSelectYAxis-${axisId}`);
const selector = await selectElement.findByCssSelector(`option[value="${scaleType}"]`);
await selector.click();
await find.selectValue(`select#scaleSelectYAxis-${axisId}`, scaleType);
}

async selectYAxisMode(mode) {
Expand Down

0 comments on commit f1e9061

Please sign in to comment.