Update tests and mirage handlers

hashicorp · Mar 18, 2024 · a9e1b2d · a9e1b2d
1 parent 598c553
commit a9e1b2d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 34 deletions.
diff --git a/ui/mirage/handlers/base.js b/ui/mirage/handlers/base.js
@@ -37,14 +37,6 @@ export default function (server) {
     };
   });
 
-  server.get('/sys/internal/ui/version', function () {
-    return {
-      data: {
-        version: '1.9.0+ent',
-      },
-    };
-  });
-
   server.get('/sys/license/status', function () {
     return {
       data: {

diff --git a/ui/mirage/handlers/reduced-disclosure.js b/ui/mirage/handlers/reduced-disclosure.js
@@ -10,9 +10,13 @@ export default function (server) {
   server.get('/sys/health', (schema, req) =>
     modifyPassthroughResponse(req, { version: '', cluster_name: '' })
   );
-  server.get('/sys/seal-status', (schema, req) =>
-    modifyPassthroughResponse(req, { version: '', cluster_name: '', build_date: '' })
-  );
+  server.get('/sys/seal-status', (schema, req) => {
+    // When reduced disclosure is active, the version is only returned when a valid token is used
+    const overrides = req.requestHeaders['X-Vault-Token']
+      ? { cluster_name: '', build_date: '' }
+      : { version: '', cluster_name: '', build_date: '' };
+    return modifyPassthroughResponse(req, overrides);
+  });
   server.get('sys/replication/status', () => new Response(404, {}, { errors: ['disabled path'] }));
   server.get('sys/replication/dr/status', () => new Response(404, {}, { errors: ['disabled path'] }));
   server.get(

diff --git a/ui/tests/acceptance/config-ui/messages/messages-test.js b/ui/tests/acceptance/config-ui/messages/messages-test.js
@@ -19,14 +19,6 @@ module('Acceptance | Community | config-ui/messages', function (hooks) {
   setupMirage(hooks);
 
   hooks.beforeEach(async function () {
-    this.server.get('sys/internal/ui/version', function () {
-      return {
-        data: {
-          version: '1.16.0',
-        },
-      };
-    });
-
     this.server.get('/sys/health', function () {
       return {
         enterprise: false,
@@ -100,13 +92,6 @@ module('Acceptance | Enterprise | config-ui/message', function (hooks) {
 
       await click(PAGE.button('create-message'));
     };
-    this.server.get('sys/internal/ui/version', function () {
-      return {
-        data: {
-          version: '1.16.0+ent',
-        },
-      };
-    });
     this.server.get('/sys/health', function () {
       return {
         enterprise: true,

diff --git a/ui/tests/acceptance/dashboard-test.js b/ui/tests/acceptance/dashboard-test.js
@@ -83,7 +83,9 @@ module('Acceptance | landing page dashboard', function (hooks) {
     await visit('/vault/dashboard');
     const version = this.owner.lookup('service:version');
     // Since we're using mirage, version is mocked static value
-    const versionText = version.isEnterprise ? `Vault v1.9.0 root` : `Vault v1.9.0`;
+    const versionText = version.isEnterprise
+      ? `Vault ${version.versionDisplay} root`
+      : `Vault ${version.versionDisplay}`;
 
     assert.dom(SELECTORS.cardHeader('Vault version')).hasText(versionText);
   });

diff --git a/ui/tests/acceptance/reduced-disclosure-test.js b/ui/tests/acceptance/reduced-disclosure-test.js
@@ -62,6 +62,7 @@ module('Acceptance | reduced disclosure test', function (hooks) {
         type: 'shamir',
         initialized: true,
         sealed: this.sealed,
+        version: '1.21.3',
       };
     });
     this.server.put(`/sys/seal`, () => {
@@ -84,11 +85,9 @@ module('Acceptance | reduced disclosure test', function (hooks) {
     });
     await authPage.login();
 
-    const versionSvc = this.owner.lookup('service:version');
     await visit('/vault/settings/seal');
-    assert
-      .dom('[data-test-footer-version]')
-      .hasText(`Vault ${versionSvc.version}`, 'shows version on seal page');
+
+    assert.dom('[data-test-footer-version]').hasText(`Vault 1.21.3`, 'shows version on seal page');
     assert.strictEqual(currentURL(), '/vault/settings/seal');
 
     // seal
@@ -115,9 +114,7 @@ module('Acceptance | reduced disclosure test', function (hooks) {
     assert.strictEqual(currentRouteName(), 'vault.cluster.auth', 'vault is ready to authenticate');
     assert.dom('[data-test-footer-version]').hasText(`Vault`, 'Version is still not shown before auth');
     await authPage.login();
-    assert
-      .dom('[data-test-footer-version]')
-      .hasText(`Vault ${versionSvc.version}`, 'Version is shown after login');
+    assert.dom('[data-test-footer-version]').hasText(`Vault 1.21.3`, 'Version is shown after login');
   });
 
   module('enterprise', function () {

diff --git a/ui/tests/unit/services/version-test.js b/ui/tests/unit/services/version-test.js
@@ -23,6 +23,16 @@ module('Unit | Service | version', function (hooks) {
     assert.true(service.isEnterprise);
   });
 
+  test('calculates versionDisplay correctly', function (assert) {
+    const service = this.owner.lookup('service:version');
+    service.type = 'community';
+    service.version = '1.2.3';
+    assert.strictEqual(service.versionDisplay, 'v1.2.3');
+    service.type = 'enterprise';
+    service.version = '1.4.7+ent';
+    assert.strictEqual(service.versionDisplay, 'v1.4.7');
+  });
+
   test('hasPerfReplication', function (assert) {
     const service = this.owner.lookup('service:version');
     assert.false(service.hasPerfReplication);