Skip to content

Commit 46ea2c8

Browse files
authored
Stabilize token scopes (#6573)
This enables the new "Create API Token" page for everyone, including the new support for API token scopes.
1 parent af2b59a commit 46ea2c8

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

app/components/settings/api-tokens.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@ export default class ApiTokens extends Component {
2626
return new Intl.ListFormat('en-US').formatToParts(list);
2727
}
2828

29-
@action startNewToken(event) {
30-
if (event.altKey) {
31-
this.router.transitionTo('settings.tokens.new');
32-
} else {
33-
this.newToken = this.store.createRecord('api-token');
34-
}
29+
@action startNewToken() {
30+
this.router.transitionTo('settings.tokens.new');
3531
}
3632

3733
saveTokenTask = task(async () => {

tests/acceptance/api-token-test.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,25 +106,19 @@ module('Acceptance | api-tokens', function (hooks) {
106106
await visit('/settings/tokens');
107107
assert.strictEqual(currentURL(), '/settings/tokens');
108108
assert.dom('[data-test-api-token]').exists({ count: 2 });
109-
assert.dom('[data-test-focused-input]').doesNotExist();
110-
assert.dom('[data-test-save-token-button]').doesNotExist();
111109

112110
await click('[data-test-new-token-button]');
113-
assert.dom('[data-test-new-token-button]').isDisabled();
114-
assert.dom('[data-test-focused-input]').isFocused();
115-
assert.dom('[data-test-save-token-button]').exists();
111+
assert.strictEqual(currentURL(), '/settings/tokens/new');
116112

117-
await fillIn('[data-test-focused-input]', 'the new token');
113+
await fillIn('[data-test-name]', 'the new token');
114+
await click('[data-test-scope="publish-update"]');
118115
await percySnapshot(assert);
119116

120-
await click('[data-test-save-token-button]');
117+
await click('[data-test-generate]');
121118

122119
let token = this.server.schema.apiTokens.findBy({ name: 'the new token' });
123120
assert.ok(Boolean(token), 'API token has been created in the backend database');
124121

125-
assert.dom('[data-test-focused-input]').doesNotExist();
126-
assert.dom('[data-test-save-token-button]').doesNotExist();
127-
128122
assert.dom('[data-test-api-token="3"] [data-test-name]').hasText('the new token');
129123
assert.dom('[data-test-api-token="3"] [data-test-save-token-button]').doesNotExist();
130124
assert.dom('[data-test-api-token="3"] [data-test-revoke-token-button]').exists();
@@ -138,8 +132,9 @@ module('Acceptance | api-tokens', function (hooks) {
138132

139133
await visit('/settings/tokens');
140134
await click('[data-test-new-token-button]');
141-
await fillIn('[data-test-focused-input]', 'the new token');
142-
await click('[data-test-save-token-button]');
135+
await fillIn('[data-test-name]', 'the new token');
136+
await click('[data-test-scope="publish-update"]');
137+
await click('[data-test-generate]');
143138

144139
let token = this.server.schema.apiTokens.findBy({ name: 'the new token' });
145140
assert.dom('[data-test-token]').hasText(token.token);
@@ -159,7 +154,6 @@ module('Acceptance | api-tokens', function (hooks) {
159154
assert.dom('[data-test-api-token]').exists({ count: 2 });
160155

161156
await click('[data-test-new-token-button]');
162-
await fillIn('[data-test-focused-input]', 'the new token');
163157

164158
await visit('/settings/profile');
165159

0 commit comments

Comments
 (0)