mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
* enable w3c for chrome
* update maps tests
* update maps tests
* update common_page
* Revert "update maps tests"
This reverts commit 31f43fd678
.
* revert changes to maps tests
* undo after removal
* update expect range to pass on Windows, unskip tests for Firefox
* print out value for discover brushing test
* log first timestamp
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
parent
d043808824
commit
12f91e37d6
4 changed files with 21 additions and 60 deletions
|
@ -46,7 +46,6 @@ export default function({ getService, getPageObjects }) {
|
|||
});
|
||||
|
||||
describe('query', function() {
|
||||
this.tags(['skipFirefox']);
|
||||
const queryName1 = 'Query # 1';
|
||||
|
||||
it('should show correct time range string by timepicker', async function() {
|
||||
|
@ -99,9 +98,10 @@ export default function({ getService, getPageObjects }) {
|
|||
const newDurationHours = await PageObjects.timePicker.getTimeDurationInHours();
|
||||
expect(Math.round(newDurationHours)).to.be(25);
|
||||
const rowData = await PageObjects.discover.getDocTableField(1);
|
||||
log.debug(`The first timestamp value in doc table: ${rowData}`);
|
||||
expect(Date.parse(rowData)).to.be.within(
|
||||
Date.parse('Sep 20, 2015 @ 22:00:00.000'),
|
||||
Date.parse('Sep 20, 2015 @ 23:30:00.000')
|
||||
Date.parse('Sep 20, 2015 @ 21:30:00.000'),
|
||||
Date.parse('Sep 20, 2015 @ 23:00:00.000')
|
||||
);
|
||||
});
|
||||
|
||||
|
|
|
@ -43,42 +43,10 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
appConfig: {};
|
||||
ensureCurrentUrl: boolean;
|
||||
shouldLoginIfPrompted: boolean;
|
||||
shouldAcceptAlert: boolean;
|
||||
useActualUrl: boolean;
|
||||
}
|
||||
|
||||
class CommonPage {
|
||||
/**
|
||||
* Navigates the browser window to provided URL
|
||||
* @param url URL
|
||||
* @param shouldAcceptAlert pass 'true' if browser alert should be accepted
|
||||
*/
|
||||
private static async navigateToUrlAndHandleAlert(url: string, shouldAcceptAlert: boolean) {
|
||||
log.debug('Navigate to: ' + url);
|
||||
try {
|
||||
await browser.get(url);
|
||||
} catch (navigationError) {
|
||||
log.debug('Error navigating to url');
|
||||
const alert = await browser.getAlert();
|
||||
if (alert && alert.accept) {
|
||||
if (shouldAcceptAlert) {
|
||||
log.debug('Should accept alert');
|
||||
try {
|
||||
await alert.accept();
|
||||
} catch (alertException) {
|
||||
log.debug('Error accepting alert');
|
||||
throw alertException;
|
||||
}
|
||||
} else {
|
||||
log.debug('Will not accept alert');
|
||||
throw navigationError;
|
||||
}
|
||||
} else {
|
||||
throw navigationError;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns Kibana host URL
|
||||
*/
|
||||
|
@ -127,13 +95,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
}
|
||||
|
||||
private async navigate(navigateProps: NavigateProps) {
|
||||
const {
|
||||
appConfig,
|
||||
ensureCurrentUrl,
|
||||
shouldLoginIfPrompted,
|
||||
shouldAcceptAlert,
|
||||
useActualUrl,
|
||||
} = navigateProps;
|
||||
const { appConfig, ensureCurrentUrl, shouldLoginIfPrompted, useActualUrl } = navigateProps;
|
||||
const appUrl = getUrl.noAuth(config.get('servers.kibana'), appConfig);
|
||||
|
||||
await retry.try(async () => {
|
||||
|
@ -141,7 +103,11 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
log.debug(`navigateToActualUrl ${appUrl}`);
|
||||
await browser.get(appUrl);
|
||||
} else {
|
||||
await CommonPage.navigateToUrlAndHandleAlert(appUrl, shouldAcceptAlert);
|
||||
log.debug(`navigateToUrl ${appUrl}`);
|
||||
await browser.get(appUrl);
|
||||
// accept alert if it pops up
|
||||
const alert = await browser.getAlert();
|
||||
await alert?.accept();
|
||||
}
|
||||
|
||||
const currentUrl = shouldLoginIfPrompted
|
||||
|
@ -167,7 +133,6 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
basePath = '',
|
||||
ensureCurrentUrl = true,
|
||||
shouldLoginIfPrompted = true,
|
||||
shouldAcceptAlert = true,
|
||||
useActualUrl = false,
|
||||
} = {}
|
||||
) {
|
||||
|
@ -180,7 +145,6 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
appConfig,
|
||||
ensureCurrentUrl,
|
||||
shouldLoginIfPrompted,
|
||||
shouldAcceptAlert,
|
||||
useActualUrl,
|
||||
});
|
||||
}
|
||||
|
@ -200,7 +164,6 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
basePath = '',
|
||||
ensureCurrentUrl = true,
|
||||
shouldLoginIfPrompted = true,
|
||||
shouldAcceptAlert = true,
|
||||
useActualUrl = true,
|
||||
} = {}
|
||||
) {
|
||||
|
@ -214,7 +177,6 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
appConfig,
|
||||
ensureCurrentUrl,
|
||||
shouldLoginIfPrompted,
|
||||
shouldAcceptAlert,
|
||||
useActualUrl,
|
||||
});
|
||||
}
|
||||
|
@ -228,18 +190,12 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
async navigateToActualUrl(
|
||||
appName: string,
|
||||
hash?: string,
|
||||
{
|
||||
basePath = '',
|
||||
ensureCurrentUrl = true,
|
||||
shouldLoginIfPrompted = true,
|
||||
shouldAcceptAlert = true,
|
||||
} = {}
|
||||
{ basePath = '', ensureCurrentUrl = true, shouldLoginIfPrompted = true } = {}
|
||||
) {
|
||||
await this.navigateToUrl(appName, hash, {
|
||||
basePath,
|
||||
ensureCurrentUrl,
|
||||
shouldLoginIfPrompted,
|
||||
shouldAcceptAlert,
|
||||
useActualUrl: true,
|
||||
});
|
||||
}
|
||||
|
@ -252,7 +208,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
|
||||
async navigateToApp(
|
||||
appName: string,
|
||||
{ basePath = '', shouldLoginIfPrompted = true, shouldAcceptAlert = true, hash = '' } = {}
|
||||
{ basePath = '', shouldLoginIfPrompted = true, hash = '' } = {}
|
||||
) {
|
||||
let appUrl: string;
|
||||
if (config.has(['apps', appName])) {
|
||||
|
@ -274,7 +230,11 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
|
|||
await retry.tryForTime(defaultTryTimeout * 2, async () => {
|
||||
let lastUrl = await retry.try(async () => {
|
||||
// since we're using hash URLs, always reload first to force re-render
|
||||
await CommonPage.navigateToUrlAndHandleAlert(appUrl, shouldAcceptAlert);
|
||||
log.debug('navigate to: ' + appUrl);
|
||||
await browser.get(appUrl);
|
||||
// accept alert if it pops up
|
||||
const alert = await browser.getAlert();
|
||||
await alert?.accept();
|
||||
await this.sleep(700);
|
||||
log.debug('returned from get, calling refresh');
|
||||
await browser.refresh();
|
||||
|
|
|
@ -132,7 +132,7 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
|
|||
|
||||
await browser
|
||||
.getActions()
|
||||
.move({ x: 200, y: 20, origin: el._webElement })
|
||||
.move({ x: 0, y: 20, origin: el._webElement })
|
||||
.click()
|
||||
.perform();
|
||||
}
|
||||
|
@ -141,8 +141,8 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
|
|||
const el = await elasticChart.getCanvas();
|
||||
|
||||
await browser.dragAndDrop(
|
||||
{ location: el, offset: { x: 200, y: 20 } },
|
||||
{ location: el, offset: { x: 400, y: 30 } }
|
||||
{ location: el, offset: { x: -300, y: 20 } },
|
||||
{ location: el, offset: { x: -100, y: 30 } }
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -109,9 +109,10 @@ async function attemptToCreateCommand(
|
|||
chromeOptions.push('headless', 'disable-gpu', 'remote-debugging-port=9222');
|
||||
}
|
||||
chromeCapabilities.set('goog:chromeOptions', {
|
||||
w3c: false,
|
||||
w3c: true,
|
||||
args: chromeOptions,
|
||||
});
|
||||
chromeCapabilities.set('unexpectedAlertBehaviour', 'accept');
|
||||
chromeCapabilities.set('goog:loggingPrefs', { browser: 'ALL' });
|
||||
|
||||
const session = await new Builder()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue