@@ -3,32 +3,36 @@ import { module, test } from 'qunit';
33
44import window from 'ember-window-mock' ;
55import { setupWindowMock } from 'ember-window-mock/test-support' ;
6+ import { http , HttpResponse } from 'msw' ;
67
78import { setupApplicationTest } from 'crates-io/tests/helpers' ;
89
910import { visit } from '../helpers/visit-ignoring-abort' ;
1011
1112module ( 'Bug #2329' , function ( hooks ) {
12- setupApplicationTest ( hooks ) ;
13+ setupApplicationTest ( hooks , { msw : true } ) ;
1314 setupWindowMock ( hooks ) ;
1415
1516 test ( 'is fixed' , async function ( assert ) {
16- let user = this . server . create ( 'user' ) ;
17+ let { db } = this ;
1718
18- let foobar = this . server . create ( 'crate' , { name : 'foo-bar' } ) ;
19- this . server . create ( 'crate-ownership' , { crate : foobar , user, emailNotifications : true } ) ;
20- this . server . create ( 'version' , { crate : foobar } ) ;
19+ let user = this . db . user . create ( ) ;
2120
22- let bar = this . server . create ( 'crate' , { name : 'barrrrr ' } ) ;
23- this . server . create ( 'crate-ownership' , { crate : bar , user, emailNotifications : false } ) ;
24- this . server . create ( 'version' , { crate : bar } ) ;
21+ let foobar = this . db . crate . create ( { name : 'foo-bar ' } ) ;
22+ this . db . crateOwnership . create ( { crate : foobar , user, emailNotifications : true } ) ;
23+ this . db . version . create ( { crate : foobar } ) ;
2524
26- this . server . get ( '/api/private/session/begin' , { url : 'url-to-github-including-state-secret' } ) ;
25+ let bar = this . db . crate . create ( { name : 'barrrrr' } ) ;
26+ this . db . crateOwnership . create ( { crate : bar , user, emailNotifications : false } ) ;
27+ this . db . version . create ( { crate : bar } ) ;
2728
28- this . server . get ( '/api/private/session/authorize' , ( ) => {
29- this . server . create ( 'mirage-session' , { user } ) ;
30- return { ok : true } ;
31- } ) ;
29+ this . worker . use (
30+ http . get ( '/api/private/session/begin' , ( ) => HttpResponse . json ( { url : 'url-to-github-including-state-secret' } ) ) ,
31+ http . get ( '/api/private/session/authorize' , ( ) => {
32+ db . mswSession . create ( { user } ) ;
33+ return HttpResponse . json ( { ok : true } ) ;
34+ } ) ,
35+ ) ;
3236
3337 let fakeWindow = { document : { write ( ) { } , close ( ) { } } , close ( ) { } } ;
3438 window . open = ( ) => fakeWindow ;
0 commit comments