Skip to content

Commit

Permalink
settings/tokens: Make sure to always reload API tokens from the server (
Browse files Browse the repository at this point in the history
  • Loading branch information
Turbo87 authored May 8, 2023
1 parent 879ce1d commit 3b3d6bd
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/routes/settings/tokens/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default class TokenListRoute extends Route {
@service store;

async model() {
let apiTokens = await this.store.findAll('api-token');
let apiTokens = await this.store.findAll('api-token', { reload: true });
return TrackedArray.from(apiTokens.slice());
}

Expand Down
44 changes: 44 additions & 0 deletions tests/routes/settings/tokens/index-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { click, currentURL, fillIn, findAll } from '@ember/test-helpers';
import { module, test } from 'qunit';

import { setupApplicationTest } from 'cargo/tests/helpers';

import { visit } from '../../../helpers/visit-ignoring-abort';

module('/settings/tokens', function (hooks) {
setupApplicationTest(hooks);

function prepare(context) {
let user = context.server.create('user', {
login: 'johnnydee',
name: 'John Doe',
email: 'john@doe.com',
avatar: 'https://avatars2.githubusercontent.com/u/1234567?v=4',
});

context.authenticateAs(user);

return { user };
}

test('reloads all tokens from the server', async function (assert) {
let { user } = prepare(this);

this.server.create('api-token', { user, name: 'token-1' });

await visit('/settings/tokens/new');
assert.strictEqual(currentURL(), '/settings/tokens/new');

await fillIn('[data-test-name]', 'token-2');
await click('[data-test-scope="publish-update"]');
await click('[data-test-generate]');

assert.strictEqual(currentURL(), '/settings/tokens');
assert.dom('[data-test-api-token]').exists({ count: 2 });
let tokens = findAll('[data-test-api-token]');
assert.dom('[data-test-name]', tokens[0]).hasText('token-2');
assert.dom('[data-test-token]', tokens[0]).exists();
assert.dom('[data-test-name]', tokens[1]).hasText('token-1');
assert.dom('[data-test-token]', tokens[1]).doesNotExist();
});
});

0 comments on commit 3b3d6bd

Please sign in to comment.