Skip to content

Commit

Permalink
Merge branch '7.17' into backport/7.17/pr-132122
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored May 15, 2022
2 parents 5e01c59 + 0f30932 commit 8e6236c
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 37 deletions.
2 changes: 1 addition & 1 deletion docs/api/alerting/find_rules.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ NOTE: Rule `params` are stored as a {ref}/flattened.html[flattened field type] a
(Optional, array|string) The fields to perform the `simple_query_string` parsed query against.

`fields`::
(Optional, array|string) The fields to return in the `attributes` key of the response.
(Optional, array of strings) The fields to return in the `attributes` key of the response.

`sort_field`::
(Optional, string) Sorts the response. Could be a rule field returned in the `attributes` key of the response.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');

describe('export transforms', () => {
// Failing: See https://github.com/elastic/kibana/issues/131834
describe.skip('export transforms', () => {
describe('root objects export transforms', () => {
before(async () => {
await esArchiver.load(
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion x-pack/plugins/reporting/public/lib/stream_handler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/

import { omit } from 'lodash';
import sinon, { stub } from 'sinon';
import { NotificationsStart } from 'src/core/public';
import { coreMock } from '../../../../../src/core/public/mocks';
Expand Down Expand Up @@ -98,7 +99,7 @@ describe('stream handler', () => {
expect(mockShowDanger.callCount).toBe(0);
expect(mockShowSuccess.callCount).toBe(1);
expect(mockShowWarning.callCount).toBe(0);
expect(mockShowSuccess.args[0]).toMatchSnapshot();
expect(omit(mockShowSuccess.args[0][0], 'toastLifeTimeMs')).toMatchSnapshot();
done();
});
});
Expand Down
7 changes: 7 additions & 0 deletions x-pack/plugins/reporting/public/notifier/job_success.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,12 @@ export const getSuccessToast = (
<DownloadButton getUrl={getDownloadLink} job={job} />
</Fragment>
),
/**
* If timeout is an Infinity value, a Not-a-Number (NaN) value, or negative, then timeout will be zero.
* And we cannot use `Number.MAX_SAFE_INTEGER` because EUI's Timer implementation
* subtracts it from the current time to evaluate the remainder.
* @see https://www.w3.org/TR/2011/WD-html5-20110525/timers.html
*/
toastLifeTimeMs: Number.MAX_SAFE_INTEGER - Date.now(),
'data-test-subj': 'completeReportSuccess',
});
4 changes: 4 additions & 0 deletions x-pack/test/functional/apps/discover/reporting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

beforeEach(() => PageObjects.common.navigateToApp('discover'));

afterEach(async () => {
await PageObjects.reporting.checkForReportingToasts();
});

it('generates a report with data', async () => {
await setupPage();
await PageObjects.discover.loadSavedSearch('Ecommerce Data');
Expand Down
3 changes: 1 addition & 2 deletions x-pack/test/functional/apps/lens/drag_and_drop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ export default function ({ getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']);

describe('lens drag and drop tests', () => {
// FLAKY: https://github.com/elastic/kibana/issues/108352
describe.skip('basic drag and drop', () => {
describe('basic drag and drop', () => {
it('should construct the basic split xy chart', async () => {
await PageObjects.visualize.navigateToNewVisualization();
await PageObjects.visualize.clickVisType('lens');
Expand Down

0 comments on commit 8e6236c

Please sign in to comment.