@@ -11,42 +11,42 @@ import { visit } from '../helpers/visit-ignoring-abort';
1111module ( 'Acceptance | api-tokens' , function ( hooks ) {
1212 setupApplicationTest ( hooks ) ;
1313
14- function prepare ( context ) {
15- let user = context . db . user . create ( {
14+ async function prepare ( context ) {
15+ let user = await context . db . user . create ( {
1616 login : 'johnnydee' ,
1717 name : 'John Doe' ,
1818 email : 'john@doe.com' ,
1919 avatar : 'https://avatars2.githubusercontent.com/u/1234567?v=4' ,
2020 } ) ;
2121
22- context . db . apiToken . create ( {
22+ await context . db . apiToken . create ( {
2323 user,
2424 name : 'foo' ,
2525 createdAt : '2017-08-01T12:34:56' ,
2626 lastUsedAt : '2017-11-02T01:45:14' ,
2727 } ) ;
2828
29- context . db . apiToken . create ( {
29+ await context . db . apiToken . create ( {
3030 user,
3131 name : 'BAR' ,
3232 createdAt : '2017-11-19T17:59:22' ,
3333 lastUsedAt : null ,
3434 expiredAt : '2017-12-19T17:59:22' ,
3535 } ) ;
3636
37- context . db . apiToken . create ( {
37+ await context . db . apiToken . create ( {
3838 user,
3939 name : 'recently expired' ,
4040 createdAt : '2017-08-01T12:34:56' ,
4141 lastUsedAt : '2017-11-02T01:45:14' ,
4242 expiredAt : '2017-11-19T17:59:22' ,
4343 } ) ;
4444
45- context . authenticateAs ( user ) ;
45+ await context . authenticateAs ( user ) ;
4646 }
4747
4848 test ( '/me is showing the list of active API tokens' , async function ( assert ) {
49- prepare ( this ) ;
49+ await prepare ( this ) ;
5050
5151 await visit ( '/settings/tokens' ) ;
5252 assert . strictEqual ( currentURL ( ) , '/settings/tokens' ) ;
@@ -85,7 +85,7 @@ module('Acceptance | api-tokens', function (hooks) {
8585 } ) ;
8686
8787 test ( 'API tokens can be revoked' , async function ( assert ) {
88- prepare ( this ) ;
88+ await prepare ( this ) ;
8989
9090 await visit ( '/settings/tokens' ) ;
9191 assert . strictEqual ( currentURL ( ) , '/settings/tokens' ) ;
@@ -104,7 +104,7 @@ module('Acceptance | api-tokens', function (hooks) {
104104 } ) ;
105105
106106 test ( 'API tokens can be regenerated' , async function ( assert ) {
107- prepare ( this ) ;
107+ await prepare ( this ) ;
108108
109109 await visit ( '/settings/tokens' ) ;
110110 assert . strictEqual ( currentURL ( ) , '/settings/tokens' ) ;
@@ -124,7 +124,7 @@ module('Acceptance | api-tokens', function (hooks) {
124124 } ) ;
125125
126126 test ( 'failed API tokens revocation shows an error' , async function ( assert ) {
127- prepare ( this ) ;
127+ await prepare ( this ) ;
128128
129129 this . worker . use (
130130 http . delete ( '/api/v1/me/tokens/:id' , function ( ) {
@@ -146,7 +146,7 @@ module('Acceptance | api-tokens', function (hooks) {
146146 } ) ;
147147
148148 test ( 'new API tokens can be created' , async function ( assert ) {
149- prepare ( this ) ;
149+ await prepare ( this ) ;
150150
151151 await visit ( '/settings/tokens' ) ;
152152 assert . strictEqual ( currentURL ( ) , '/settings/tokens' ) ;
@@ -161,7 +161,7 @@ module('Acceptance | api-tokens', function (hooks) {
161161
162162 await click ( '[data-test-generate]' ) ;
163163
164- let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'the new token' } } } ) ;
164+ let token = this . db . apiToken . findFirst ( q => q . where ( { name : 'the new token' } ) ) ;
165165 assert . ok ( Boolean ( token ) , 'API token has been created in the backend database' ) ;
166166
167167 assert . dom ( '[data-test-api-token="4"] [data-test-name]' ) . hasText ( 'the new token' ) ;
@@ -173,15 +173,15 @@ module('Acceptance | api-tokens', function (hooks) {
173173 } ) ;
174174
175175 test ( 'API tokens are only visible in plaintext until the page is left' , async function ( assert ) {
176- prepare ( this ) ;
176+ await prepare ( this ) ;
177177
178178 await visit ( '/settings/tokens' ) ;
179179 await click ( '[data-test-new-token-button]' ) ;
180180 await fillIn ( '[data-test-name]' , 'the new token' ) ;
181181 await click ( '[data-test-scope="publish-update"]' ) ;
182182 await click ( '[data-test-generate]' ) ;
183183
184- let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'the new token' } } } ) ;
184+ let token = this . db . apiToken . findFirst ( q => q . where ( { name : 'the new token' } ) ) ;
185185 assert . dom ( '[data-test-token]' ) . hasText ( token . token ) ;
186186
187187 // leave the API tokens page
@@ -193,7 +193,7 @@ module('Acceptance | api-tokens', function (hooks) {
193193 } ) ;
194194
195195 test ( 'navigating away while creating a token does not keep it in the list' , async function ( assert ) {
196- prepare ( this ) ;
196+ await prepare ( this ) ;
197197
198198 await visit ( '/settings/tokens' ) ;
199199 assert . dom ( '[data-test-api-token]' ) . exists ( { count : 3 } ) ;
0 commit comments