@@ -19,6 +19,7 @@ describe('AutoMerge', () => {
1919 ref : 'dependabot/npm_and_yarn/eslint-plugin-typescript-sort-keys-1.5.0' ,
2020 sha : 'cd3ae10104a2ed9d937869b892457003ad68df74' ,
2121 } ,
22+ mergeable_state : 'clean' ,
2223 number : 253 ,
2324 title : 'chore: bump eslint-plugin-typescript-sort-keys from 1.3.0 to 1.5.0' ,
2425 } ,
@@ -33,6 +34,7 @@ describe('AutoMerge', () => {
3334 ref : 'dependabot/npm_and_yarn/typescript-4.0.3' ,
3435 sha : 'e59a374b357763fab5d3e61b0fdab66f4746b097' ,
3536 } ,
37+ mergeable_state : 'clean' ,
3638 number : 252 ,
3739 title : 'chore: bump typescript from 4.0.2 to 4.0.3' ,
3840 } ,
@@ -50,18 +52,13 @@ describe('AutoMerge', () => {
5052 } ) ;
5153
5254 nock ( autoMerge [ 'baseURL' ] ! )
53- . post ( / ^ \/ r e p o s \/ .+ ?\/ .+ ?\/ p u l l s \/ \d + \/ r e v i e w s \/ ? $ / )
55+ . post ( / ^ \/ r e p o s \/ .+ ?\/ .+ ?\/ p u l l s \/ \d + ( \/ ( r e v i e w s | m e r g e ) ) ? \/ ? $ / )
5456 . reply ( HTTP_STATUS . OK , { data : 'not-used' } )
5557 . persist ( ) ;
5658
5759 nock ( autoMerge [ 'baseURL' ] ! )
5860 . get ( / ^ \/ r e p o s \/ .+ ?\/ .+ ?\/ p u l l s \/ \d + \/ ? $ / )
59- . reply ( HTTP_STATUS . OK , { data : 'not-used' } )
60- . persist ( ) ;
61-
62- nock ( autoMerge [ 'baseURL' ] ! )
63- . put ( / ^ \/ r e p o s \/ .+ ?\/ .+ ?\/ p u l l s \/ \d + \/ m e r g e \/ ? $ / )
64- . reply ( HTTP_STATUS . OK , { data : 'not-used' } )
61+ . reply ( HTTP_STATUS . OK , { mergeable_state : 'clean' } )
6562 . persist ( ) ;
6663 } ) ;
6764
0 commit comments