@@ -2,39 +2,39 @@ import { click, currentURL, fillIn, findAll } from '@ember/test-helpers';
22import { module , test } from 'qunit' ;
33
44import percySnapshot from '@percy/ember' ;
5- import { Response } from 'miragejs ' ;
5+ import { http , HttpResponse } from 'msw ' ;
66
77import { setupApplicationTest } from 'crates-io/tests/helpers' ;
88
99import { visit } from '../helpers/visit-ignoring-abort' ;
1010
1111module ( 'Acceptance | api-tokens' , function ( hooks ) {
12- setupApplicationTest ( hooks ) ;
12+ setupApplicationTest ( hooks , { msw : true } ) ;
1313
1414 function prepare ( context ) {
15- let user = context . server . create ( 'user' , {
15+ let user = context . db . user . create ( {
1616 login : 'johnnydee' ,
1717 name : 'John Doe' ,
18181919 avatar : 'https://avatars2.githubusercontent.com/u/1234567?v=4' ,
2020 } ) ;
2121
22- context . server . create ( 'api-token' , {
22+ 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 . server . create ( 'api-token' , {
29+ 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 . server . create ( 'api-token' , {
37+ context . db . apiToken . create ( {
3838 user,
3939 name : 'recently expired' ,
4040 createdAt : '2017-08-01T12:34:56' ,
@@ -92,11 +92,7 @@ module('Acceptance | api-tokens', function (hooks) {
9292 assert . dom ( '[data-test-api-token]' ) . exists ( { count : 3 } ) ;
9393
9494 await click ( '[data-test-api-token="1"] [data-test-revoke-token-button]' ) ;
95- assert . strictEqual (
96- this . server . schema . apiTokens . all ( ) . length ,
97- 2 ,
98- 'API token has been deleted from the backend database' ,
99- ) ;
95+ assert . strictEqual ( this . db . apiToken . findMany ( { } ) . length , 2 , 'API token has been deleted from the backend database' ) ;
10096
10197 assert . dom ( '[data-test-api-token]' ) . exists ( { count : 2 } ) ;
10298 assert . dom ( '[data-test-api-token="2"]' ) . exists ( ) ;
@@ -117,9 +113,11 @@ module('Acceptance | api-tokens', function (hooks) {
117113 test ( 'failed API tokens revocation shows an error' , async function ( assert ) {
118114 prepare ( this ) ;
119115
120- this . server . delete ( '/api/v1/me/tokens/:id' , function ( ) {
121- return new Response ( 500 , { } , { } ) ;
122- } ) ;
116+ this . worker . use (
117+ http . delete ( '/api/v1/me/tokens/:id' , function ( ) {
118+ return HttpResponse . json ( { } , { status : 500 } ) ;
119+ } ) ,
120+ ) ;
123121
124122 await visit ( '/settings/tokens' ) ;
125123 assert . strictEqual ( currentURL ( ) , '/settings/tokens' ) ;
@@ -150,7 +148,7 @@ module('Acceptance | api-tokens', function (hooks) {
150148
151149 await click ( '[data-test-generate]' ) ;
152150
153- let token = this . server . schema . apiTokens . findBy ( { name : 'the new token' } ) ;
151+ let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'the new token' } } } ) ;
154152 assert . ok ( Boolean ( token ) , 'API token has been created in the backend database' ) ;
155153
156154 assert . dom ( '[data-test-api-token="4"] [data-test-name]' ) . hasText ( 'the new token' ) ;
@@ -170,7 +168,7 @@ module('Acceptance | api-tokens', function (hooks) {
170168 await click ( '[data-test-scope="publish-update"]' ) ;
171169 await click ( '[data-test-generate]' ) ;
172170
173- let token = this . server . schema . apiTokens . findBy ( { name : 'the new token' } ) ;
171+ let token = this . db . apiToken . findFirst ( { where : { name : { equals : 'the new token' } } } ) ;
174172 assert . dom ( '[data-test-token]' ) . hasText ( token . token ) ;
175173
176174 // leave the API tokens page
0 commit comments