Skip to content

Commit

Permalink
Merge branch 'master' into lens/fix-persistence-bug-72855
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Aug 10, 2020
2 parents deb02cb + ad8502c commit 0e6ed88
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/developer/architecture/code-exploration.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ Contains the Discover application and the saved search embeddable.
Embeddables are re-usable widgets that can be rendered in any environment or plugin. Developers can embed them directly in their plugin. End users can dynamically add them to any embeddable containers.
- {kib-repo}blob/{branch}/src/plugins/es_ui_shared[esUiShared]
- {kib-repo}blob/{branch}/src/plugins/es_ui_shared/README.md[esUiShared]
WARNING: Missing README.
This plugin contains reusable code in the form of self-contained modules (or libraries). Each of these modules exports a set of functionality relevant to the domain of the module.
- {kib-repo}blob/{branch}/src/plugins/expressions/README.md[expressions]
Expand Down
10 changes: 6 additions & 4 deletions x-pack/test/functional/apps/dashboard/_async_dashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,19 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'timePicker',
]);

// Flakky: https://github.com/elastic/kibana/issues/65949
describe.skip('sample data dashboard', function describeIndexTests() {
describe('sample data dashboard', function describeIndexTests() {
before(async () => {
await PageObjects.common.sleep(5000);
await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
useActualUrl: true,
});
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.home.addSampleDataSet('flights');
const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights');
expect(isInstalled).to.be(true);
await retry.tryForTime(10000, async () => {
const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights');
expect(isInstalled).to.be(true);
});

// add the range of the sample data so we can pick it in the quick pick list
const SAMPLE_DATA_RANGE = `[
{
Expand Down

0 comments on commit 0e6ed88

Please sign in to comment.