mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 01:38:56 -04:00
fix timepicker default start day (#145947)
## Summary This PR is mainly some cleanup before another PR I have in the works to shortcut timepicker.setAbsoluteTime() by checking if we already have the desired time set. This PR changes the timePicker defaultStartTimeUTC value from September 18th to September 19th to match the value of defaultStartTimeUTC. The variable name defaultStartTimeUTC implies it's a different timezone but actually it's the same date time but in a different ISO format. It seems there was only 1 place in tests which expected that Sep 18th date. Another small change in `x-pack/test/functional/apps/lens/group1/text_based_languages.ts` is to use uiSettings.update insteda of uiSettings.replace. `replace` wipes out the default UTC timezone and the defaultTime settings. I added a few calls to cleanStandardList to make sure any saved objects created by the tests are cleaned up, and to get a clean run if other tests left something. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
parent
b1e18a0414
commit
9c9c66cd0b
6 changed files with 12 additions and 4 deletions
|
@ -31,8 +31,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
|
|||
expect(await filterBar.hasFilter(columnName, value, true)).to.eql(true);
|
||||
}
|
||||
expect(await PageObjects.timePicker.getTimeConfigAsAbsoluteTimes()).to.eql({
|
||||
start: 'Sep 18, 2015 @ 06:31:44.000',
|
||||
end: 'Sep 23, 2015 @ 18:31:44.000',
|
||||
start: PageObjects.timePicker.defaultStartTime,
|
||||
end: PageObjects.timePicker.defaultEndTime,
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ export class TimePickerPageObject extends FtrService {
|
|||
|
||||
public readonly defaultStartTime = 'Sep 19, 2015 @ 06:31:44.000';
|
||||
public readonly defaultEndTime = 'Sep 23, 2015 @ 18:31:44.000';
|
||||
public readonly defaultStartTimeUTC = '2015-09-18T06:31:44.000Z';
|
||||
public readonly defaultStartTimeUTC = '2015-09-19T06:31:44.000Z';
|
||||
public readonly defaultEndTimeUTC = '2015-09-23T18:31:44.000Z';
|
||||
|
||||
async setDefaultAbsoluteRange() {
|
||||
|
|
|
@ -39,6 +39,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
|
|||
before(async () => {
|
||||
await log.debug('Starting lens before method');
|
||||
await browser.setWindowSize(1280, 1200);
|
||||
await kibanaServer.savedObjects.cleanStandardList();
|
||||
try {
|
||||
config.get('esTestCluster.ccs');
|
||||
remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
|
||||
|
@ -67,6 +68,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
|
|||
await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
|
||||
await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
|
||||
await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
|
||||
await kibanaServer.savedObjects.cleanStandardList();
|
||||
});
|
||||
|
||||
if (config.get('esTestCluster.ccs')) {
|
||||
|
|
|
@ -30,6 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
|
|||
|
||||
const defaultSettings = {
|
||||
'discover:enableSql': true,
|
||||
defaultIndex: 'log*',
|
||||
};
|
||||
|
||||
async function switchToTextBasedLanguage(language: string) {
|
||||
|
@ -43,8 +44,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
|
|||
|
||||
describe('lens text based language tests', () => {
|
||||
before(async () => {
|
||||
await kibanaServer.uiSettings.replace(defaultSettings);
|
||||
await kibanaServer.uiSettings.update(defaultSettings);
|
||||
});
|
||||
|
||||
it('should navigate to text based languages mode correctly', async () => {
|
||||
await switchToTextBasedLanguage('SQL');
|
||||
expect(await testSubjects.exists('showQueryBarMenu')).to.be(false);
|
||||
|
|
|
@ -39,6 +39,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
|
|||
before(async () => {
|
||||
await log.debug('Starting lens before method');
|
||||
await browser.setWindowSize(1280, 1200);
|
||||
await kibanaServer.savedObjects.cleanStandardList();
|
||||
try {
|
||||
config.get('esTestCluster.ccs');
|
||||
remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
|
||||
|
@ -67,6 +68,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
|
|||
await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
|
||||
await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
|
||||
await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
|
||||
await kibanaServer.savedObjects.cleanStandardList();
|
||||
});
|
||||
|
||||
loadTestFile(require.resolve('./add_to_dashboard'));
|
||||
|
|
|
@ -39,6 +39,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
|
|||
before(async () => {
|
||||
log.debug('Starting lens before method');
|
||||
await browser.setWindowSize(1280, 1200);
|
||||
await kibanaServer.savedObjects.cleanStandardList();
|
||||
try {
|
||||
config.get('esTestCluster.ccs');
|
||||
remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
|
||||
|
@ -67,6 +68,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
|
|||
await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
|
||||
await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
|
||||
await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
|
||||
await kibanaServer.savedObjects.cleanStandardList();
|
||||
});
|
||||
|
||||
loadTestFile(require.resolve('./colors'));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue