IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

test: pass Cypress options objects into selector wrappers (#31567)

Browse Source 
* update selector wrappers so they can accept Cypress options objects to be passed in

* use arguments.length instead to be explicit
This commit is contained in:
Vicky Lee 2021-03-02 14:20:49 +00:00 committed by GitHub
parent d5fee5a3f5
commit c9afbe80e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/grafana-e2e/src/support/types.ts
View File

@ -5,10 +5,12 @@ import { fromBaseUrl } from './url';
export type VisitFunction = (args?: string) => Cypress.Chainable<Window>; export type VisitFunction = (args?: string) => Cypress.Chainable<Window>;
export type E2EVisit = { visit: VisitFunction }; export type E2EVisit = { visit: VisitFunction };
export type E2EFunction = (text?: string) => Cypress.Chainable<JQuery<HTMLElement>>; export type E2EFunction = ((text?: string, options?: CypressOptions) => Cypress.Chainable<JQuery<HTMLElement>>) &
E2EFunctionWithOnlyOptions;
export type E2EFunctionWithOnlyOptions = (options?: CypressOptions) => Cypress.Chainable<JQuery<HTMLElement>>;
export type TypeSelectors<S> = S extends StringSelector export type TypeSelectors<S> = S extends StringSelector
? E2EFunction ? E2EFunctionWithOnlyOptions
: S extends FunctionSelector : S extends FunctionSelector
? E2EFunction ? E2EFunction
: S extends CssSelector : S extends CssSelector
@ -27,6 +29,8 @@ export type E2EObjects<S extends Selectors> = E2EFunctions<S>;
export type E2EFactoryArgs<S extends Selectors> = { selectors: S }; export type E2EFactoryArgs<S extends Selectors> = { selectors: S };
export type CypressOptions = Partial<Cypress.Loggable & Cypress.Timeoutable & Cypress.Withinable & Cypress.Shadow>;
const processSelectors = <S extends Selectors>(e2eObjects: E2EFunctions<S>, selectors: S): E2EFunctions<S> => { const processSelectors = <S extends Selectors>(e2eObjects: E2EFunctions<S>, selectors: S): E2EFunctions<S> => {
const logOutput = (data: any) => e2e().logToConsole('Retrieving Selector:', data); const logOutput = (data: any) => e2e().logToConsole('Retrieving Selector:', data);
const keys = Object.keys(selectors); const keys = Object.keys(selectors);
@ -55,9 +59,9 @@ const processSelectors = <S extends Selectors>(e2eObjects: E2EFunctions<S>, sele
if (typeof value === 'string') { if (typeof value === 'string') {
// @ts-ignore // @ts-ignore
e2eObjects[key] = () => { e2eObjects[key] = (options?: CypressOptions) => {
logOutput(value); logOutput(value);
return e2e().get(Selector.fromAriaLabel(value)); return e2e().get(Selector.fromAriaLabel(value), options);
}; };
continue; continue;
@ -65,18 +69,38 @@ const processSelectors = <S extends Selectors>(e2eObjects: E2EFunctions<S>, sele
if (typeof value === 'function') { if (typeof value === 'function') {
// @ts-ignore // @ts-ignore
e2eObjects[key] = (text?: string) => { e2eObjects[key] = function (textOrOptions?: string | CypressOptions, options?: CypressOptions) {
if (!text) { // the input can only be ()
if (arguments.length === 0) {
const selector = value((undefined as unknown) as string); const selector = value((undefined as unknown) as string);
logOutput(selector); logOutput(selector);
return e2e().get(selector); return e2e().get(selector);
} }
const selector = value(text); // the input can be (text) or (options)
if (arguments.length === 1) {
if (typeof textOrOptions === 'string') {
const ariaText = value(textOrOptions);
const selector = Selector.fromAriaLabel(ariaText);
logOutput(selector); logOutput(selector);
return e2e().get(Selector.fromAriaLabel(selector)); return e2e().get(selector);
}
const selector = value((undefined as unknown) as string);
logOutput(selector);
return e2e().get(selector, textOrOptions);
}
// the input can only be (text, options)
if (arguments.length === 2) {
const ariaText = value(textOrOptions as string);
const selector = Selector.fromAriaLabel(ariaText);
logOutput(selector);
return e2e().get(selector, options);
}
}; };
continue; continue;