@@ -3,17 +3,17 @@ import { module, test } from 'qunit';
33
44import { defer } from 'rsvp' ;
55
6- import { Response } from 'miragejs ' ;
6+ import { http , HttpResponse } from 'msw ' ;
77
88import { setupApplicationTest } from 'crates-io/tests/helpers' ;
99
1010import { visit } from '../../../helpers/visit-ignoring-abort' ;
1111
1212module ( '/settings/tokens/new' , function ( hooks ) {
13- setupApplicationTest ( hooks ) ;
13+ setupApplicationTest ( hooks , { msw : true } ) ;
1414
1515 function prepare ( context ) {
16- let user = context . server . create ( 'user' , {
16+ let user = context . db . user . create ( {
1717 login : 'johnnydee' ,
1818 name : 'John Doe' ,
1919@@ -60,7 +60,7 @@ module('/settings/tokens/new', function (hooks) {
6060 await click ( '[data-test-scope="publish-update"]' ) ;
6161 await click ( '[data-test-generate]' ) ;
6262
63- let token = this . server . schema . apiTokens . findBy ( { name : 'token-name' } ) ;
63+ let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'token-name' } } } ) ;
6464 assert . ok ( Boolean ( token ) , 'API token has been created in the backend database' ) ;
6565 assert . strictEqual ( token . name , 'token-name' ) ;
6666 assert . strictEqual ( token . expiredAt , null ) ;
@@ -133,7 +133,7 @@ module('/settings/tokens/new', function (hooks) {
133133
134134 await click ( '[data-test-generate]' ) ;
135135
136- let token = this . server . schema . apiTokens . findBy ( { name : 'token-name' } ) ;
136+ let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'token-name' } } } ) ;
137137 assert . ok ( Boolean ( token ) , 'API token has been created in the backend database' ) ;
138138 assert . strictEqual ( token . name , 'token-name' ) ;
139139 assert . deepEqual ( token . crateScopes , [ 'serde-*' , 'serde' ] ) ;
@@ -173,7 +173,7 @@ module('/settings/tokens/new', function (hooks) {
173173 await click ( '[data-test-scope="publish-update"]' ) ;
174174 await click ( '[data-test-generate]' ) ;
175175
176- let token = this . server . schema . apiTokens . findBy ( { name : 'token-name' } ) ;
176+ let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'token-name' } } } ) ;
177177 assert . ok ( Boolean ( token ) , 'API token has been created in the backend database' ) ;
178178 assert . strictEqual ( token . name , 'token-name' ) ;
179179 assert . strictEqual ( token . expiredAt . slice ( 0 , 10 ) , '2017-12-20' ) ;
@@ -209,7 +209,7 @@ module('/settings/tokens/new', function (hooks) {
209209
210210 await click ( '[data-test-generate]' ) ;
211211
212- let token = this . server . schema . apiTokens . findBy ( { name : 'token-name' } ) ;
212+ let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'token-name' } } } ) ;
213213 assert . ok ( Boolean ( token ) , 'API token has been created in the backend database' ) ;
214214 assert . strictEqual ( token . name , 'token-name' ) ;
215215 assert . strictEqual ( token . expiredAt . slice ( 0 , 10 ) , '2024-05-04' ) ;
@@ -228,7 +228,7 @@ module('/settings/tokens/new', function (hooks) {
228228 prepare ( this ) ;
229229
230230 let deferred = defer ( ) ;
231- this . server . put ( '/api/v1/me/tokens' , deferred . promise ) ;
231+ this . worker . use ( http . put ( '/api/v1/me/tokens' , ( ) => deferred . promise ) ) ;
232232
233233 await visit ( '/settings/tokens/new' ) ;
234234 assert . strictEqual ( currentURL ( ) , '/settings/tokens/new' ) ;
@@ -240,7 +240,7 @@ module('/settings/tokens/new', function (hooks) {
240240 assert . dom ( '[data-test-name]' ) . isDisabled ( ) ;
241241 assert . dom ( '[data-test-generate]' ) . isDisabled ( ) ;
242242
243- deferred . resolve ( new Response ( 500 ) ) ;
243+ deferred . resolve ( HttpResponse . json ( { } , { status : 500 } ) ) ;
244244 await clickPromise ;
245245
246246 let message = 'An error has occurred while generating your API token. Please try again later!' ;
@@ -289,7 +289,7 @@ module('/settings/tokens/new', function (hooks) {
289289 test ( 'prefill with the exist token' , async function ( assert ) {
290290 let { user } = prepare ( this ) ;
291291
292- let token = this . server . create ( 'api-token' , {
292+ let token = this . db . apiToken . create ( {
293293 user,
294294 name : 'foo' ,
295295 createdAt : '2017-08-01T12:34:56' ,
@@ -310,7 +310,7 @@ module('/settings/tokens/new', function (hooks) {
310310 await click ( '[data-test-generate]' ) ;
311311 assert . strictEqual ( currentURL ( ) , '/settings/tokens' ) ;
312312
313- let tokens = this . server . schema . apiTokens . where ( { name : 'foo' } ) ;
313+ let tokens = this . db . apiToken . findMany ( { where : { name : { equals : 'foo' } } } ) ;
314314 assert . strictEqual ( tokens . length , 2 , 'New API token has been created in the backend database' ) ;
315315
316316 // It should reset the token ID query parameter.
@@ -321,7 +321,7 @@ module('/settings/tokens/new', function (hooks) {
321321 test ( 'prefilled: crate scoped can be added' , async function ( assert ) {
322322 let { user } = prepare ( this ) ;
323323
324- let token = this . server . create ( 'api-token' , {
324+ let token = this . db . apiToken . create ( {
325325 user,
326326 name : 'serde' ,
327327 crateScopes : [ 'serde' , 'serde-*' ] ,
0 commit comments