Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.0] [dashboard/ftr] remove _-prefix from file names (#32585) #32591

Merged
merged 1 commit into from
Mar 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions test/functional/apps/dashboard/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,32 @@ export default function ({ getService, loadTestFile, getPageObjects }) {
before(loadCurrentData);
after(unloadCurrentData);

loadTestFile(require.resolve('./_empty_dashboard'));
loadTestFile(require.resolve('./_embeddable_rendering'));
loadTestFile(require.resolve('./_create_and_add_embeddables'));
loadTestFile(require.resolve('./_time_zones'));
loadTestFile(require.resolve('./_dashboard_options'));
loadTestFile(require.resolve('./_data_shared_attributes'));
loadTestFile(require.resolve('./_embed_mode'));
loadTestFile(require.resolve('./empty_dashboard'));
loadTestFile(require.resolve('./embeddable_rendering'));
loadTestFile(require.resolve('./create_and_add_embeddables'));
loadTestFile(require.resolve('./time_zones'));
loadTestFile(require.resolve('./dashboard_options'));
loadTestFile(require.resolve('./data_shared_attributes'));
loadTestFile(require.resolve('./embed_mode'));

// Note: This one must be last because it unloads some data for one of its tests!
// No, this isn't ideal, but loading/unloading takes so much time and these are all bunched
// to improve efficiency...
loadTestFile(require.resolve('./_dashboard_query_bar'));
loadTestFile(require.resolve('./dashboard_query_bar'));
});

describe('using current data', function () {
this.tags('ciGroup3');
before(loadCurrentData);
after(unloadCurrentData);

loadTestFile(require.resolve('./_full_screen_mode'));
loadTestFile(require.resolve('./_dashboard_filter_bar'));
loadTestFile(require.resolve('./_dashboard_filtering'));
loadTestFile(require.resolve('./_panel_expand_toggle'));
loadTestFile(require.resolve('./_dashboard_grid'));
loadTestFile(require.resolve('./_dashboard_snapshots'));
loadTestFile(require.resolve('./_view_edit'));
loadTestFile(require.resolve('./full_screen_mode'));
loadTestFile(require.resolve('./dashboard_filter_bar'));
loadTestFile(require.resolve('./dashboard_filtering'));
loadTestFile(require.resolve('./panel_expand_toggle'));
loadTestFile(require.resolve('./dashboard_grid'));
loadTestFile(require.resolve('./dashboard_snapshots'));
loadTestFile(require.resolve('./view_edit'));
});

// Each of these tests call initTests themselves, the way it was originally written. The above tests only load
Expand All @@ -81,20 +81,20 @@ export default function ({ getService, loadTestFile, getPageObjects }) {
this.tags('ciGroup4');
before(() => browser.setWindowSize(1200, 900));

loadTestFile(require.resolve('./_dashboard_time_picker'));
loadTestFile(require.resolve('./_bwc_shared_urls'));
loadTestFile(require.resolve('./_panel_controls'));
loadTestFile(require.resolve('./_dashboard_state'));
loadTestFile(require.resolve('./dashboard_time_picker'));
loadTestFile(require.resolve('./bwc_shared_urls'));
loadTestFile(require.resolve('./panel_controls'));
loadTestFile(require.resolve('./dashboard_state'));
});

describe('using legacy data', function () {
this.tags('ciGroup5');
before(() => browser.setWindowSize(1200, 900));

loadTestFile(require.resolve('./_dashboard_save'));
loadTestFile(require.resolve('./_dashboard_time'));
loadTestFile(require.resolve('./_dashboard_listing'));
loadTestFile(require.resolve('./_dashboard_clone'));
loadTestFile(require.resolve('./dashboard_save'));
loadTestFile(require.resolve('./dashboard_time'));
loadTestFile(require.resolve('./dashboard_listing'));
loadTestFile(require.resolve('./dashboard_clone'));
});
});
}