Skip to content

Commit

Permalink
test support (#11477) (#11640)
Browse files Browse the repository at this point in the history
* test support

* Move custom find timeout logic into find service

* Fix the error in tests by combining the calls.

Seems to work locally like this.
  • Loading branch information
stacey-gammon committed May 7, 2017
1 parent 6b55a19 commit 28c692a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/ui/public/kbn_top_nav/kbn_top_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
tooltip-popup-delay="400"
tooltip-append-to-body="1"
data-test-subj="{{menuItem.testId}}"
></div>
>
</div>

<!-- Time-picker "menu item" -->
<kbn-global-timepicker></kbn-global-timepicker>
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/notify/notifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ function add(notif, cb) {
notif.customActions = notif.customActions.map((action, index) => {
return {
key: action.text,
dataTestSubj: action.dataTestSubj,
callback: closeNotif(notif, action.callback, action.text),
getButtonClass() {
const buttonTypeClass = typeToButtonClassMap[notif.type];
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/notify/partials/toaster.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
ng-class="action.getButtonClass()"
ng-click="action.callback()"
ng-bind="action.key"
data-test-subj="{{action.dataTestSubj}}"
></button>
</div>

Expand Down
9 changes: 5 additions & 4 deletions test/functional/page_objects/header_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export function HeaderPageProvider({ getService, getPageObjects }) {
const remote = getService('remote');
const log = getService('log');
const retry = getService('retry');
const find = getService('find');
const testSubjects = getService('testSubjects');
const PageObjects = getPageObjects(['common']);

Expand Down Expand Up @@ -162,10 +163,10 @@ export function HeaderPageProvider({ getService, getPageObjects }) {
.findByLinkText(quickTime).click();
}

async getToastMessage() {
remote.setFindTimeout(defaultFindTimeout);
return await remote.findDisplayedByCssSelector('kbn-truncated.toast-message.ng-isolate-scope')
.getVisibleText();
async getToastMessage(findTimeout = defaultFindTimeout) {
const toastMessage =
await find.displayedByCssSelector('kbn-truncated.toast-message.ng-isolate-scope', findTimeout);
return toastMessage.getVisibleText();
}

async waitForToastMessageGone() {
Expand Down
8 changes: 8 additions & 0 deletions test/functional/services/find.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ export function FindProvider({ getService }) {
log.debug(`Found ${elements.length} for selector ${selector}`);
return elements;
}

async displayedByCssSelector(selector, timeout = defaultFindTimeout) {
log.debug('in displayedByCssSelector: ' + selector);
const remoteWithTimeout = remote.setFindTimeout(timeout);
const element = await remoteWithTimeout.findDisplayedByCssSelector(selector);
remoteWithTimeout.setFindTimeout(defaultFindTimeout);
return element;
}
}

return new Find();
Expand Down

0 comments on commit 28c692a

Please sign in to comment.