From cde1b3e3283c3735f222aea626204aa0e85381ae Mon Sep 17 00:00:00 2001
From: claire bontempo <68122737+hellobontempo@users.noreply.github.com>
Date: Wed, 22 Mar 2023 14:32:26 -0600
Subject: [PATCH] UI: fix enterprise test failures (#19671)

* move oidc tests into new file

* remove module from namespace test

* remove entered line

* add logout to afterEach hook

* remove ns test

* move test setup to within test

* use logout.visit() instead

* updates oidc auth namespaces test

* reverts to authPage logout

---------

Co-authored-by: Jordan Reimer <zofskeez@gmail.com>
---
 .../acceptance/enterprise-namespaces-test.js  | 88 ------------------
 .../enterprise-oidc-namespace-test.js         | 91 +++++++++++++++++++
 2 files changed, 91 insertions(+), 88 deletions(-)
 create mode 100644 ui/tests/acceptance/enterprise-oidc-namespace-test.js

diff --git a/ui/tests/acceptance/enterprise-namespaces-test.js b/ui/tests/acceptance/enterprise-namespaces-test.js
index 413590865..685ff5ce7 100644
--- a/ui/tests/acceptance/enterprise-namespaces-test.js
+++ b/ui/tests/acceptance/enterprise-namespaces-test.js
@@ -7,8 +7,6 @@ import { click, settled, visit, fillIn, currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { create } from 'ember-cli-page-object';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import parseURL from 'core/utils/parse-url';
 import consoleClass from 'vault/tests/pages/components/console/ui-panel';
 import authPage from 'vault/tests/pages/auth';
 import logout from 'vault/tests/pages/logout';
@@ -94,90 +92,4 @@ module('Acceptance | Enterprise | namespaces', function (hooks) {
       'Does not prepend root to namespace'
     );
   });
-
-  module('auth form', function (hooks) {
-    setupMirage(hooks);
-    const SELECTORS = {
-      authTab: (path) => `[data-test-auth-method="${path}"] a`,
-      authSubmit: '[data-test-auth-submit]',
-    };
-    hooks.beforeEach(async function () {
-      this.namespace = 'test-ns';
-      this.rootOidc = 'root-oidc';
-      this.nsOidc = 'ns-oidc';
-
-      const enableOidc = async (path, role = '') => {
-        this.server.post(`/auth/${path}/config`, () => {});
-        await shell.runCommands([
-          `write sys/auth/${path} type=oidc`,
-          `write auth/${path}/config default_role="${role}" oidc_discovery_url="https://example.com"`,
-          // show method as tab
-          `write sys/auth/${path}/tune listing_visibility="unauth"`,
-        ]);
-      };
-      await authPage.login();
-      // enable oidc in root namespace, without default role
-      await enableOidc(this.rootOidc);
-      // create child namespace to enable oidc
-      await createNS(this.namespace);
-      await logout.visit();
-
-      // enable oidc in child namespace with default role
-      await authPage.loginNs(this.namespace);
-      await enableOidc(this.nsOidc, `${this.nsOidc}-role`);
-      await authPage.logout();
-
-      // end by logging in/out of root so query params are cleared out and don't include namespace
-      await authPage.login();
-      return await authPage.logout();
-    });
-
-    hooks.afterEach(async function () {
-      const disableOidc = async (path) => {
-        await shell.runCommands([`delete /sys/auth/${path}`]);
-      };
-
-      await authPage.loginNs(this.namespace);
-      await visit(`/vault/access?namespace=${this.namespace}`);
-      // disable methods to cleanup test state for re-running
-      await disableOidc(this.rootOidc);
-      await disableOidc(this.nsOidc);
-      await authPage.logout();
-
-      await authPage.login();
-      await shell.runCommands([`delete /sys/auth/${this.namespace}`]);
-      this.server.shutdown();
-    });
-
-    test('oidc: request is made to auth_url when a namespace is inputted', async function (assert) {
-      assert.expect(5);
-      this.server.post(`/auth/${this.rootOidc}/oidc/auth_url`, (schema, req) => {
-        const { redirect_uri } = JSON.parse(req.requestBody);
-        const { pathname, search } = parseURL(redirect_uri);
-        assert.strictEqual(
-          pathname + search,
-          `/ui/vault/auth/${this.rootOidc}/oidc/callback`,
-          'request made to auth_url when the login page is visited'
-        );
-      });
-      this.server.post(`/auth/${this.nsOidc}/oidc/auth_url`, (schema, req) => {
-        const { redirect_uri } = JSON.parse(req.requestBody);
-        const { pathname, search } = parseURL(redirect_uri);
-        assert.strictEqual(
-          pathname + search,
-          `/ui/vault/auth/${this.nsOidc}/oidc/callback?namespace=${this.namespace}`,
-          'request made to correct auth_url when namespace is filled in'
-        );
-      });
-      await visit('/vault/auth?with=oidc%2F');
-      assert.dom(SELECTORS.authTab(this.rootOidc)).exists('renders oidc method tab for root');
-      await authPage.namespaceInput(this.namespace);
-      assert.strictEqual(
-        currentURL(),
-        `/vault/auth?namespace=${this.namespace}&with=${this.nsOidc}%2F`,
-        'url updates with namespace value'
-      );
-      assert.dom(SELECTORS.authTab(this.nsOidc)).exists('renders oidc method tab for child namespace');
-    });
-  });
 });
diff --git a/ui/tests/acceptance/enterprise-oidc-namespace-test.js b/ui/tests/acceptance/enterprise-oidc-namespace-test.js
new file mode 100644
index 000000000..a28a38792
--- /dev/null
+++ b/ui/tests/acceptance/enterprise-oidc-namespace-test.js
@@ -0,0 +1,91 @@
+import { visit, currentURL } from '@ember/test-helpers';
+import { module, test } from 'qunit';
+import { setupApplicationTest } from 'ember-qunit';
+import { create } from 'ember-cli-page-object';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import parseURL from 'core/utils/parse-url';
+import consoleClass from 'vault/tests/pages/components/console/ui-panel';
+import authPage from 'vault/tests/pages/auth';
+
+const shell = create(consoleClass);
+
+const createNS = async (name) => {
+  await shell.runCommands(`write sys/namespaces/${name} -force`);
+};
+const SELECTORS = {
+  authTab: (path) => `[data-test-auth-method="${path}"] a`,
+};
+
+module('Acceptance | Enterprise | oidc auth namespace test', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  hooks.beforeEach(async function () {
+    this.namespace = 'test-ns';
+    this.rootOidc = 'root-oidc';
+    this.nsOidc = 'ns-oidc';
+
+    this.server.post(`/auth/:path/config`, () => {});
+
+    this.enableOidc = (path, role = '') => {
+      return shell.runCommands([
+        `write sys/auth/${path} type=oidc`,
+        `write auth/${path}/config default_role="${role}" oidc_discovery_url="https://example.com"`,
+        // show method as tab
+        `write sys/auth/${path}/tune listing_visibility="unauth"`,
+      ]);
+    };
+
+    this.disableOidc = (path) => shell.runCommands([`delete /sys/auth/${path}`]);
+  });
+
+  test('oidc: request is made to auth_url when a namespace is inputted', async function (assert) {
+    assert.expect(5);
+
+    this.server.post(`/auth/${this.rootOidc}/oidc/auth_url`, (schema, req) => {
+      const { redirect_uri } = JSON.parse(req.requestBody);
+      const { pathname, search } = parseURL(redirect_uri);
+      assert.strictEqual(
+        pathname + search,
+        `/ui/vault/auth/${this.rootOidc}/oidc/callback`,
+        'request made to auth_url when the login page is visited'
+      );
+    });
+    this.server.post(`/auth/${this.nsOidc}/oidc/auth_url`, (schema, req) => {
+      const { redirect_uri } = JSON.parse(req.requestBody);
+      const { pathname, search } = parseURL(redirect_uri);
+      assert.strictEqual(
+        pathname + search,
+        `/ui/vault/auth/${this.nsOidc}/oidc/callback?namespace=${this.namespace}`,
+        'request made to correct auth_url when namespace is filled in'
+      );
+    });
+
+    await authPage.login();
+    // enable oidc in root namespace, without default role
+    await this.enableOidc(this.rootOidc);
+    // create child namespace to enable oidc
+    await createNS(this.namespace);
+    // enable oidc in child namespace with default role
+    await authPage.loginNs(this.namespace);
+    await this.enableOidc(this.nsOidc, `${this.nsOidc}-role`);
+    await authPage.logout();
+
+    await visit('/vault/auth');
+    assert.dom(SELECTORS.authTab(this.rootOidc)).exists('renders oidc method tab for root');
+    await authPage.namespaceInput(this.namespace);
+    assert.strictEqual(
+      currentURL(),
+      `/vault/auth?namespace=${this.namespace}&with=${this.nsOidc}%2F`,
+      'url updates with namespace value'
+    );
+    assert.dom(SELECTORS.authTab(this.nsOidc)).exists('renders oidc method tab for child namespace');
+
+    // disable methods to cleanup test state for re-running
+    await authPage.login();
+    await this.disableOidc(this.rootOidc);
+    await this.disableOidc(this.nsOidc);
+    await shell.runCommands([`delete /sys/auth/${this.namespace}`]);
+    await authPage.logout();
+  });
+});