@@ -730,53 +730,51 @@ YYYY\r
730
730
t . end ( )
731
731
} )
732
732
733
- t . test ( 'detect CI' , t => {
734
- const defnNoCI = mockDefs ( {
735
- 'ci-info' : { isCI : false , name : null } ,
736
- } )
737
- const defnCIFoo = mockDefs ( {
738
- 'ci-info' : { isCI : false , name : 'foo' } ,
739
- } )
740
- t . equal ( defnNoCI [ 'ci-name' ] . default , null , 'null when not in CI' )
741
- t . equal ( defnCIFoo [ 'ci-name' ] . default , 'foo' , 'name of CI when in CI' )
742
- t . end ( )
743
- } )
744
-
745
733
t . test ( 'user-agent' , t => {
746
734
const npmVersion = '1.2.3'
747
735
const obj = {
748
736
'npm-version' : npmVersion ,
749
- 'user-agent' : mockDefs ( ) [ 'user-agent' ] . default ,
737
+ 'user-agent' : mockDefs ( {
738
+ 'ci-info' : { isCi : false , name : null } ,
739
+ } ) [ 'user-agent' ] . default ,
750
740
}
751
741
const flat = { }
752
742
const expectNoCI = `npm/${ npmVersion } node/${ process . version } ` +
753
743
`${ process . platform } ${ process . arch } workspaces/false`
754
- mockDefs ( ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
744
+ mockDefs ( {
745
+ 'ci-info' : { isCi : false , name : null } ,
746
+ } ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
755
747
t . equal ( flat . userAgent , expectNoCI )
756
748
t . equal ( process . env . npm_config_user_agent , flat . userAgent , 'npm_user_config environment is set' )
757
749
t . not ( obj [ 'user-agent' ] , flat . userAgent , 'config user-agent template is not translated' )
758
750
759
- obj [ 'ci-name' ] = 'foo'
760
- obj [ 'user-agent' ] = mockDefs ( ) [ 'user-agent' ] . default
751
+ obj [ 'user-agent' ] = mockDefs ( {
752
+ 'ci-info' : { isCi : true , name : 'foo' } ,
753
+ } ) [ 'user-agent' ] . default
761
754
const expectCI = `${ expectNoCI } ci/foo`
762
- mockDefs ( ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
755
+ mockDefs ( {
756
+ 'ci-info' : { isCi : true , name : 'foo' } ,
757
+ } ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
763
758
t . equal ( flat . userAgent , expectCI )
764
759
t . equal ( process . env . npm_config_user_agent , flat . userAgent , 'npm_user_config environment is set' )
765
760
t . not ( obj [ 'user-agent' ] , flat . userAgent , 'config user-agent template is not translated' )
766
761
767
- delete obj [ 'ci-name' ]
768
762
obj . workspaces = true
769
763
obj [ 'user-agent' ] = mockDefs ( ) [ 'user-agent' ] . default
770
764
const expectWorkspaces = expectNoCI . replace ( 'workspaces/false' , 'workspaces/true' )
771
- mockDefs ( ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
765
+ mockDefs ( {
766
+ 'ci-info' : { isCi : false , name : null } ,
767
+ } ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
772
768
t . equal ( flat . userAgent , expectWorkspaces )
773
769
t . equal ( process . env . npm_config_user_agent , flat . userAgent , 'npm_user_config environment is set' )
774
770
t . not ( obj [ 'user-agent' ] , flat . userAgent , 'config user-agent template is not translated' )
775
771
776
772
delete obj . workspaces
777
773
obj . workspace = [ 'foo' ]
778
774
obj [ 'user-agent' ] = mockDefs ( ) [ 'user-agent' ] . default
779
- mockDefs ( ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
775
+ mockDefs ( {
776
+ 'ci-info' : { isCi : false , name : null } ,
777
+ } ) [ 'user-agent' ] . flatten ( 'user-agent' , obj , flat )
780
778
t . equal ( flat . userAgent , expectWorkspaces )
781
779
t . equal ( process . env . npm_config_user_agent , flat . userAgent , 'npm_user_config environment is set' )
782
780
t . not ( obj [ 'user-agent' ] , flat . userAgent , 'config user-agent template is not translated' )
0 commit comments