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.

Sign up for GitHub

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

Fix UI Enterprise test failures on 1.9 specifically #16697

Merged
merged 2 commits into from
Aug 12, 2022
Merged

Fix UI Enterprise test failures on 1.9 specifically #16697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59e0202
kmip and control group flaky test fix
Monkeychip Aug 11, 2022
8daea99
Merge branch 'release/1.9.x' into ui/VAULT-7613/release.1.9-fix
Monkeychip Aug 11, 2022
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
7 changes: 3 additions & 4 deletions ui/tests/acceptance/enterprise-control-groups-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { settled, currentURL, currentRouteName, visit } from '@ember/test-helpers';
import { settled, currentURL, currentRouteName, visit, waitUntil } from '@ember/test-helpers';
import { module, test, skip } from 'qunit';
import { setupApplicationTest } from 'ember-qunit';
import { create } from 'ember-cli-page-object';
Expand Down Expand Up @@ -130,9 +130,8 @@ module('Acceptance | Enterprise | control groups', function(hooks) {
await settled();
await visit('/vault/secrets/kv-v2-mount/show/foo');
await settled();
assert.equal(
currentRouteName(),
'vault.cluster.access.control-group-accessor',
assert.ok(
await waitUntil(() => currentRouteName() === 'vault.cluster.access.control-group-accessor'),
'redirects to access control group route'
);
});
Expand Down
4 changes: 3 additions & 1 deletion ui/tests/acceptance/enterprise-kmip-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { currentURL, currentRouteName, settled, fillIn } from '@ember/test-helpers';
import { currentURL, currentRouteName, settled, fillIn, waitUntil, find } from '@ember/test-helpers';
import { module, test } from 'qunit';
import { setupApplicationTest } from 'ember-qunit';
import { create } from 'ember-cli-page-object';
Expand Down Expand Up @@ -132,6 +132,7 @@ module('Acceptance | Enterprise | KMIP secrets', function(hooks) {
await settled();
await credentialsPage.visitDetail({ backend: path, scope, role, serial });
await settled();
await waitUntil(() => find('[data-test-confirm-action-trigger]'));
assert.dom('[data-test-confirm-action-trigger]').exists('delete button exists');
await credentialsPage.delete().confirmDelete();
await settled();
Expand Down Expand Up @@ -241,6 +242,7 @@ module('Acceptance | Enterprise | KMIP secrets', function(hooks) {
await settled();
await rolesPage.visitDetail({ backend: path, scope, role });
await settled();
await waitUntil(() => find('[data-test-kmip-link-edit-role]'));
await rolesPage.detailEditLink();
await settled();
assert.equal(
Expand Down