From e3a84fcc77ac88f185d53c12881092ed0096d960 Mon Sep 17 00:00:00 2001
From: Jordan Reimer <zofskeez@gmail.com>
Date: Mon, 21 Mar 2022 16:54:24 +0000
Subject: [PATCH] backport of commit 24cdccb40f5207543385d8744333023d225e6609

---
 ui/tests/acceptance/logout-auth-method-test.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/tests/acceptance/logout-auth-method-test.js b/ui/tests/acceptance/logout-auth-method-test.js
index e9f0b48b9d82..ae9e4a0d73e7 100644
--- a/ui/tests/acceptance/logout-auth-method-test.js
+++ b/ui/tests/acceptance/logout-auth-method-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { click, visit, fillIn, settled } from '@ember/test-helpers';
+import { click, visit, fillIn } from '@ember/test-helpers';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import { fakeWindow, buildMessage } from '../helpers/oidc-window-stub';
 import sinon from 'sinon';
@@ -29,10 +29,11 @@ module('Acceptance | logout auth method', function (hooks) {
     sessionStorage.removeItem('selectedAuth');
     await visit('/vault/auth');
     await fillIn('[data-test-select="auth-method"]', 'oidc');
-    later(() => run.cancelTimers(), 50);
+    later(() => {
+      window.postMessage(buildMessage().data, window.origin);
+      run.cancelTimers();
+    }, 50);
     await click('[data-test-auth-submit]');
-    window.postMessage(buildMessage().data, window.origin);
-    await settled();
     await click('.nav-user-button button');
     await click('#logout');
     assert