Skip to content

Commit a115cb9

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-59386
2 parents 6ec3ca9 + d0af5e4 commit a115cb9

8 files changed

Lines changed: 101 additions & 124 deletions

File tree

‎src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
2323

2424
<main class="container-fluid">
2525
<div class="row">
26-
<div class="col-md-2 sidebar-container collapsible-sidebar" id="discover-sidebar">
26+
<div class="col-md-2 sidebar-container collapsible-sidebar" id="discover-sidebar" data-test-subj="discover-sidebar">
2727
<div class="dscFieldChooser">
2828
<disc-field-chooser
2929
columns="state.columns"

‎test/functional/apps/discover/_discover_histogram.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default function({ getService, getPageObjects }) {
2323
const log = getService('log');
2424
const esArchiver = getService('esArchiver');
2525
const browser = getService('browser');
26+
const elasticChart = getService('elasticChart');
2627
const kibanaServer = getService('kibanaServer');
2728
const PageObjects = getPageObjects(['settings', 'common', 'discover', 'header', 'timePicker']);
2829
const defaultSettings = {
@@ -64,7 +65,7 @@ export default function({ getService, getPageObjects }) {
6465
await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
6566
await PageObjects.discover.setChartInterval('Monthly');
6667
await PageObjects.header.waitUntilLoadingHasFinished();
67-
const chartCanvasExist = await PageObjects.discover.chartCanvasExist();
68+
const chartCanvasExist = await elasticChart.canvasExists();
6869
expect(chartCanvasExist).to.be(true);
6970
});
7071
it('should visualize weekly data with within DST changes', async () => {
@@ -74,7 +75,7 @@ export default function({ getService, getPageObjects }) {
7475
await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
7576
await PageObjects.discover.setChartInterval('Weekly');
7677
await PageObjects.header.waitUntilLoadingHasFinished();
77-
const chartCanvasExist = await PageObjects.discover.chartCanvasExist();
78+
const chartCanvasExist = await elasticChart.canvasExists();
7879
expect(chartCanvasExist).to.be(true);
7980
});
8081
it('should visualize monthly data with different years Scaled to 30d', async () => {
@@ -84,7 +85,7 @@ export default function({ getService, getPageObjects }) {
8485
await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
8586
await PageObjects.discover.setChartInterval('Daily');
8687
await PageObjects.header.waitUntilLoadingHasFinished();
87-
const chartCanvasExist = await PageObjects.discover.chartCanvasExist();
88+
const chartCanvasExist = await elasticChart.canvasExists();
8889
expect(chartCanvasExist).to.be(true);
8990
});
9091
});

‎test/functional/apps/discover/_source_filters.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export default function({ getService, getPageObjects }) {
4949
});
5050

5151
it('should not get the field referer', async function() {
52-
//let fieldNames;
5352
const fieldNames = await PageObjects.discover.getAllFieldNames();
5453
expect(fieldNames).to.not.contain('referer');
5554
const relatedContentFields = fieldNames.filter(

0 commit comments

Comments
 (0)