scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 18:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix managed namespace test (#13394)

Browse Source 
* Fix managed namespace test

* Remove log
This commit is contained in:
Chelsea Shaw
2021-12-10 15:17:54 -06:00
committed by GitHub
parent 690336cd15
commit a8ce208d0b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/routes/vault/cluster.js
View File

@@ -40,8 +40,8 @@ export default Route.extend(ModelBoundaryRoute, ClusterRoute, {
const currentTokenName = this.auth.get('currentTokenName'); const currentTokenName = this.auth.get('currentTokenName');
// if no namespace queryParam and user authenticated, // if no namespace queryParam and user authenticated,
// use user's root namespace to redirect to properly param'd url // use user's root namespace to redirect to properly param'd url
if (this.featureFlagService.managedNamespaceRoot && !this.version.hasNamespaces) { if (this.featureFlagService.managedNamespaceRoot && this.version.isOss) {
window.alert('Cannot use Cloud Admin Namespace flag with OSS Vault'); console.error('Cannot use Cloud Admin Namespace flag with OSS Vault');
} }
if (!namespace && currentTokenName && !Ember.testing) { if (!namespace && currentTokenName && !Ember.testing) {
const storage = getStorage().getItem(currentTokenName); const storage = getStorage().getItem(currentTokenName);

6
ui/tests/acceptance/managed-namespace-test.js
View File

@@ -2,6 +2,7 @@ import { module, test } from 'qunit';
import { currentURL, visit, fillIn } from '@ember/test-helpers'; import { currentURL, visit, fillIn } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit'; import { setupApplicationTest } from 'ember-qunit';
import Pretender from 'pretender'; import Pretender from 'pretender';
import logout from 'vault/tests/pages/logout';
const FEATURE_FLAGS_RESPONSE = { const FEATURE_FLAGS_RESPONSE = {
feature_flags: ['VAULT_CLOUD_ADMIN_NAMESPACE'], feature_flags: ['VAULT_CLOUD_ADMIN_NAMESPACE'],
@@ -23,6 +24,7 @@ module('Acceptance | Enterprise | Managed namespace root', function(hooks) {
this.get('/v1/sys/health', this.passthrough); this.get('/v1/sys/health', this.passthrough);
this.get('/v1/sys/seal-status', this.passthrough); this.get('/v1/sys/seal-status', this.passthrough);
this.get('/v1/sys/license/features', this.passthrough); this.get('/v1/sys/license/features', this.passthrough);
this.get('/v1/sys/internal/ui/mounts', this.passthrough);
}); });
}); });
@@ -31,8 +33,10 @@ module('Acceptance | Enterprise | Managed namespace root', function(hooks) {
}); });
test('it shows the managed namespace toolbar when feature flag exists', async function(assert) { test('it shows the managed namespace toolbar when feature flag exists', async function(assert) {
await logout.visit();
await visit('/vault/auth'); await visit('/vault/auth');
assert.equal(currentURL(), '/vault/auth?namespace=admin&with=token', 'Redirected to base namespace'); assert.ok(currentURL().startsWith('/vault/auth'), 'Redirected to auth');
assert.ok(currentURL().includes('?namespace=admin'), 'with base namespace');
assert.dom('[data-test-namespace-toolbar]').doesNotExist('Normal namespace toolbar does not exist'); assert.dom('[data-test-namespace-toolbar]').doesNotExist('Normal namespace toolbar does not exist');
assert.dom('[data-test-managed-namespace-toolbar]').exists('Managed namespace toolbar exists'); assert.dom('[data-test-managed-namespace-toolbar]').exists('Managed namespace toolbar exists');